summaryrefslogtreecommitdiffstats
path: root/scene/resources/packed_scene.h
diff options
context:
space:
mode:
authorreduz <juan@okamstudio.com>2015-10-16 19:11:23 -0300
committerreduz <juan@okamstudio.com>2015-10-16 19:11:23 -0300
commit078a474135b47adb3cbdf414c737b77ee17fe596 (patch)
treeb496b103491830f4e9339b9f25bd71f4dfdef184 /scene/resources/packed_scene.h
parent6b20ee4324224d926a3eb43a59068c2cf12dc75e (diff)
downloadredot-engine-078a474135b47adb3cbdf414c737b77ee17fe596.tar.gz
-fixes and more fixes to new scene system, seems stable now..
BUT DONT TRUST ME IT MAY STILL BREAK, USE WITH CARE!!
Diffstat (limited to 'scene/resources/packed_scene.h')
-rw-r--r--scene/resources/packed_scene.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/scene/resources/packed_scene.h b/scene/resources/packed_scene.h
index 2a2271810e..3956d2abe4 100644
--- a/scene/resources/packed_scene.h
+++ b/scene/resources/packed_scene.h
@@ -45,13 +45,9 @@ class SceneState : public Reference {
int base_scene_idx;
- //missing - instances
- //missing groups
- //missing - owner
- //missing - override names and values
-
enum {
FLAG_ID_IS_PATH=(1<<30),
+ FLAG_INSTANCE_IS_PLACEHOLDER=(1<<30),
FLAG_MASK=(1<<24)-1,
NO_PARENT_SAVED=0x7FFFFFFF,
TYPE_INSTANCED=0x7FFFFFFF,
@@ -105,8 +101,11 @@ class SceneState : public Reference {
_FORCE_INLINE_ Ref<SceneState> _get_base_scene_state() const;
+ static bool disable_placeholders;
public:
+ static void set_disable_placeholders(bool p_disable);
+
int find_node_by_path(const NodePath& p_node) const;
Variant get_property_value(int p_node,const StringName& p_property,bool &found) const;
bool is_node_in_group(int p_node,const StringName& p_group) const;