svn merge -r 12208:12294 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Thu, 18 Oct 2007 23:27:31 +0000 (23:27 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Thu, 18 Oct 2007 23:27:31 +0000 (23:27 +0000)
1  2 
source/blender/blenkernel/intern/modifier.c
source/blender/blenloader/intern/readfile.c
source/blender/src/buttons_editing.c
source/blender/src/editobject.c
source/blender/src/transform_conversions.c
source/blender/src/transform_generics.c

Simple merge
Simple merge
index 71e672971f52c766628f515946dab72b8ca3cc58,3e1f08c82a3ba3162dc09591f5af9229265945ae..7c4307a2eac9720c5e86bfc3df45a1e586a594b4
@@@ -2848,14 -2852,11 +2852,14 @@@ void special_aftertrans_update(TransInf
                        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) && (base->flag & SELECT)){
+                       if ((!cancelled) && (t->mode != TFM_DUMMY) && (base->flag & SELECT)) {
                                autokeyframe_ob_cb_func(ob, t->mode);
                        }