[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25617] trunk/blender/source/blender/ editors/transform/transform.c: mmb only cancels constraint if mouse isn' t moved (was broken since early 2.5 code, selection code needed to be earlier in event handling).

Martin Poirier theeth at yahoo.com
Tue Dec 29 22:20:46 CET 2009


Revision: 25617
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25617
Author:   theeth
Date:     2009-12-29 22:20:46 +0100 (Tue, 29 Dec 2009)

Log Message:
-----------
mmb only cancels constraint if mouse isn't moved (was broken since early 2.5 code, selection code needed to be earlier in event handling).

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

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2009-12-29 20:44:51 UTC (rev 25616)
+++ trunk/blender/source/blender/editors/transform/transform.c	2009-12-29 21:20:46 UTC (rev 25617)
@@ -533,6 +533,9 @@
 
 	if (event->type == MOUSEMOVE)
 	{
+		if (t->modifiers & MOD_CONSTRAINT_SELECT)
+			t->con.mode |= CON_SELECT;
+
 		t->mval[0] = event->x - t->ar->winrct.xmin;
 		t->mval[1] = event->y - t->ar->winrct.ymin;
 
@@ -742,11 +745,11 @@
 					}
 				}
 				else {
+					t->modifiers |= MOD_CONSTRAINT_SELECT;
 					if (t->con.mode & CON_APPLY) {
 						stopConstraint(t);
 					}
 					else {
-						t->modifiers |= MOD_CONSTRAINT_SELECT;
 						if (event->shift) {
 							initSelectConstraint(t, t->spacemtx);
 						}
@@ -1606,9 +1609,6 @@
 {
 	if (t->redraw)
 	{
-		if (t->modifiers & MOD_CONSTRAINT_SELECT)
-			t->con.mode |= CON_SELECT;
-
 		selectConstraint(t);
 		if (t->transform) {
 			t->transform(t, t->mval);  // calls recalcData()





More information about the Bf-blender-cvs mailing list