[Bf-blender-cvs] [f8f7dc6] soc-2013-paint: Functionality Review:

Antony Riakiotakis noreply at git.blender.org
Tue Jul 15 23:41:28 CEST 2014


Commit: f8f7dc6d6d2894accfe4a3026476f2a678be7515
Author: Antony Riakiotakis
Date:   Wed Jul 16 00:41:20 2014 +0300
https://developer.blender.org/rBf8f7dc6d6d2894accfe4a3026476f2a678be7515

Functionality Review:

Bugfix: Paint curves not functioning in weight painting.

===================================================================

M	source/blender/editors/transform/transform_conversions.c

===================================================================

diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 01b37f6..c127d11 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -7333,7 +7333,7 @@ void createTransData(bContext *C, TransInfo *t)
 		// XXX active-layer checking isn't done as that should probably be checked through context instead
 		createTransPose(t, ob);
 	}
-	else if (ob && (ob->mode & OB_MODE_WEIGHT_PAINT)) {
+	else if (ob && (ob->mode & OB_MODE_WEIGHT_PAINT) && !(t->options & CTX_PAINT_CURVE)) {
 		/* important that ob_armature can be set even when its not selected [#23412]
 		 * lines below just check is also visible */
 		Object *ob_armature = modifiers_isDeformedByArmature(ob);




More information about the Bf-blender-cvs mailing list