From fb70ee0bb5b21ed6dc03d1de6ef138da58113ffe Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 12 Nov 2018 09:56:33 +1100 Subject: Cleanup: minor gpencil changes - Replace BKE_brush_getactive_gpencil -> BKE_paint_brush (no need for per-paint-type brush access). - Rename TOT_GP_EDITBRUSH_TYPES -> GP_EDITBRUSH_TYPE_MAX (avoid sharing prefix w/ unrelated constants). - Rename instances of `GP_EditBrush_Data` to 'gp_brush' (`Brush` is typically called 'brush'). --- source/blender/editors/screen/screen_context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/editors/screen/screen_context.c') diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c index ff048edae9c..1cfe34c86a1 100644 --- a/source/blender/editors/screen/screen_context.c +++ b/source/blender/editors/screen/screen_context.c @@ -542,7 +542,7 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult } } else if (CTX_data_equals(member, "active_gpencil_brush")) { - Brush *brush = BKE_brush_getactive_gpencil(scene->toolsettings); + Brush *brush = BKE_paint_brush(&scene->toolsettings->gp_paint->paint); if (brush) { CTX_data_pointer_set(result, &scene->id, &RNA_Brush, brush); -- cgit v1.2.3