[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49043] trunk/blender/source/blender/ editors: mask transform aspect correction wasn't working properly, also fix for own recent commit which made cyclic report not show

[Campbell Barton]

Revision: 49043
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49043
Author:   campbellbarton
Date:     2012-07-18 20:32:31 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
mask transform aspect correction wasn't working properly, also fix for own 
recent commit which made cyclic report not show

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_group.c
    trunk/blender/source/blender/editors/transform/transform.c

Modified: trunk/blender/source/blender/editors/object/object_group.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_group.c  2012-07-18 
20:01:06 UTC (rev 49042)
+++ trunk/blender/source/blender/editors/object/object_group.c  2012-07-18 
20:32:31 UTC (rev 49043)
@@ -133,6 +133,10 @@
                        }
                        CTX_DATA_END;
 
+                       if (is_cycle) {
+                               BKE_report(op->reports, RPT_WARNING, "Skipped 
some groups because of cycle detected");
+                       }
+
                        DAG_scene_sort(bmain, scene);
                        WM_event_add_notifier(C, NC_GROUP | NA_EDITED, NULL);
 
@@ -140,10 +144,6 @@
                }
        }
 
-       if (is_cycle) {
-               BKE_report(op->reports, RPT_WARNING, "Skipped some groups 
because of cycle detected");
-       }
-
        return OPERATOR_CANCELLED;
 }
 

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c  2012-07-18 
20:01:06 UTC (rev 49042)
+++ trunk/blender/source/blender/editors/transform/transform.c  2012-07-18 
20:32:31 UTC (rev 49043)
@@ -174,8 +174,14 @@
 
                if (t->options & CTX_MASK) {
                        /* clamp w/h, mask only */
-                       divx = divy = maxf(divx, divy);
-                       mulx = muly = minf(mulx, muly);
+                       if (mulx < muly) {
+                               divx = divy = divx;
+                               mulx = muly = mulx;
+                       }
+                       else {
+                               divx = divy = divy;
+                               mulx = muly = muly;
+                       }
                }
 
                r_vec[0] = mulx * (dx) / divx;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs