[Bf-blender-cvs] [8d9c7e6] master: Correct order-of-freeing error from last commit

[Campbell Barton]

Commit: 8d9c7e6988f39a3fd5e7bbaed5ac0aadded76648
Author: Campbell Barton
Date: Wed Nov 11 03:18:00 2015 +1100
Branches: master
https://developer.blender.org/rB8d9c7e6988f39a3fd5e7bbaed5ac0aadded76648

Correct order-of-freeing error from last commit

===================================================================

M source/blender/blenkernel/intern/object.c

===================================================================

diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 5d5bfd9..b305387 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);