diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-11-10 19:18:00 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-11-10 19:18:41 +0300 |
commit | 8d9c7e6988f39a3fd5e7bbaed5ac0aadded76648 (patch) | |
tree | 58cad7de9749d9bbf7f06d56ea3468ad63040243 /source/blender/blenkernel | |
parent | d9c89f175f945e5f7fb40ddd3326ceeca21ad366 (diff) |
Correct order-of-freeing error from last commit
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 5d5bfd9aafb..b30538719ae 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -388,7 +388,7 @@ void BKE_object_free_ex(Object *ob, bool do_id_user) { 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) */ if (ob->data) { @@ -436,7 +436,6 @@ void BKE_object_free_ex(Object *ob, bool do_id_user) if (ob->mpath) animviz_free_motionpath(ob->mpath); BKE_bproperty_free_list(&ob->prop); - BKE_object_free_modifiers(ob); free_sensors(&ob->sensors); free_controllers(&ob->controllers); |