Commit: 8eac4085be42f01d09843e918936a01d3615d518
Author: Antony Riakiotakis
Date: Sat Apr 4 22:38:31 2015 +0200
Branches: master
https://developer.blender.org/rB8eac4085be42f01d09843e918936a01d3615d518
Fix T44264 copy paste error, checking same condition twice.
===================================================================
M source/blender/editors/sculpt_paint/paint_image.c
===================================================================
diff --git a/source/blender/editors/sculpt_paint/paint_image.c
b/source/blender/editors/sculpt_paint/paint_image.c
index 5cfbd16..097ffe3 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -1393,7 +1393,7 @@ static int texture_paint_toggle_exec(bContext *C,
wmOperator *op)
if (ma && ma->texpaintslot)
ima =
ma->texpaintslot[ma->paint_active_slot].ima;
}
- else if (imapaint->mode == IMAGEPAINT_MODE_MATERIAL) {
+ else if (imapaint->mode == IMAGEPAINT_MODE_IMAGE) {
ima = imapaint->canvas;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
