diff options
| author | Kostadin Damyanov <maxmight@gmail.com> | 2015-06-26 21:35:47 +0300 |
|---|---|---|
| committer | Kostadin Damyanov <maxmight@gmail.com> | 2015-06-26 21:35:47 +0300 |
| commit | e0e54ea7d456c0fabd8f3f9b2667a69ff520f852 (patch) | |
| tree | 9ce4e0b6db40ac2ab07b8582e57282fe63130165 /tools/editor/property_editor.cpp | |
| parent | f61eb5fd8e13642c82364f8ee66a0f6c791a4511 (diff) | |
| parent | a67486a39ee629acac068a6d014015944cf83bb3 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tools/editor/property_editor.cpp')
| -rw-r--r-- | tools/editor/property_editor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp index a7636f517f..2fa8b98ff1 100644 --- a/tools/editor/property_editor.cpp +++ b/tools/editor/property_editor.cpp @@ -1633,7 +1633,7 @@ CustomPropertyEditor::CustomPropertyEditor() { scene_tree = memnew( SceneTreeDialog ); add_child(scene_tree); scene_tree->connect("selected", this,"_node_path_selected"); - scene_tree->get_tree()->set_show_enabled_subscene(true); + scene_tree->get_scene_tree()->set_show_enabled_subscene(true); texture_preview = memnew( TextureFrame ); add_child( texture_preview); |