=bmesh= merge from trunk at r36529
[blender.git] / source / blender / editors / transform / transform_conversions.c
index 25a3498403bcdcd3590b02c2e6628a94b5ed95e0..54f3b7037848c187d96f0e08f61fea609ffffa72 100644 (file)
@@ -3882,7 +3882,7 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
                }
        }
 #endif
-    
+
        /* for extend we need to do some tricks */
        if (t->mode == TFM_TIME_EXTEND) {
 
@@ -4948,10 +4948,16 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
                 */
                if ((saction->flag & SACTION_MARKERS_MOVE) && (cancelled == 0)) {
                        if (t->mode == TFM_TIME_TRANSLATE) {
-                               if (ELEM(t->frame_side, 'L', 'R')) /* TFM_TIME_EXTEND */
+#if 0
+                               if (ELEM(t->frame_side, 'L', 'R')) { /* TFM_TIME_EXTEND */
+                                       /* same as below */
                                        ED_markers_post_apply_transform(ED_context_get_markers(C), t->scene, t->mode, t->vec[0], t->frame_side);
+                               }
                                else /* TFM_TIME_TRANSLATE */
+#endif
+                               {
                                        ED_markers_post_apply_transform(ED_context_get_markers(C), t->scene, t->mode, t->vec[0], t->frame_side);
+                               }
                        }
                        else if (t->mode == TFM_TIME_SCALE) {
                                ED_markers_post_apply_transform(ED_context_get_markers(C), t->scene, t->mode, t->vec[0], t->frame_side);