Particle merge: svn merge -r 12653:12664 https://svn.blender.org/svnroot/bf-blender...

[blender-staging.git] / source / blender / src / transform_generics.c

diff --git a/source/blender/src/transform_generics.c b/source/blender/src/transform_generics.c
index d0ca1f4cd742e7334e82a95d42613b03229676af..deed252501ee08c28a8dcc2dbac46c22fe85d284 100644 (file)
--- a/source/blender/src/transform_generics.c
+++ b/source/blender/src/transform_generics.c
@@ -74,6 +74,7 @@
 #include "BKE_action.h"
 #include "BKE_anim.h"
 #include "BKE_armature.h"
+#include "BKE_cloth.h"
 #include "BKE_curve.h"
 #include "BKE_depsgraph.h"
 #include "BKE_displist.h"
@@ -466,8 +467,16 @@ void recalcData(TransInfo *t)
                        /* bah, softbody exception... recalcdata doesnt reset */
                        for(base= FIRSTBASE; base; base= base->next) {
                                if(base->object->recalc & OB_RECALC_DATA)
+                               {                                       
+                                       ClothModifierData *clmd = NULL;
+                                       
                                        if(modifiers_isSoftbodyEnabled(base->object)) {
                                                base->object->softflag |= OB_SB_REDO;
+                                       }
+                                       else if((clmd = (ClothModifierData *)modifiers_isClothEnabled(ob))) {
+                                               cloth_free_modifier(clmd);
+                                       }
+                                       
                                }
                        }
                }
@@ -503,10 +512,17 @@ void recalcData(TransInfo *t)
                                }                               
                        }
                        
-                       /* softbody exception */
-                       if(modifiers_isSoftbodyEnabled(ob)) {
-                               if(ob->recalc & OB_RECALC_DATA)
-                                       ob->softflag |= OB_SB_REDO;
+                       /* softbody & cloth exception */
+                       if(ob->recalc & OB_RECALC_DATA)
+                       {
+                               ClothModifierData *clmd = NULL;
+                               
+                               if(modifiers_isSoftbodyEnabled(ob)) {
+                                               ob->softflag |= OB_SB_REDO;
+                               }
+                               else if((clmd = (ClothModifierData *)modifiers_isClothEnabled(ob))) {
+                                       cloth_free_modifier(clmd);
+                               }
                        }
                        
                        /* proxy exception */