manually merged older changes from trunk.
[blender.git] / source / blender / editors / transform / transform_conversions.c
index 79cb33ce22b0a89351d438f70b429414a7c7a15e..7939672b23ec7120ae4356216807eebe08cc07e2 100644 (file)
@@ -2288,7 +2288,6 @@ static void createTransEditVerts(bContext *C, TransInfo *t)
                }
        }
        
-
        /* crazy space free */
        if(quats)
                MEM_freeN(quats);
@@ -5114,8 +5113,8 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 
                for (i = 0; i < t->total; i++) {
                        TransData *td = t->data + i;
-                               ListBase pidlist;
-                               PTCacheID *pid;
+                       ListBase pidlist;
+                       PTCacheID *pid;
                        ob = td->ob;
 
                        if (td->flag & TD_NOACTION)
@@ -5132,9 +5131,9 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
                        }
                        BLI_freelistN(&pidlist);
 
-                               /* pointcache refresh */
+                       /* pointcache refresh */
                        if (BKE_ptcache_object_reset(t->scene, ob, PTCACHE_RESET_OUTDATED))
-                                       ob->recalc |= OB_RECALC_DATA;
+                               ob->recalc |= OB_RECALC_DATA;
 
                        /* Needed for proper updating of "quick cached" dynamics. */
                        /* Creates troubles for moving animated objects without */
@@ -5185,7 +5184,7 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 #endif
 }
 
-static void createTransObject(struct bContext *C, TransInfo *t)
+static void createTransObject(bContext *C, TransInfo *t)
 {
        TransData *td = NULL;
        TransDataExtension *tx;