diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-10-17 15:48:42 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-10-17 15:48:42 -0300 |
| commit | 85a611d1cd186f7f424f7e00d244adb3b2d7bb30 (patch) | |
| tree | ff952ce43cc14ba7548b145facdd17da5e5d98b2 /scene/resources | |
| parent | 6f9631fc5151b3267c6fcea5f70249fc36814db8 (diff) | |
-fixes disability to remove instanced nodes when reopening scene. Fixes #2610
Diffstat (limited to 'scene/resources')
| -rw-r--r-- | scene/resources/packed_scene.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index a9dc0e8bfb..fdf1692495 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -101,7 +101,7 @@ Node *SceneState::instance(bool p_gen_edit_state) const { if (i==0 && base_scene_idx>=0) { //scene inheritance on root node - print_line("scene inherit"); + //print_line("scene inherit"); Ref<PackedScene> sdata = props[ base_scene_idx ]; ERR_FAIL_COND_V( !sdata.is_valid(), NULL); node = sdata->instance(p_gen_edit_state); @@ -112,7 +112,7 @@ Node *SceneState::instance(bool p_gen_edit_state) const { } else if (n.instance>=0) { //instance a scene into this node - print_line("instance"); + //print_line("instance"); if (n.instance&FLAG_INSTANCE_IS_PLACEHOLDER) { String path = props[n.instance&FLAG_MASK]; @@ -148,7 +148,7 @@ Node *SceneState::instance(bool p_gen_edit_state) const { #endif } } else if (ObjectTypeDB::is_type_enabled(snames[n.type])) { - print_line("created"); + //print_line("created"); //node belongs to this scene and must be created Object * obj = ObjectTypeDB::instance(snames[ n.type ]); if (!obj || !obj->cast_to<Node>()) { |