diff options
| author | volzhs <volzhs@gmail.com> | 2015-06-28 22:28:02 +0900 |
|---|---|---|
| committer | volzhs <volzhs@gmail.com> | 2015-06-28 22:28:02 +0900 |
| commit | 584dd4db878d0a9ebf44dc529dad35bf8dd4796b (patch) | |
| tree | c601222ba20cacc80fba7ff43b5de425db13519c /tools/editor/property_editor.cpp | |
| parent | 81a1f32f0c1e4f64bb102c6aa46bcbb4e18bcd55 (diff) | |
| parent | 2b64f73b0459190d20b2f6de39275ee7979317c4 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
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); |