diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/doc/doc_data.cpp | 11 | ||||
| -rw-r--r-- | tools/editor/editor_node.cpp | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tools/doc/doc_data.cpp b/tools/doc/doc_data.cpp index 5167b9a0b0..35f1140644 100644 --- a/tools/doc/doc_data.cpp +++ b/tools/doc/doc_data.cpp @@ -530,6 +530,17 @@ void DocData::generate(bool p_basic_types) { } + List<Pair<String,Variant> > cinfo; + lang->get_public_constants(&cinfo); + + + for(List<Pair<String,Variant> >::Element *E=cinfo.front();E;E=E->next()) { + + ConstantDoc cd; + cd.name=E->get().first; + cd.value=E->get().second; + c.constants.push_back(cd); + } } } diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index ed932396db..33b2e72d62 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -4148,6 +4148,7 @@ EditorNode::EditorNode() { EditorSettings::get_singleton()->enable_plugins(); + Node::set_human_readable_collision_renaming(true); // Ref<ImageTexture> it = gui_base->get_icon("logo","Icons"); // OS::get_singleton()->set_icon( it->get_data() ); |