Merging r47624 through r47661 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / transform / transform.c
index ea86083fac4ffb56103f441cddadc102256ff1da..d41294c787518b750e649f0eb980ed16cd9edc64 100644 (file)
@@ -815,6 +815,14 @@ int transformEvent(TransInfo *t, wmEvent *event)
                                        initSnapping(t, NULL); // need to reinit after mode change
                                        t->redraw |= TREDRAW_HARD;
                                }
+                               else if (t->mode == TFM_RESIZE) {
+                                       if (t->options & CTX_MOVIECLIP) {
+                                               restoreTransObjects(t);
+
+                                               t->flag ^= T_ALT_TRANSFORM;
+                                               t->redraw |= TREDRAW_HARD;
+                                       }
+                               }
                                break;
                                
                        case TFM_MODAL_SNAP_INV_ON:
@@ -2730,6 +2738,9 @@ static void ElementResize(TransInfo *t, TransData *td, float mat[3][3])
        {
                copy_v3_v3(center, td->center);
        }
+       else if (t->options & CTX_MOVIECLIP) {
+               copy_v3_v3(center, td->center);
+       }
        else {
                copy_v3_v3(center, t->center);
        }
@@ -3103,6 +3114,10 @@ static void ElementRotation(TransInfo *t, TransData *td, float mat[3][3], short
                {
                        center = td->center;
                }
+
+               if (t->options & CTX_MOVIECLIP) {
+                       center = td->center;
+               }
        }
 
        if (t->flag & T_POINTS) {