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-12-17 09:17:43 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-12-17 09:17:43 +0300
commit7fac1bfc203198583eb2e65caedec6b32c24484f (patch)
tree03799fed04d454aef2c6f0c44f15897c69767332 /source/blender/editors/screen
parentc73958a100baa014ee71bbb0b612b1e2303b6d50 (diff)
Context: remove active_gpencil_brush
We don't have this for other painting modes, no need for a special case here.
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r--source/blender/editors/screen/screen_context.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/source/blender/editors/screen/screen_context.c b/source/blender/editors/screen/screen_context.c
index 287d0ad37b9..a33bea4d1be 100644
--- a/source/blender/editors/screen/screen_context.c
+++ b/source/blender/editors/screen/screen_context.c
@@ -86,7 +86,7 @@ const char *screen_context_dir[] = {
"sequences", "selected_sequences", "selected_editable_sequences", /* sequencer */
"gpencil_data", "gpencil_data_owner", /* grease pencil data */
"visible_gpencil_layers", "editable_gpencil_layers", "editable_gpencil_strokes",
- "active_gpencil_layer", "active_gpencil_frame", "active_gpencil_brush",
+ "active_gpencil_layer", "active_gpencil_frame",
"active_operator", "selected_editable_fcurves",
NULL};
@@ -578,14 +578,6 @@ int ed_screen_context(const bContext *C, const char *member, bContextDataResult
}
}
}
- else if (CTX_data_equals(member, "active_gpencil_brush")) {
- Brush *brush = BKE_paint_brush(&scene->toolsettings->gp_paint->paint);
-
- if (brush) {
- CTX_data_pointer_set(result, &scene->id, &RNA_Brush, brush);
- return 1;
- }
- }
else if (CTX_data_equals(member, "active_gpencil_frame")) {
/* XXX: see comment for gpencil_data case... */
bGPdata *gpd = ED_gpencil_data_get_active_direct((ID *)sc, sa, scene, obact);