[Bf-blender-cvs] [4a2cb1937ca] greasepencil-object: Cleanup previous commit

Antonio Vazquez noreply at git.blender.org
Fri Mar 2 16:57:36 CET 2018


Commit: 4a2cb1937ca0af5d63a5697f5c517e7e58eaa7b0
Author: Antonio Vazquez
Date:   Fri Mar 2 16:57:15 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB4a2cb1937ca0af5d63a5697f5c517e7e58eaa7b0

Cleanup previous commit

Make more compact the code

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

M	source/blender/editors/gpencil/gpencil_paint.c

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

diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 1e19b19ee51..7644727da7d 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -2519,14 +2519,14 @@ static int gpencil_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event
 	if (p->paintmode == GP_PAINTMODE_ERASER) {
 		gpencil_draw_toggle_eraser_cursor(C, p, true);
 	}
+	else {
+		ED_gpencil_toggle_brush_cursor(C, true, NULL);
+	}
 	/* set cursor 
 	 * NOTE: This may change later (i.e. intentionally via brush toggle,
 	 *       or unintentionally if the user scrolls outside the area)...
 	 */
 	gpencil_draw_cursor_set(p);
-	if (p->paintmode != GP_PAINTMODE_ERASER) {
-		ED_gpencil_toggle_brush_cursor(C, true, NULL);
-	}
 
 	/* only start drawing immediately if we're allowed to do so... */
 	if (RNA_boolean_get(op->ptr, "wait_for_input") == false) {



More information about the Bf-blender-cvs mailing list