[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11286] trunk/blender/source/blender/src/ editobject.c: Bugfix #6945: Weight painting bug

Joshua Leung aligorith at gmail.com
Mon Jul 16 07:49:04 CEST 2007


Revision: 11286
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11286
Author:   aligorith
Date:     2007-07-16 07:49:04 +0200 (Mon, 16 Jul 2007)

Log Message:
-----------
Bugfix #6945: Weight painting bug

Trying to Clear Rotation of a armature bone while in Weight Painting mode didn't work anymore due to Bugfix #6486. Now it checks if ob==active_object and also if weightpainting is on.

Modified Paths:
--------------
    trunk/blender/source/blender/src/editobject.c

Modified: trunk/blender/source/blender/src/editobject.c
===================================================================
--- trunk/blender/source/blender/src/editobject.c	2007-07-16 05:17:39 UTC (rev 11285)
+++ trunk/blender/source/blender/src/editobject.c	2007-07-16 05:49:04 UTC (rev 11286)
@@ -999,9 +999,15 @@
 		if TESTBASELIB(base) {
 			ob= base->object;
 			
-			if( (ob->flag & OB_POSEMODE) && ob==OBACT) {
-				clear_armature(ob, mode);
-				armature_clear= 1;	/* silly system to prevent another dag update, so no action applied */
+			if ((ob->flag & OB_POSEMODE)) {
+				/* only clear pose transforms if:
+				 *	- with a mesh in weightpaint mode, it's related armature needs to be cleared
+				 *	- with clearing transform of object being edited at the time
+				 */
+				if ((G.f & G_WEIGHTPAINT) || ob==OBACT) {
+					clear_armature(ob, mode);
+					armature_clear= 1;	/* silly system to prevent another dag update, so no action applied */
+				}
 			}
 			else if((G.f & G_WEIGHTPAINT)==0) {
 				





More information about the Bf-blender-cvs mailing list