From f2ae6f87a448bf65f18eac572732cdf29012d661 Mon Sep 17 00:00:00 2001 From: Juan Linietsky Date: Tue, 12 Jan 2016 07:07:36 -0300 Subject: Fix situation where TSCN format might crash, closes #3062 --- scene/resources/packed_scene.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'scene/resources/packed_scene.h') 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; -- cgit v1.2.3