[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60480] trunk/blender/source/blender/ editors/transform/transform_conversions.c: fix for bug own recent commit [ #36904] Snap to Volume is broken with Armature

[Campbell Barton]

Revision: 60480
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60480
Author:   campbellbarton
Date:     2013-10-01 12:11:10 +0000 (Tue, 01 Oct 2013)
Log Message:
-----------
fix for bug own recent commit [#36904] Snap to Volume is broken with Armature

this is infact an older bug which was exposed by the recent change.
for now only use the change in behavior for scale/rotation.

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

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2013-10-01 11:44:39 UTC (rev 60479)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2013-10-01 12:11:10 UTC (rev 60480)
@@ -129,7 +129,10 @@
  */
 static void transform_around_single_fallback(TransInfo *t)
 {
-	if (t->total == 1 && ELEM3(t->around, V3D_CENTER, V3D_CENTROID, V3D_ACTIVE)) {
+	if ((t->total == 1) &&
+	    (ELEM3(t->around, V3D_CENTER, V3D_CENTROID, V3D_ACTIVE)) &&
+	    (ELEM3(t->mode, TFM_RESIZE, TFM_ROTATION, TFM_TRACKBALL)))
+	{
 		t->around = V3D_LOCAL;
 	}
 }