Particle merge: svn merge -r 12653:12664 https://svn.blender.org/svnroot/bf-blender...
[blender-staging.git] / source / blender / src / transform_conversions.c
index 78284e11e744f65dec13d59da86dcc5d7b04d9d7..d43ff88597548ba442399e60ecac1535d946b852 100644 (file)
@@ -77,6 +77,7 @@
 #include "BKE_action.h"
 #include "BKE_armature.h"
 #include "BKE_blender.h"
+#include "BKE_cloth.h"
 #include "BKE_curve.h"
 #include "BKE_constraint.h"
 #include "BKE_depsgraph.h"
@@ -3219,13 +3220,17 @@ void special_aftertrans_update(TransInfo *t)
        }
        else {
                base= FIRSTBASE;
-               while (base) {  
-                       
+
+               while (base) {                  
+
                        if(base->flag & BA_DO_IPO) redrawipo= 1;
                        
                        ob= base->object;
                        
                        if (modifiers_isSoftbodyEnabled(ob)) ob->softflag |= OB_SB_REDO;
+                       else if(modifiers_isClothEnabled(ob)) {
+                               cloth_free_modifier(modifiers_isClothEnabled(ob));
+                       }
                        
                        /* Set autokey if necessary */
                        if ((!cancelled) && (t->mode != TFM_DUMMY) && (base->flag & SELECT)) {