diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-01-12 07:07:36 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-01-12 07:07:36 -0300 |
| commit | f2ae6f87a448bf65f18eac572732cdf29012d661 (patch) | |
| tree | 3eace3a12776ff671a9eb20696d5313e7e67891c /scene/resources/packed_scene.h | |
| parent | a625f7d07317ac4fac21962a99a7896ed13010c7 (diff) | |
| download | redot-engine-f2ae6f87a448bf65f18eac572732cdf29012d661.tar.gz | |
Fix situation where TSCN format might crash, closes #3062
Diffstat (limited to 'scene/resources/packed_scene.h')
| -rw-r--r-- | scene/resources/packed_scene.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/scene/resources/packed_scene.h b/scene/resources/packed_scene.h index 911ffd2542..415357b61f 100644 --- a/scene/resources/packed_scene.h +++ b/scene/resources/packed_scene.h @@ -50,7 +50,6 @@ class SceneState : public Reference { FLAG_INSTANCE_IS_PLACEHOLDER=(1<<30), FLAG_MASK=(1<<24)-1, NO_PARENT_SAVED=0x7FFFFFFF, - TYPE_INSTANCED=0x7FFFFFFF, }; @@ -106,6 +105,10 @@ class SceneState : public Reference { static bool disable_placeholders; public: + enum { + TYPE_INSTANCED=0x7FFFFFFF + }; + static void set_disable_placeholders(bool p_disable); int find_node_by_path(const NodePath& p_node) const; |