diff options
author | RĂ©mi Verschelde <rverschelde@gmail.com> | 2020-12-02 14:15:38 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-02 14:15:38 +0100 |
commit | d1231be1c8f8f2c16fd1047adcd3c7f997a07c1f (patch) | |
tree | f7ceec96ce5251a3f7ed7ed33abcb163f29f0ad3 /modules/visual_script | |
parent | 0019aa940e661fcc5e6b8f333ca291ba8726e6e4 (diff) | |
parent | 42bfa169960b59c5d9337e9f63862f5feae92d58 (diff) |
Merge pull request #41095 from ThakeeNathees/GDScript-Documentation
GDScript(2.0) Documentation generation system
Diffstat (limited to 'modules/visual_script')
-rw-r--r-- | modules/visual_script/visual_script.h | 8 | ||||
-rw-r--r-- | modules/visual_script/visual_script_property_selector.cpp | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/modules/visual_script/visual_script.h b/modules/visual_script/visual_script.h index 85dab4e6cf..59bdfb2fc3 100644 --- a/modules/visual_script/visual_script.h +++ b/modules/visual_script/visual_script.h @@ -33,6 +33,7 @@ #include "core/debugger/engine_debugger.h" #include "core/debugger/script_debugger.h" +#include "core/doc_data.h" #include "core/object/script_language.h" #include "core/os/thread.h" @@ -342,6 +343,13 @@ public: virtual void set_source_code(const String &p_code) override; virtual Error reload(bool p_keep_state = false) override; +#ifdef TOOLS_ENABLED + virtual const Vector<DocData::ClassDoc> &get_documentation() const override { + static Vector<DocData::ClassDoc> docs; + return docs; + } +#endif // TOOLS_ENABLED + virtual bool is_tool() const override; virtual bool is_valid() const override; diff --git a/modules/visual_script/visual_script_property_selector.cpp b/modules/visual_script/visual_script_property_selector.cpp index 875270e74f..54d86d5a9c 100644 --- a/modules/visual_script/visual_script_property_selector.cpp +++ b/modules/visual_script/visual_script_property_selector.cpp @@ -31,6 +31,7 @@ #include "visual_script_property_selector.h" #include "core/os/keyboard.h" +#include "editor/doc_tools.h" #include "editor/editor_node.h" #include "editor/editor_scale.h" #include "modules/visual_script/visual_script.h" @@ -437,7 +438,7 @@ void VisualScriptPropertySelector::_item_selected() { class_type = base_type; } - DocData *dd = EditorHelp::get_doc_data(); + DocTools *dd = EditorHelp::get_doc_data(); String text; String at_class = class_type; |