diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-02-21 11:17:50 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-02-21 11:18:31 -0300 |
| commit | b91b89cf60c31ec15c7f4f2ee51cc51e0e11c4ee (patch) | |
| tree | 9eecd866991efbf70211b10b12f68065d8be61f6 /scene/resources/packed_scene.h | |
| parent | d27b83d4bd5643ac42666735e8df8a8059d31aca (diff) | |
| download | redot-engine-b91b89cf60c31ec15c7f4f2ee51cc51e0e11c4ee.tar.gz | |
Add support for placeholders in tscn, which was missing. Closes #3652
Diffstat (limited to 'scene/resources/packed_scene.h')
| -rw-r--r-- | scene/resources/packed_scene.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scene/resources/packed_scene.h b/scene/resources/packed_scene.h index 7fda4392d8..6a26cc472c 100644 --- a/scene/resources/packed_scene.h +++ b/scene/resources/packed_scene.h @@ -48,11 +48,7 @@ class SceneState : public Reference { int base_scene_idx; enum { - FLAG_ID_IS_PATH=(1<<30), - FLAG_INSTANCE_IS_PLACEHOLDER=(1<<30), - FLAG_MASK=(1<<24)-1, NO_PARENT_SAVED=0x7FFFFFFF, - }; struct NodeData { @@ -115,7 +111,10 @@ protected: public: enum { - TYPE_INSTANCED=0x7FFFFFFF + FLAG_ID_IS_PATH=(1<<30), + TYPE_INSTANCED=0x7FFFFFFF, + FLAG_INSTANCE_IS_PLACEHOLDER=(1<<30), + FLAG_MASK=(1<<24)-1, }; static void set_disable_placeholders(bool p_disable); @@ -148,6 +147,8 @@ public: NodePath get_node_path(int p_idx,bool p_for_parent=false) const; NodePath get_node_owner_path(int p_idx) const; Ref<PackedScene> get_node_instance(int p_idx) const; + String get_node_instance_placeholder(int p_idx) const; + bool is_node_instance_placeholder(int p_idx) const; Vector<StringName> get_node_groups(int p_idx) const; int get_node_property_count(int p_idx) const; |