Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

-Make sure scenes properly update when switching tabs, even if sub-instances changed. Fixes #3201

Browse source
This commit is contained in:
Juan Linietsky 2016-01-14 11:06:20 -03:00
parent e2be837520
commit 4248c84e20
7 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
tools/editor/editor_node.cpp
View file

@ -3623,7 +3623,18 @@ Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bo
add_io_error(txt);
}
sdata->set_path(lpath,true); //take over path
if (ResourceCache::has(lpath)) {
//used from somewhere else? no problem! update state
Ref<PackedScene> ps = Ref<PackedScene>( ResourceCache::get(lpath)->cast_to<PackedScene>() );
if (ps.is_valid()) {
ps->replace_state( sdata->get_state() );
ps->set_last_modified_time( sdata->get_last_modified_time() );
sdata=ps;
}
} else {
sdata->set_path(lpath,true); //take over path
}
Node*new_scene=sdata->instance(true);