[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33388] trunk/blender/source/blender/ editors: bugfix [#24974] "select all" in weight paint -> face selection mode selects all bones instead of all faces

[Campbell Barton]

Revision: 33388
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33388
Author:   campbellbarton
Date:     2010-11-30 06:15:58 +0100 (Tue, 30 Nov 2010)

Log Message:
-----------
bugfix [#24974] "select all" in weight paint -> face selection mode selects all bones instead of all faces
face mask mode overrides pose mode keys. also removed function call from transform code.

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

Modified: trunk/blender/source/blender/editors/space_view3d/space_view3d.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2010-11-30 01:03:17 UTC (rev 33387)
+++ trunk/blender/source/blender/editors/space_view3d/space_view3d.c	2010-11-30 05:15:58 UTC (rev 33388)
@@ -317,6 +317,10 @@
 
 	/* object ops. */
 	
+	/* important to be before Pose keymap since they can both be enabled at once */
+	keymap= WM_keymap_find(wm->defaultconf, "Face Mask", 0, 0);
+	WM_event_add_keymap_handler(&ar->handlers, keymap);
+	
 	/* pose is not modal, operator poll checks for this */
 	keymap= WM_keymap_find(wm->defaultconf, "Pose", 0, 0);
 	WM_event_add_keymap_handler(&ar->handlers, keymap);
@@ -332,9 +336,6 @@
 
 	keymap= WM_keymap_find(wm->defaultconf, "Weight Paint", 0, 0);
 	WM_event_add_keymap_handler(&ar->handlers, keymap);
-	
-	keymap= WM_keymap_find(wm->defaultconf, "Face Mask", 0, 0);
-	WM_event_add_keymap_handler(&ar->handlers, keymap);
 
 	keymap= WM_keymap_find(wm->defaultconf, "Sculpt", 0, 0);
 	WM_event_add_keymap_handler(&ar->handlers, keymap);

Modified: trunk/blender/source/blender/editors/transform/transform.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.c	2010-11-30 01:03:17 UTC (rev 33387)
+++ trunk/blender/source/blender/editors/transform/transform.c	2010-11-30 05:15:58 UTC (rev 33388)
@@ -3111,9 +3111,7 @@
 	char str[64];
 	
 	float final;
-	
-	float mat[3][3];
-	
+
 	final = t->values[0];
 	
 	applyNDofInput(&t->ndof, &final);
@@ -3152,8 +3150,6 @@
 	}
 	
 	t->values[0] = final;
-
-	vec_rot_to_mat3( mat, t->axis, final);
 	
 	applyRotation(t, final, t->axis);