Merging r40653 through r40847 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / transform / transform_generics.c
index 741b649263592313b694a268357644793e9327b5..cfdd370e568e443c08bfaef1942833c13935a532 100644 (file)
@@ -1232,6 +1232,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 +1321,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);