Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Correct order-of-freeing error from last commit

Browse Source
This commit is contained in:
Campbell Barton
2015-11-11 03:18:00 +11:00
parent d9c89f175f
commit 8d9c7e6988
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/object.c
View File

@@ -388,7 +388,7 @@ void BKE_object_free_ex(Object *ob, bool do_id_user)
{ {
int a; int a;
BKE_object_free_derived_caches(ob); BKE_object_free_modifiers(ob);
/* disconnect specific data, but not for lib data (might be indirect data, can get relinked) */ /* disconnect specific data, but not for lib data (might be indirect data, can get relinked) */
if (ob->data) { if (ob->data) {
@@ -436,7 +436,6 @@ void BKE_object_free_ex(Object *ob, bool do_id_user)
if (ob->mpath) if (ob->mpath)
animviz_free_motionpath(ob->mpath); animviz_free_motionpath(ob->mpath);
BKE_bproperty_free_list(&ob->prop); BKE_bproperty_free_list(&ob->prop);
BKE_object_free_modifiers(ob);
free_sensors(&ob->sensors); free_sensors(&ob->sensors);
free_controllers(&ob->controllers); free_controllers(&ob->controllers);