[Bf-blender-cvs] [80248ce] soc-2013-paint: some more guards against transform "leaks"

Antony Riakiotakis noreply at git.blender.org
Sat May 10 18:14:13 CEST 2014


Commit: 80248ce4b48fa6c0eaa297fa4ed50fd013409586
Author: Antony Riakiotakis
Date:   Sat May 10 19:04:37 2014 +0300
https://developer.blender.org/rB80248ce4b48fa6c0eaa297fa4ed50fd013409586

some more guards against transform "leaks"

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

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

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

diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 3890802..5b041b9 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1240,11 +1240,14 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 		else if (sima->mode == SI_MODE_MASK) {
 			t->options |= CTX_MASK;
 		}
-		else if (sima->mode == SI_MODE_PAINT){
-			t->options |= CTX_PAINT_CURVE;
-			t->around = V3D_CENTER;
-			/* image not in uv edit, nor in mask mode, can happen for some tools */
+		else if (sima->mode == SI_MODE_PAINT) {
+			Paint *p = &sce->toolsettings->imapaint;
+			if (p->brush && (p->brush->flag & BRUSH_CURVE)) {
+				t->options |= CTX_PAINT_CURVE;
+				t->around = V3D_CENTER;
+			}
 		}
+		/* image not in uv edit, nor in mask mode, can happen for some tools */
 	}
 	else if (t->spacetype == SPACE_NODE) {
 		// XXX for now, get View2D from the active region




More information about the Bf-blender-cvs mailing list