[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55944] trunk/blender/source/blender/ editors/transform/transform_constraints.c: correction to own recent changes to exitmode using axis-matrix, fallback to old behavior for editmodes where the axis-matrix isnt set ( curve, surface, lattice)

Campbell Barton ideasman42 at gmail.com
Thu Apr 11 01:05:38 CEST 2013


Revision: 55944
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55944
Author:   campbellbarton
Date:     2013-04-10 23:05:35 +0000 (Wed, 10 Apr 2013)
Log Message:
-----------
correction to own recent changes to exitmode using axis-matrix, fallback to old behavior for editmodes where the axis-matrix isnt set (curve, surface, lattice)

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

Modified: trunk/blender/source/blender/editors/transform/transform_constraints.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_constraints.c	2013-04-10 22:49:50 UTC (rev 55943)
+++ trunk/blender/source/blender/editors/transform/transform_constraints.c	2013-04-10 23:05:35 UTC (rev 55944)
@@ -559,7 +559,10 @@
 {
 	/* edit-mode now allows local transforms too */
 #if 1
-	if ((t->flag & T_EDIT) && (t->around != V3D_LOCAL)) {
+	if ((t->flag & T_EDIT) &&
+	    /* not all editmode supports axis-matrix */
+	    ((t->around != V3D_LOCAL) || (!ELEM3(t->obedit->type, OB_MESH, OB_MBALL, OB_ARMATURE))))
+	{
 		float obmat[3][3];
 		copy_m3_m4(obmat, t->scene->obedit->obmat);
 		normalize_m3(obmat);




More information about the Bf-blender-cvs mailing list