Commit: 7a40a8c0efed52e8cfe8c898f73b8ef168c1b866
Author: Joshua Leung
Date: Tue Jul 10 19:52:23 2018 +1200
Branches: greasepencil-object
https://developer.blender.org/rB7a40a8c0efed52e8cfe8c898f73b8ef168c1b866
Cleanup/Fixes
* Remove hack that's no longer needed
* Don't change the GP Eraser Size userpref property from GP Object
drawing operator, as it doesn't use that anymore. Instead, the
eraser brush's size gets adjusted instead.
===================================================================
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 d12b3f5a732..7d4ae1fbfd6 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1728,11 +1728,6 @@ static bool gp_session_initdata(bContext *C, wmOperator
*op, tGPsdata *p)
*/
gp_init_colors(p);
}
- else {
- #if 1 /* XXX: Temporary hack only - Materials won't be used
here in future... */
- gp_init_colors(p);
- #endif
- }
/* lock axis */
p->lock_axis = ts->gp_sculpt.lock_axis;
@@ -2123,7 +2118,9 @@ static void gpencil_draw_exit(bContext *C, wmOperator *op)
* NOTE: Do this even when not in eraser mode, as eraser may
* have been toggled at some point.
*/
- U.gp_eraser = p->radius;
+ if (p->eraser) {
+ p->eraser->size = p->radius;
+ }
/* cleanup */
gp_paint_cleanup(p);
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
