Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2018-11-12 01:56:33 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-11-12 01:59:16 +0300
commitfb70ee0bb5b21ed6dc03d1de6ef138da58113ffe (patch)
treef875903c87699880af52ffcc755e7d4e0bf02684 /source/blender/editors/screen/screen_context.c
parent9c3e324a0d6cb28c9db58f644838032577b41764 (diff)
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').
Diffstat (limited to 'source/blender/editors/screen/screen_context.c')
-rw-r--r--source/blender/editors/screen/screen_context.c2
1 files changed, 1 insertions, 1 deletions
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);