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

Crash fixes for material and animtree

Browse source
This commit is contained in:
Juan Linietsky 2018-08-20 16:35:36 -03:00
parent c1bd768ca2
commit 031f763d4f
5 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/resource.cpp
View file

@ -151,7 +151,7 @@ Ref<Resource> Resource::duplicate_for_local_scene(Node *p_for_scene, Map<Ref<Res
List<PropertyInfo> plist;
get_property_list(&plist);
Resource *r = (Resource *)ClassDB::instance(get_class());
Resource *r = Object::cast_to<Resource>(ClassDB::instance(get_class()));
ERR_FAIL_COND_V(!r, Ref<Resource>());
r->local_scene = p_for_scene;
@ -182,7 +182,9 @@ Ref<Resource> Resource::duplicate_for_local_scene(Node *p_for_scene, Map<Ref<Res
r->set(E->get().name, p);
}
return Ref<Resource>(r);
RES res = Ref<Resource>(r);
return res;
}
void Resource::configure_for_local_scene(Node *p_for_scene, Map<Ref<Resource>, Ref<Resource> > &remap_cache) {