Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Context: remove active_gpencil_brush

Browse Source 
We don't have this for other painting modes,
no need for a special case here.
This commit is contained in:
Campbell Barton
2018-12-17 17:17:43 +11:00
parent c73958a100
commit 7fac1bfc20
8 changed files with 26 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/python_api/sphinx_doc_gen.py
View File

@@ -984,7 +984,6 @@ context_type_map = {
# context_member: (RNA type, is_collection) # context_member: (RNA type, is_collection)
"active_base": ("ObjectBase", False), "active_base": ("ObjectBase", False),
"active_bone": ("EditBone", False), "active_bone": ("EditBone", False),
"active_gpencil_brush": ("GPencilSculptBrush", False),
"active_gpencil_frame": ("GreasePencilLayer", True), "active_gpencil_frame": ("GreasePencilLayer", True),
"active_gpencil_layer": ("GPencilLayer", True), "active_gpencil_layer": ("GPencilLayer", True),
"active_node": ("Node", False), "active_node": ("Node", False),

2
release/scripts/startup/bl_operators/presets.py
View File

@@ -643,7 +643,7 @@ class AddPresetGpencilBrush(AddPresetBase, Operator):
preset_menu = "VIEW3D_PT_gpencil_brush_presets" preset_menu = "VIEW3D_PT_gpencil_brush_presets"
preset_defines = [ preset_defines = [
"brush = bpy.context.active_gpencil_brush", "brush = bpy.context.tool_settings.gpencil_paint.brush",
"settings = brush.gpencil_settings" "settings = brush.gpencil_settings"
] ]

9
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
View File

@@ -45,7 +45,8 @@ def gpencil_stroke_placement_settings(context, layout):
def gpencil_active_brush_settings_simple(context, layout): def gpencil_active_brush_settings_simple(context, layout):
brush = context.active_gpencil_brush tool_settings = context.tool_settings
brush = tool_settings.gpencil_paint.brush
if brush is None: if brush is None:
layout.label(text="No Active Brush") layout.label(text="No Active Brush")
return return
@@ -324,10 +325,11 @@ class GreasePencilAppearancePanel:
layout.use_property_split = True layout.use_property_split = True
layout.use_property_decorate = False layout.use_property_decorate = False
tool_settings = context.tool_settings
ob = context.active_object ob = context.active_object
if ob.mode == 'PAINT_GPENCIL': if ob.mode == 'PAINT_GPENCIL':
brush = context.active_gpencil_brush brush = tool_settings.gpencil_paint.brush
gp_settings = brush.gpencil_settings gp_settings = brush.gpencil_settings
sub = layout.column(align=True) sub = layout.column(align=True)
@@ -348,7 +350,7 @@ class GreasePencilAppearancePanel:
layout.prop(brush, "cursor_color_add", text="Color") layout.prop(brush, "cursor_color_add", text="Color")
elif ob.mode in {'SCULPT_GPENCIL', 'WEIGHT_GPENCIL'}: elif ob.mode in {'SCULPT_GPENCIL', 'WEIGHT_GPENCIL'}:
settings = context.tool_settings.gpencil_sculpt settings = tool_settings.gpencil_sculpt
brush = settings.brush brush = settings.brush
tool = settings.sculpt_tool tool = settings.sculpt_tool
@@ -452,7 +454,6 @@ class GPENCIL_MT_pie_settings_palette(Menu):
gpd = context.gpencil_data gpd = context.gpencil_data
gpl = context.active_gpencil_layer gpl = context.active_gpencil_layer
palcolor = None # context.active_gpencil_palettecolor palcolor = None # context.active_gpencil_palettecolor
# brush = context.active_gpencil_brush
is_editmode = bool(gpd and gpd.use_stroke_edit_mode and context.editable_gpencil_strokes) is_editmode = bool(gpd and gpd.use_stroke_edit_mode and context.editable_gpencil_strokes)

38
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@@ -1476,15 +1476,15 @@ class VIEW3D_PT_tools_grease_pencil_brush(View3DPanel, Panel):
layout.use_property_split = True layout.use_property_split = True
layout.use_property_decorate = False layout.use_property_decorate = False
ts = context.scene.tool_settings tool_settings = context.scene.tool_settings
settings = ts.gpencil_paint gpencil_paint = tool_settings.gpencil_paint
row = layout.row() row = layout.row()
col = row.column() col = row.column()
col.template_ID_preview(settings, "brush", new="brush.add_gpencil", rows=3, cols=8) col.template_ID_preview(gpencil_paint, "brush", new="brush.add_gpencil", rows=3, cols=8)
col = row.column() col = row.column()
brush = context.active_gpencil_brush brush = gpencil_paint.brush
sub = col.column(align=True) sub = col.column(align=True)
sub.operator("gpencil.brush_presets_create", icon='HELP', text="") sub.operator("gpencil.brush_presets_create", icon='HELP', text="")
@@ -1551,7 +1551,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_option(View3DPanel, Panel):
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
return brush is not None and brush.gpencil_tool != 'ERASE' return brush is not None and brush.gpencil_tool != 'ERASE'
def draw_header_preset(self, context): def draw_header_preset(self, context):
@@ -1563,7 +1563,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_option(View3DPanel, Panel):
layout.use_property_split = True layout.use_property_split = True
layout.use_property_decorate = False layout.use_property_decorate = False
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
gp_settings = brush.gpencil_settings gp_settings = brush.gpencil_settings
if brush is not None: if brush is not None:
@@ -1587,11 +1587,11 @@ class VIEW3D_PT_tools_grease_pencil_brush_stabilizer(View3DPanel, Panel):
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
return brush is not None and brush.gpencil_tool == 'DRAW' return brush is not None and brush.gpencil_tool == 'DRAW'
def draw_header(self, context): def draw_header(self, context):
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
gp_settings = brush.gpencil_settings gp_settings = brush.gpencil_settings
self.layout.prop(gp_settings, "use_settings_stabilizer", text="") self.layout.prop(gp_settings, "use_settings_stabilizer", text="")
@@ -1601,7 +1601,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_stabilizer(View3DPanel, Panel):
layout.use_property_split = True layout.use_property_split = True
layout.use_property_decorate = False layout.use_property_decorate = False
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
gp_settings = brush.gpencil_settings gp_settings = brush.gpencil_settings
layout.active = gp_settings.use_settings_stabilizer layout.active = gp_settings.use_settings_stabilizer
@@ -1617,11 +1617,11 @@ class VIEW3D_PT_tools_grease_pencil_brush_settings(View3DPanel, Panel):
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
return brush is not None and brush.gpencil_tool != 'ERASE' return brush is not None and brush.gpencil_tool != 'ERASE'
def draw_header(self, context): def draw_header(self, context):
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
gp_settings = brush.gpencil_settings gp_settings = brush.gpencil_settings
self.layout.prop(gp_settings, "use_settings_postprocess", text="") self.layout.prop(gp_settings, "use_settings_postprocess", text="")
@@ -1631,7 +1631,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_settings(View3DPanel, Panel):
layout.use_property_split = True layout.use_property_split = True
layout.use_property_decorate = False layout.use_property_decorate = False
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
gp_settings = brush.gpencil_settings gp_settings = brush.gpencil_settings
layout.active = gp_settings.use_settings_postprocess layout.active = gp_settings.use_settings_postprocess
@@ -1656,11 +1656,11 @@ class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel):
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
return brush is not None and brush.gpencil_tool != 'ERASE' return brush is not None and brush.gpencil_tool != 'ERASE'
def draw_header(self, context): def draw_header(self, context):
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
gp_settings = brush.gpencil_settings gp_settings = brush.gpencil_settings
self.layout.prop(gp_settings, "use_settings_random", text="") self.layout.prop(gp_settings, "use_settings_random", text="")
@@ -1670,7 +1670,7 @@ class VIEW3D_PT_tools_grease_pencil_brush_random(View3DPanel, Panel):
layout.use_property_split = True layout.use_property_split = True
layout.use_property_decorate = False layout.use_property_decorate = False
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
gp_settings = brush.gpencil_settings gp_settings = brush.gpencil_settings
layout.active = gp_settings.use_settings_random layout.active = gp_settings.use_settings_random
@@ -1691,7 +1691,7 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves(View3DPanel, Panel):
@classmethod @classmethod
def poll(cls, context): def poll(cls, context):
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
return brush is not None and brush.gpencil_tool != 'ERASE' return brush is not None and brush.gpencil_tool != 'ERASE'
@staticmethod @staticmethod
@@ -1709,7 +1709,7 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves_sensitivity(View3DPanel, Panel):
layout = self.layout layout = self.layout
layout.use_property_split = True layout.use_property_split = True
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
gp_settings = brush.gpencil_settings gp_settings = brush.gpencil_settings
layout.template_curve_mapping(gp_settings, "curve_sensitivity", brush=True) layout.template_curve_mapping(gp_settings, "curve_sensitivity", brush=True)
@@ -1725,7 +1725,7 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves_strength(View3DPanel, Panel):
layout = self.layout layout = self.layout
layout.use_property_split = True layout.use_property_split = True
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
gp_settings = brush.gpencil_settings gp_settings = brush.gpencil_settings
layout.template_curve_mapping(gp_settings, "curve_strength", brush=True) layout.template_curve_mapping(gp_settings, "curve_strength", brush=True)
@@ -1741,7 +1741,7 @@ class VIEW3D_PT_tools_grease_pencil_brushcurves_jitter(View3DPanel, Panel):
layout = self.layout layout = self.layout
layout.use_property_split = True layout.use_property_split = True
brush = context.active_gpencil_brush brush = context.tool_settings.gpencil_paint.brush
gp_settings = brush.gpencil_settings gp_settings = brush.gpencil_settings
layout.template_curve_mapping(gp_settings, "curve_jitter", brush=True) layout.template_curve_mapping(gp_settings, "curve_jitter", brush=True)

1
source/blender/blenkernel/BKE_context.h
View File

@@ -311,7 +311,6 @@ int CTX_data_visible_pose_bones(const bContext *C, ListBase *list);
struct bGPdata *CTX_data_gpencil_data(const bContext *C); struct bGPdata *CTX_data_gpencil_data(const bContext *C);
struct bGPDlayer *CTX_data_active_gpencil_layer(const bContext *C); struct bGPDlayer *CTX_data_active_gpencil_layer(const bContext *C);
struct bGPDframe *CTX_data_active_gpencil_frame(const bContext *C); struct bGPDframe *CTX_data_active_gpencil_frame(const bContext *C);
struct Brush *CTX_data_active_gpencil_brush(const bContext *C);
int CTX_data_visible_gpencil_layers(const bContext *C, ListBase *list); int CTX_data_visible_gpencil_layers(const bContext *C, ListBase *list);
int CTX_data_editable_gpencil_layers(const bContext *C, ListBase *list); int CTX_data_editable_gpencil_layers(const bContext *C, ListBase *list);
int CTX_data_editable_gpencil_strokes(const bContext *C, ListBase *list); int CTX_data_editable_gpencil_strokes(const bContext *C, ListBase *list);

5
source/blender/blenkernel/intern/context.c
View File

@@ -1218,11 +1218,6 @@ bGPDlayer *CTX_data_active_gpencil_layer(const bContext *C)
return ctx_data_pointer_get(C, "active_gpencil_layer"); return ctx_data_pointer_get(C, "active_gpencil_layer");
} }
Brush *CTX_data_active_gpencil_brush(const bContext *C)
{
return ctx_data_pointer_get(C, "active_gpencil_brush");
}
bGPDframe *CTX_data_active_gpencil_frame(const bContext *C) bGPDframe *CTX_data_active_gpencil_frame(const bContext *C)
{ {
return ctx_data_pointer_get(C, "active_gpencil_frame"); return ctx_data_pointer_get(C, "active_gpencil_frame");

10
source/blender/editors/screen/screen_context.c
View File

@@ -86,7 +86,7 @@ const char *screen_context_dir[] = {
"sequences", "selected_sequences", "selected_editable_sequences", /* sequencer */ "sequences", "selected_sequences", "selected_editable_sequences", /* sequencer */
"gpencil_data", "gpencil_data_owner", /* grease pencil data */ "gpencil_data", "gpencil_data_owner", /* grease pencil data */
"visible_gpencil_layers", "editable_gpencil_layers", "editable_gpencil_strokes", "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", "active_operator", "selected_editable_fcurves",
NULL}; 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")) { else if (CTX_data_equals(member, "active_gpencil_frame")) {
/* XXX: see comment for gpencil_data case... */ /* XXX: see comment for gpencil_data case... */
bGPdata *gpd = ED_gpencil_data_get_active_direct((ID *)sc, sa, scene, obact); bGPdata *gpd = ED_gpencil_data_get_active_direct((ID *)sc, sa, scene, obact);

1
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -440,7 +440,6 @@ static const char *wm_context_member_from_ptr(bContext *C, const PointerRNA *ptr
switch (GS(((ID *)ptr->id.data)->name)) { switch (GS(((ID *)ptr->id.data)->name)) {
case ID_SCE: case ID_SCE:
{ {
CTX_TEST_PTR_DATA_TYPE(C, "active_gpencil_brush", RNA_Brush, ptr, CTX_data_active_gpencil_brush(C));
CTX_TEST_PTR_ID(C, "scene", ptr->id.data); CTX_TEST_PTR_ID(C, "scene", ptr->id.data);
break; break;
} }