diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-12-16 18:35:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-16 18:35:00 +0100 |
| commit | 1e2a8132f333245bf3f77244b83e625a56418067 (patch) | |
| tree | 826dc4d17ed0d5cf8586e25703788a52d77e1ad3 /scene/resources/packed_scene.h | |
| parent | caf3a405ab1d7831a03dabc04b5fe2301e82c28e (diff) | |
| parent | ced1ff63a8267773bf440610792ce3ab4eb2f8ec (diff) | |
Merge pull request #14406 from hoelzl/pr-instance-node-order
Fix some issues with instanced scenes
Diffstat (limited to 'scene/resources/packed_scene.h')
| -rw-r--r-- | scene/resources/packed_scene.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scene/resources/packed_scene.h b/scene/resources/packed_scene.h index 20bfb19b1f..83920c8041 100644 --- a/scene/resources/packed_scene.h +++ b/scene/resources/packed_scene.h @@ -57,6 +57,7 @@ class SceneState : public Reference { int type; int name; int instance; + int index; struct Property { @@ -151,6 +152,7 @@ public: 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_index(int p_idx) const; int get_node_property_count(int p_idx) const; StringName get_node_property_name(int p_idx, int p_prop) const; @@ -174,7 +176,7 @@ public: int find_name(const StringName &p_name) const; int add_value(const Variant &p_value); int add_node_path(const NodePath &p_path); - int add_node(int p_parent, int p_owner, int p_type, int p_name, int p_instance); + int add_node(int p_parent, int p_owner, int p_type, int p_name, int p_instance, int p_index); void add_node_property(int p_node, int p_name, int p_value); void add_node_group(int p_node, int p_group); void set_base_scene(int p_idx); |