godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix node duplication in scene sub-inheritance

Browse Source
This commit is contained in:
Pedro J. Estébanez 2017-03-08 20:08:24 +01:00
parent 6163343118
commit 383dea5796
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editor/editor_node.cpp
View File

@ -925,6 +925,11 @@ void EditorNode::_save_scene(String p_file, int idx) {
return; return;
} }
// force creation of node path cache
// (hacky but needed for the tree to update properly)
Node *dummy_scene = sdata->instance(PackedScene::GEN_EDIT_STATE_INSTANCE);
memdelete(dummy_scene);
int flg = 0; int flg = 0;
if (EditorSettings::get_singleton()->get("filesystem/on_save/compress_binary_resources")) if (EditorSettings::get_singleton()->get("filesystem/on_save/compress_binary_resources"))
flg |= ResourceSaver::FLAG_COMPRESS; flg |= ResourceSaver::FLAG_COMPRESS;

25
scene/resources/packed_scene.cpp
View File

@ -995,12 +995,12 @@ int SceneState::find_node_by_path(const NodePath &p_node) const {
if (_get_base_scene_state().is_valid()) { if (_get_base_scene_state().is_valid()) {
int idx = _get_base_scene_state()->find_node_by_path(p_node); int idx = _get_base_scene_state()->find_node_by_path(p_node);
if (idx >= 0) { if (idx >= 0) {
if (!base_scene_node_remap.has(idx)) { int rkey = _find_base_scene_node_remap_key(idx);
int ridx = nodes.size() + base_scene_node_remap.size(); if (rkey == -1) {
base_scene_node_remap[ridx] = idx; rkey = nodes.size() + base_scene_node_remap.size();
base_scene_node_remap[rkey] = idx;
} }
return rkey;
return base_scene_node_remap[idx];
} }
} }
return -1; return -1;
@ -1013,11 +1013,24 @@ int SceneState::find_node_by_path(const NodePath &p_node) const {
//the node in the instanced scene, as a property may be missing //the node in the instanced scene, as a property may be missing
//from the local one //from the local one
int idx = _get_base_scene_state()->find_node_by_path(p_node); int idx = _get_base_scene_state()->find_node_by_path(p_node);
base_scene_node_remap[nid] = idx; if (idx != -1) {
base_scene_node_remap[nid] = idx;
}
} }
return nid; return nid;
} }
int SceneState::_find_base_scene_node_remap_key(int p_idx) const {
for (Map<int, int>::Element *E = base_scene_node_remap.front(); E; E = E->next()) {
if (E->value() == p_idx) {
return E->key();
}
}
return -1;
}
Variant SceneState::get_property_value(int p_node, const StringName &p_property, bool &found) const { Variant SceneState::get_property_value(int p_node, const StringName &p_property, bool &found) const {
found = false; found = false;

2
scene/resources/packed_scene.h
View File

@ -100,6 +100,8 @@ class SceneState : public Reference {
PoolVector<String> _get_node_groups(int p_idx) const; PoolVector<String> _get_node_groups(int p_idx) const;
int _find_base_scene_node_remap_key(int p_idx) const;
protected: protected:
static void _bind_methods(); static void _bind_methods();