diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-11-08 18:53:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-08 18:53:08 +0100 |
| commit | 665fa3d8391287204ab098062ddee8c1a524f001 (patch) | |
| tree | 816f04085bb7809447d1a1edcf20c7dbd95f29b5 /scene/resources/packed_scene.h | |
| parent | 4a32754e7894458714c3e62add8b24cd8a7ed786 (diff) | |
| parent | 8d6f80d3677a31aee13e7f531b46ada0b6ef8bf3 (diff) | |
Merge pull request #52943 from RandomShaper/property_pin_control_natural
Diffstat (limited to 'scene/resources/packed_scene.h')
| -rw-r--r-- | scene/resources/packed_scene.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/scene/resources/packed_scene.h b/scene/resources/packed_scene.h index 55708f7914..a03da558e4 100644 --- a/scene/resources/packed_scene.h +++ b/scene/resources/packed_scene.h @@ -69,11 +69,6 @@ class SceneState : public RefCounted { Vector<int> groups; }; - struct PackState { - Ref<SceneState> state; - int node = -1; - }; - Vector<NodeData> nodes; struct ConnectionData { @@ -94,8 +89,6 @@ class SceneState : public RefCounted { uint64_t last_modified_time = 0; - _FORCE_INLINE_ Ref<SceneState> _get_base_scene_state() const; - static bool disable_placeholders; Vector<String> _get_node_groups(int p_idx) const; @@ -117,6 +110,12 @@ public: GEN_EDIT_STATE_DISABLED, GEN_EDIT_STATE_INSTANCE, GEN_EDIT_STATE_MAIN, + GEN_EDIT_STATE_MAIN_INHERITED, + }; + + struct PackState { + Ref<SceneState> state; + int node = -1; }; static void set_disable_placeholders(bool p_disable); @@ -139,6 +138,8 @@ public: bool can_instantiate() const; Node *instantiate(GenEditState p_edit_state) const; + Ref<SceneState> get_base_scene_state() const; + //unbuild API int get_node_count() const; @@ -207,6 +208,7 @@ public: GEN_EDIT_STATE_DISABLED, GEN_EDIT_STATE_INSTANCE, GEN_EDIT_STATE_MAIN, + GEN_EDIT_STATE_MAIN_INHERITED, }; Error pack(Node *p_scene); |