Merging r41597 through r41607 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / transform / transform_generics.c
index 741b649263592313b694a268357644793e9327b5..53e379a2d270a345d34718dded9d67b86a27f4bf 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -988,7 +986,7 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
        
        if (event)
        {
-               VECCOPY2D(t->imval, event->mval);
+               copy_v2_v2_int(t->imval, event->mval);
                t->event_type = event->type;
        }
        else
@@ -1232,6 +1230,12 @@ int initTransInfo (bContext *C, TransInfo *t, wmOperator *op, wmEvent *event)
                t->options |= CTX_NO_PET;
        }
        
+       // Mirror is not supported with PET, turn it off.
+       if (t->flag & T_PROP_EDIT)
+       {
+               t->flag &= ~T_MIRROR;
+       }
+
        setTransformViewMatrices(t);
        initNumInput(&t->num);
        
@@ -1315,7 +1319,8 @@ void applyTransObjects(TransInfo *t)
        recalcData(t);
 }
 
-static void restoreElement(TransData *td) {
+static void restoreElement(TransData *td)
+{
        /* TransData for crease has no loc */
        if (td->loc) {
                copy_v3_v3(td->loc, td->iloc);
@@ -1339,7 +1344,7 @@ static void restoreElement(TransData *td) {
                        copy_v3_v3(td->ext->size, td->ext->isize);
                }
                if (td->ext->quat) {
-                       QUATCOPY(td->ext->quat, td->ext->iquat);
+                       copy_qt_qt(td->ext->quat, td->ext->iquat);
                }
        }