forked from bartvdbraak/blender
GP: Rename CTX and OB modes
Part of T59335.
This commit is contained in:
parent
a1c8595b09
commit
780f0f646d
@ -196,7 +196,7 @@ def generate(context, space_type):
|
|||||||
'VERTEX_PAINT': "vertex_tool",
|
'VERTEX_PAINT': "vertex_tool",
|
||||||
'WEIGHT_PAINT': "weight_tool",
|
'WEIGHT_PAINT': "weight_tool",
|
||||||
'TEXTURE_PAINT': "image_tool",
|
'TEXTURE_PAINT': "image_tool",
|
||||||
'GPENCIL_PAINT': "gpencil_tool",
|
'PAINT_GPENCIL': "gpencil_tool",
|
||||||
}.get(mode, None)
|
}.get(mode, None)
|
||||||
if attr is not None:
|
if attr is not None:
|
||||||
setattr(kmi_hack_brush_select_properties, attr, item.data_block)
|
setattr(kmi_hack_brush_select_properties, attr, item.data_block)
|
||||||
|
@ -326,7 +326,7 @@ class GreasePencilAppearancePanel:
|
|||||||
|
|
||||||
ob = context.active_object
|
ob = context.active_object
|
||||||
|
|
||||||
if ob.mode == 'GPENCIL_PAINT':
|
if ob.mode == 'PAINT_GPENCIL':
|
||||||
brush = context.active_gpencil_brush
|
brush = context.active_gpencil_brush
|
||||||
gp_settings = brush.gpencil_settings
|
gp_settings = brush.gpencil_settings
|
||||||
|
|
||||||
@ -347,7 +347,7 @@ class GreasePencilAppearancePanel:
|
|||||||
if brush.gpencil_tool == 'FILL':
|
if brush.gpencil_tool == 'FILL':
|
||||||
layout.prop(brush, "cursor_color_add", text="Color")
|
layout.prop(brush, "cursor_color_add", text="Color")
|
||||||
|
|
||||||
elif ob.mode in {'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}:
|
elif ob.mode in {'SCULPT_GPENCIL', 'WEIGHT_GPENCIL'}:
|
||||||
settings = context.tool_settings.gpencil_sculpt
|
settings = context.tool_settings.gpencil_sculpt
|
||||||
brush = settings.brush
|
brush = settings.brush
|
||||||
tool = settings.sculpt_tool
|
tool = settings.sculpt_tool
|
||||||
|
@ -1574,7 +1574,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
|
|||||||
None,
|
None,
|
||||||
_defs_weight_paint.gradient,
|
_defs_weight_paint.gradient,
|
||||||
],
|
],
|
||||||
'GPENCIL_PAINT': [
|
'PAINT_GPENCIL': [
|
||||||
_defs_view3d_generic.cursor,
|
_defs_view3d_generic.cursor,
|
||||||
None,
|
None,
|
||||||
_defs_gpencil_paint.generate_from_brushes,
|
_defs_gpencil_paint.generate_from_brushes,
|
||||||
@ -1584,7 +1584,7 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
|
|||||||
_defs_gpencil_paint.circle,
|
_defs_gpencil_paint.circle,
|
||||||
_defs_gpencil_paint.arc,
|
_defs_gpencil_paint.arc,
|
||||||
],
|
],
|
||||||
'GPENCIL_EDIT': [
|
'EDIT_GPENCIL': [
|
||||||
*_tools_gpencil_select,
|
*_tools_gpencil_select,
|
||||||
_defs_view3d_generic.cursor,
|
_defs_view3d_generic.cursor,
|
||||||
None,
|
None,
|
||||||
@ -1594,12 +1594,12 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper, Panel):
|
|||||||
_defs_gpencil_edit.shear,
|
_defs_gpencil_edit.shear,
|
||||||
_defs_gpencil_edit.tosphere,
|
_defs_gpencil_edit.tosphere,
|
||||||
],
|
],
|
||||||
'GPENCIL_SCULPT': [
|
'SCULPT_GPENCIL': [
|
||||||
*_tools_gpencil_select,
|
*_tools_gpencil_select,
|
||||||
None,
|
None,
|
||||||
_defs_gpencil_sculpt.generate_from_brushes,
|
_defs_gpencil_sculpt.generate_from_brushes,
|
||||||
],
|
],
|
||||||
'GPENCIL_WEIGHT': [
|
'WEIGHT_GPENCIL': [
|
||||||
_defs_gpencil_weight.generate_from_brushes,
|
_defs_gpencil_weight.generate_from_brushes,
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
@ -145,12 +145,12 @@ class TOPBAR_HT_lower_bar(Header):
|
|||||||
# if tool.has_datablock:
|
# if tool.has_datablock:
|
||||||
# layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".paint_common", category="")
|
# layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".paint_common", category="")
|
||||||
pass
|
pass
|
||||||
elif tool_mode == 'GPENCIL_PAINT':
|
elif tool_mode == 'PAINT_GPENCIL':
|
||||||
if (tool is not None) and tool.has_datablock:
|
if (tool is not None) and tool.has_datablock:
|
||||||
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_paint", category="")
|
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_paint", category="")
|
||||||
elif tool_mode == 'GPENCIL_SCULPT':
|
elif tool_mode == 'SCULPT_GPENCIL':
|
||||||
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_sculpt", category="")
|
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_sculpt", category="")
|
||||||
elif tool_mode == 'GPENCIL_WEIGHT':
|
elif tool_mode == 'WEIGHT_GPENCIL':
|
||||||
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_weight", category="")
|
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".greasepencil_weight", category="")
|
||||||
elif tool_space_type == 'IMAGE_EDITOR':
|
elif tool_space_type == 'IMAGE_EDITOR':
|
||||||
if tool_mode == 'PAINT':
|
if tool_mode == 'PAINT':
|
||||||
@ -199,7 +199,7 @@ class TOPBAR_HT_lower_bar(Header):
|
|||||||
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".particlemode", category="")
|
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".particlemode", category="")
|
||||||
elif tool_mode == 'OBJECT':
|
elif tool_mode == 'OBJECT':
|
||||||
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".objectmode", category="")
|
layout.popover_group(space_type='PROPERTIES', region_type='WINDOW', context=".objectmode", category="")
|
||||||
elif tool_mode in {'GPENCIL_PAINT', 'GPENCIL_EDIT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}:
|
elif tool_mode in {'PAINT_GPENCIL', 'EDIT_GPENCIL', 'SCULPT_GPENCIL', 'WEIGHT_GPENCIL'}:
|
||||||
# Grease pencil layer.
|
# Grease pencil layer.
|
||||||
gpl = context.active_gpencil_layer
|
gpl = context.active_gpencil_layer
|
||||||
if gpl and gpl.info is not None:
|
if gpl and gpl.info is not None:
|
||||||
@ -296,7 +296,7 @@ class _draw_left_context_mode:
|
|||||||
UnifiedPaintPanel.prop_unified_strength(layout, context, brush, "strength", slider=True, text="Strength")
|
UnifiedPaintPanel.prop_unified_strength(layout, context, brush, "strength", slider=True, text="Strength")
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def GPENCIL_PAINT(context, layout, tool):
|
def PAINT_GPENCIL(context, layout, tool):
|
||||||
if tool is None:
|
if tool is None:
|
||||||
return
|
return
|
||||||
|
|
||||||
@ -376,7 +376,7 @@ class _draw_left_context_mode:
|
|||||||
draw_color_selector()
|
draw_color_selector()
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def GPENCIL_SCULPT(context, layout, tool):
|
def SCULPT_GPENCIL(context, layout, tool):
|
||||||
if (tool is None) or (not tool.has_datablock):
|
if (tool is None) or (not tool.has_datablock):
|
||||||
return
|
return
|
||||||
tool_settings = context.tool_settings
|
tool_settings = context.tool_settings
|
||||||
@ -399,7 +399,7 @@ class _draw_left_context_mode:
|
|||||||
row.prop(brush, "direction", expand=True, text="")
|
row.prop(brush, "direction", expand=True, text="")
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def GPENCIL_WEIGHT(context, layout, tool):
|
def WEIGHT_GPENCIL(context, layout, tool):
|
||||||
if (tool is None) or (not tool.has_datablock):
|
if (tool is None) or (not tool.has_datablock):
|
||||||
return
|
return
|
||||||
tool_settings = context.tool_settings
|
tool_settings = context.tool_settings
|
||||||
|
@ -120,7 +120,7 @@ class VIEW3D_HT_header(Header):
|
|||||||
scene = context.scene
|
scene = context.scene
|
||||||
|
|
||||||
# Orientation
|
# Orientation
|
||||||
if object_mode in {'OBJECT', 'EDIT', 'POSE', 'GPENCIL_EDIT'}:
|
if object_mode in {'OBJECT', 'EDIT', 'POSE', 'EDIT_GPENCIL'}:
|
||||||
orientation = scene.transform_orientation
|
orientation = scene.transform_orientation
|
||||||
current_orientation = scene.current_orientation
|
current_orientation = scene.current_orientation
|
||||||
|
|
||||||
@ -148,7 +148,7 @@ class VIEW3D_HT_header(Header):
|
|||||||
show_snap = True
|
show_snap = True
|
||||||
else:
|
else:
|
||||||
if object_mode not in {'SCULPT', 'VERTEX_PAINT', 'WEIGHT_PAINT', 'TEXTURE_PAINT',
|
if object_mode not in {'SCULPT', 'VERTEX_PAINT', 'WEIGHT_PAINT', 'TEXTURE_PAINT',
|
||||||
'GPENCIL_PAINT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}:
|
'PAINT_GPENCIL', 'SCULPT_GPENCIL', 'WEIGHT_GPENCIL'}:
|
||||||
show_snap = True
|
show_snap = True
|
||||||
else:
|
else:
|
||||||
|
|
||||||
@ -217,7 +217,7 @@ class VIEW3D_HT_header(Header):
|
|||||||
sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True)
|
sub.prop(tool_settings, "proportional_edit_falloff", icon_only=True)
|
||||||
|
|
||||||
# Pivot
|
# Pivot
|
||||||
if object_mode in {'OBJECT', 'EDIT', 'POSE', 'GPENCIL_EDIT', 'GPENCIL_SCULPT'}:
|
if object_mode in {'OBJECT', 'EDIT', 'POSE', 'EDIT_GPENCIL', 'SCULPT_GPENCIL'}:
|
||||||
pivot_point = tool_settings.transform_pivot_point
|
pivot_point = tool_settings.transform_pivot_point
|
||||||
act_pivot_point = bpy.types.ToolSettings.bl_rna.properties["transform_pivot_point"].enum_items[pivot_point]
|
act_pivot_point = bpy.types.ToolSettings.bl_rna.properties["transform_pivot_point"].enum_items[pivot_point]
|
||||||
row = layout.row(align=True)
|
row = layout.row(align=True)
|
||||||
@ -227,7 +227,7 @@ class VIEW3D_HT_header(Header):
|
|||||||
text="",
|
text="",
|
||||||
)
|
)
|
||||||
# grease pencil
|
# grease pencil
|
||||||
if object_mode == 'GPENCIL_PAINT':
|
if object_mode == 'PAINT_GPENCIL':
|
||||||
origin = tool_settings.gpencil_stroke_placement_view3d
|
origin = tool_settings.gpencil_stroke_placement_view3d
|
||||||
gp_origin = tool_settings.bl_rna.properties['gpencil_stroke_placement_view3d'].enum_items[origin]
|
gp_origin = tool_settings.bl_rna.properties['gpencil_stroke_placement_view3d'].enum_items[origin]
|
||||||
|
|
||||||
@ -239,7 +239,7 @@ class VIEW3D_HT_header(Header):
|
|||||||
icon=or_icon,
|
icon=or_icon,
|
||||||
)
|
)
|
||||||
|
|
||||||
if object_mode in {'GPENCIL_PAINT', 'GPENCIL_SCULPT'}:
|
if object_mode in {'PAINT_GPENCIL', 'SCULPT_GPENCIL'}:
|
||||||
lock = tool_settings.gpencil_sculpt.lock_axis
|
lock = tool_settings.gpencil_sculpt.lock_axis
|
||||||
gp_lock = tool_settings.gpencil_sculpt.bl_rna.properties["lock_axis"].enum_items[lock]
|
gp_lock = tool_settings.gpencil_sculpt.bl_rna.properties["lock_axis"].enum_items[lock]
|
||||||
|
|
||||||
@ -302,13 +302,13 @@ class VIEW3D_MT_editor_menus(Menu):
|
|||||||
obj = context.active_object
|
obj = context.active_object
|
||||||
mode_string = context.mode
|
mode_string = context.mode
|
||||||
edit_object = context.edit_object
|
edit_object = context.edit_object
|
||||||
gp_edit = obj and obj.mode in {'GPENCIL_EDIT', 'GPENCIL_PAINT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}
|
gp_edit = obj and obj.mode in {'EDIT_GPENCIL', 'PAINT_GPENCIL', 'SCULPT_GPENCIL', 'WEIGHT_GPENCIL'}
|
||||||
|
|
||||||
layout.menu("VIEW3D_MT_view")
|
layout.menu("VIEW3D_MT_view")
|
||||||
|
|
||||||
# Select Menu
|
# Select Menu
|
||||||
if gp_edit:
|
if gp_edit:
|
||||||
if mode_string not in {'GPENCIL_PAINT', 'GPENCIL_WEIGHT'}:
|
if mode_string not in {'PAINT_GPENCIL', 'WEIGHT_GPENCIL'}:
|
||||||
layout.menu("VIEW3D_MT_select_gpencil")
|
layout.menu("VIEW3D_MT_select_gpencil")
|
||||||
elif mode_string in {'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE'}:
|
elif mode_string in {'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE'}:
|
||||||
mesh = obj.data
|
mesh = obj.data
|
||||||
@ -335,11 +335,11 @@ class VIEW3D_MT_editor_menus(Menu):
|
|||||||
layout.menu("TOPBAR_MT_edit_armature_add", text="Add")
|
layout.menu("TOPBAR_MT_edit_armature_add", text="Add")
|
||||||
|
|
||||||
if gp_edit:
|
if gp_edit:
|
||||||
if obj and obj.mode == 'GPENCIL_PAINT':
|
if obj and obj.mode == 'PAINT_GPENCIL':
|
||||||
layout.menu("VIEW3D_MT_paint_gpencil")
|
layout.menu("VIEW3D_MT_paint_gpencil")
|
||||||
elif obj and obj.mode == 'GPENCIL_EDIT':
|
elif obj and obj.mode == 'EDIT_GPENCIL':
|
||||||
layout.menu("VIEW3D_MT_edit_gpencil")
|
layout.menu("VIEW3D_MT_edit_gpencil")
|
||||||
elif obj and obj.mode == 'GPENCIL_WEIGHT':
|
elif obj and obj.mode == 'WEIGHT_GPENCIL':
|
||||||
layout.menu("VIEW3D_MT_weight_gpencil")
|
layout.menu("VIEW3D_MT_weight_gpencil")
|
||||||
|
|
||||||
elif edit_object:
|
elif edit_object:
|
||||||
@ -5147,10 +5147,10 @@ class VIEW3D_PT_overlay_gpencil_options(Panel):
|
|||||||
def draw_header(self, context):
|
def draw_header(self, context):
|
||||||
layout = self.layout
|
layout = self.layout
|
||||||
layout.label(text={
|
layout.label(text={
|
||||||
'GPENCIL_PAINT': "Draw Grease Pencil",
|
'PAINT_GPENCIL': "Draw Grease Pencil",
|
||||||
'GPENCIL_EDIT': "Edit Grease Pencil",
|
'EDIT_GPENCIL': "Edit Grease Pencil",
|
||||||
'GPENCIL_SCULPT': "Sculpt Grease Pencil",
|
'SCULPT_GPENCIL': "Sculpt Grease Pencil",
|
||||||
'GPENCIL_WEIGHT': "Weight Grease Pencil",
|
'WEIGHT_GPENCIL': "Weight Grease Pencil",
|
||||||
'OBJECT': "Grease Pencil",
|
'OBJECT': "Grease Pencil",
|
||||||
}[context.mode])
|
}[context.mode])
|
||||||
|
|
||||||
@ -5174,14 +5174,14 @@ class VIEW3D_PT_overlay_gpencil_options(Panel):
|
|||||||
sub.active = overlay.use_gpencil_paper
|
sub.active = overlay.use_gpencil_paper
|
||||||
sub.prop(overlay, "gpencil_paper_opacity", text="Fade 3D Objects", slider=True)
|
sub.prop(overlay, "gpencil_paper_opacity", text="Fade 3D Objects", slider=True)
|
||||||
|
|
||||||
if context.object.mode == 'GPENCIL_PAINT':
|
if context.object.mode == 'PAINT_GPENCIL':
|
||||||
row = col.row()
|
row = col.row()
|
||||||
row.prop(overlay, "use_gpencil_fade_layers", text="")
|
row.prop(overlay, "use_gpencil_fade_layers", text="")
|
||||||
sub = row.row()
|
sub = row.row()
|
||||||
sub.active = overlay.use_gpencil_fade_layers
|
sub.active = overlay.use_gpencil_fade_layers
|
||||||
sub.prop(overlay, "gpencil_fade_layer", text="Fade Layers", slider=True)
|
sub.prop(overlay, "gpencil_fade_layer", text="Fade Layers", slider=True)
|
||||||
|
|
||||||
if context.object.mode in {'GPENCIL_EDIT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}:
|
if context.object.mode in {'EDIT_GPENCIL', 'SCULPT_GPENCIL', 'WEIGHT_GPENCIL'}:
|
||||||
layout.prop(overlay, "use_gpencil_edit_lines", text="Edit Lines")
|
layout.prop(overlay, "use_gpencil_edit_lines", text="Edit Lines")
|
||||||
layout.prop(overlay, "use_gpencil_multiedit_line_only", text="Show Edit Lines only in multiframe")
|
layout.prop(overlay, "use_gpencil_multiedit_line_only", text="Show Edit Lines only in multiframe")
|
||||||
layout.prop(overlay, "vertex_opacity", text="Vertex Opacity", slider=True)
|
layout.prop(overlay, "vertex_opacity", text="Vertex Opacity", slider=True)
|
||||||
@ -5404,7 +5404,7 @@ class VIEW3D_MT_gpencil_sculpt_specials(Menu):
|
|||||||
layout.operator("gpencil.stroke_simplify_fixed", text="Simplify")
|
layout.operator("gpencil.stroke_simplify_fixed", text="Simplify")
|
||||||
layout.operator("gpencil.stroke_simplify", text="Simplify Adaptative")
|
layout.operator("gpencil.stroke_simplify", text="Simplify Adaptative")
|
||||||
|
|
||||||
if context.mode == 'GPENCIL_WEIGHT':
|
if context.mode == 'WEIGHT_GPENCIL':
|
||||||
layout.separator()
|
layout.separator()
|
||||||
layout.menu("VIEW3D_MT_gpencil_autoweights")
|
layout.menu("VIEW3D_MT_gpencil_autoweights")
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ def draw_vpaint_symmetry(layout, vpaint):
|
|||||||
def is_not_gpencil_edit_mode(context):
|
def is_not_gpencil_edit_mode(context):
|
||||||
is_gpmode = (
|
is_gpmode = (
|
||||||
context.active_object and
|
context.active_object and
|
||||||
context.active_object.mode in {'GPENCIL_EDIT', 'GPENCIL_PAINT', 'GPENCIL_SCULPT', 'GPENCIL_WEIGHT'}
|
context.active_object.mode in {'EDIT_GPENCIL', 'PAINT_GPENCIL', 'SCULPT_GPENCIL', 'WEIGHT_GPENCIL'}
|
||||||
)
|
)
|
||||||
return not is_gpmode
|
return not is_gpmode
|
||||||
|
|
||||||
|
@ -118,12 +118,12 @@ enum eContextObjectMode {
|
|||||||
CTX_MODE_PAINT_TEXTURE,
|
CTX_MODE_PAINT_TEXTURE,
|
||||||
CTX_MODE_PARTICLE,
|
CTX_MODE_PARTICLE,
|
||||||
CTX_MODE_OBJECT,
|
CTX_MODE_OBJECT,
|
||||||
CTX_MODE_GPENCIL_PAINT,
|
CTX_MODE_PAINT_GPENCIL,
|
||||||
CTX_MODE_GPENCIL_EDIT,
|
CTX_MODE_EDIT_GPENCIL,
|
||||||
CTX_MODE_GPENCIL_SCULPT,
|
CTX_MODE_SCULPT_GPENCIL,
|
||||||
CTX_MODE_GPENCIL_WEIGHT,
|
CTX_MODE_WEIGHT_GPENCIL,
|
||||||
};
|
};
|
||||||
#define CTX_MODE_NUM (CTX_MODE_GPENCIL_WEIGHT + 1)
|
#define CTX_MODE_NUM (CTX_MODE_WEIGHT_GPENCIL + 1)
|
||||||
|
|
||||||
/* Context */
|
/* Context */
|
||||||
|
|
||||||
|
@ -194,7 +194,7 @@ Brush *BKE_brush_add_gpencil(Main *bmain, ToolSettings *ts, const char *name)
|
|||||||
{
|
{
|
||||||
Brush *brush;
|
Brush *brush;
|
||||||
Paint *paint = &ts->gp_paint->paint;
|
Paint *paint = &ts->gp_paint->paint;
|
||||||
brush = BKE_brush_add(bmain, name, OB_MODE_GPENCIL_PAINT);
|
brush = BKE_brush_add(bmain, name, OB_MODE_PAINT_GPENCIL);
|
||||||
|
|
||||||
BKE_paint_brush_set(paint, brush);
|
BKE_paint_brush_set(paint, brush);
|
||||||
id_us_min(&brush->id);
|
id_us_min(&brush->id);
|
||||||
|
@ -1007,10 +1007,10 @@ int CTX_data_mode_enum_ex(const Object *obedit, const Object *ob, const eObjectM
|
|||||||
else if (object_mode & OB_MODE_VERTEX_PAINT) return CTX_MODE_PAINT_VERTEX;
|
else if (object_mode & OB_MODE_VERTEX_PAINT) return CTX_MODE_PAINT_VERTEX;
|
||||||
else if (object_mode & OB_MODE_TEXTURE_PAINT) return CTX_MODE_PAINT_TEXTURE;
|
else if (object_mode & OB_MODE_TEXTURE_PAINT) return CTX_MODE_PAINT_TEXTURE;
|
||||||
else if (object_mode & OB_MODE_PARTICLE_EDIT) return CTX_MODE_PARTICLE;
|
else if (object_mode & OB_MODE_PARTICLE_EDIT) return CTX_MODE_PARTICLE;
|
||||||
else if (object_mode & OB_MODE_GPENCIL_PAINT) return CTX_MODE_GPENCIL_PAINT;
|
else if (object_mode & OB_MODE_PAINT_GPENCIL) return CTX_MODE_PAINT_GPENCIL;
|
||||||
else if (object_mode & OB_MODE_GPENCIL_EDIT) return CTX_MODE_GPENCIL_EDIT;
|
else if (object_mode & OB_MODE_EDIT_GPENCIL) return CTX_MODE_EDIT_GPENCIL;
|
||||||
else if (object_mode & OB_MODE_GPENCIL_SCULPT) return CTX_MODE_GPENCIL_SCULPT;
|
else if (object_mode & OB_MODE_SCULPT_GPENCIL) return CTX_MODE_SCULPT_GPENCIL;
|
||||||
else if (object_mode & OB_MODE_GPENCIL_WEIGHT) return CTX_MODE_GPENCIL_WEIGHT;
|
else if (object_mode & OB_MODE_WEIGHT_GPENCIL) return CTX_MODE_WEIGHT_GPENCIL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -226,7 +226,7 @@ Paint *BKE_paint_get_active(Scene *sce, ViewLayer *view_layer)
|
|||||||
return &ts->wpaint->paint;
|
return &ts->wpaint->paint;
|
||||||
case OB_MODE_TEXTURE_PAINT:
|
case OB_MODE_TEXTURE_PAINT:
|
||||||
return &ts->imapaint.paint;
|
return &ts->imapaint.paint;
|
||||||
case OB_MODE_GPENCIL_PAINT:
|
case OB_MODE_PAINT_GPENCIL:
|
||||||
return &ts->gp_paint->paint;
|
return &ts->gp_paint->paint;
|
||||||
case OB_MODE_EDIT:
|
case OB_MODE_EDIT:
|
||||||
if (ts->use_uv_sculpt)
|
if (ts->use_uv_sculpt)
|
||||||
@ -337,7 +337,7 @@ ePaintMode BKE_paintmode_get_from_tool(const struct bToolRef *tref)
|
|||||||
return PAINT_MODE_VERTEX;
|
return PAINT_MODE_VERTEX;
|
||||||
case CTX_MODE_PAINT_WEIGHT:
|
case CTX_MODE_PAINT_WEIGHT:
|
||||||
return PAINT_MODE_WEIGHT;
|
return PAINT_MODE_WEIGHT;
|
||||||
case CTX_MODE_GPENCIL_PAINT:
|
case CTX_MODE_PAINT_GPENCIL:
|
||||||
return PAINT_MODE_GPENCIL;
|
return PAINT_MODE_GPENCIL;
|
||||||
case CTX_MODE_PAINT_TEXTURE:
|
case CTX_MODE_PAINT_TEXTURE:
|
||||||
return PAINT_MODE_TEXTURE_3D;
|
return PAINT_MODE_TEXTURE_3D;
|
||||||
@ -389,7 +389,7 @@ void BKE_paint_runtime_init(const ToolSettings *ts, Paint *paint)
|
|||||||
}
|
}
|
||||||
else if (paint == &ts->gp_paint->paint) {
|
else if (paint == &ts->gp_paint->paint) {
|
||||||
paint->runtime.tool_offset = offsetof(Brush, gpencil_tool);
|
paint->runtime.tool_offset = offsetof(Brush, gpencil_tool);
|
||||||
paint->runtime.ob_mode = OB_MODE_GPENCIL_PAINT;
|
paint->runtime.ob_mode = OB_MODE_PAINT_GPENCIL;
|
||||||
}
|
}
|
||||||
else if (paint == &ts->uvsculpt->paint) {
|
else if (paint == &ts->uvsculpt->paint) {
|
||||||
/* We don't use these yet. */
|
/* We don't use these yet. */
|
||||||
|
@ -174,14 +174,14 @@ void BLO_update_defaults_startup_blend(Main *bmain, const char *app_template)
|
|||||||
const char *name = workspace->id.name + 2;
|
const char *name = workspace->id.name + 2;
|
||||||
|
|
||||||
if (STREQ(name, "Drawing")) {
|
if (STREQ(name, "Drawing")) {
|
||||||
workspace->object_mode = OB_MODE_GPENCIL_PAINT;
|
workspace->object_mode = OB_MODE_PAINT_GPENCIL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* set object in drawing mode */
|
/* set object in drawing mode */
|
||||||
for (Object *object = bmain->object.first; object; object = object->id.next) {
|
for (Object *object = bmain->object.first; object; object = object->id.next) {
|
||||||
if (object->type == OB_GPENCIL) {
|
if (object->type == OB_GPENCIL) {
|
||||||
bGPdata *gpd = (bGPdata *)object->data;
|
bGPdata *gpd = (bGPdata *)object->data;
|
||||||
object->mode = OB_MODE_GPENCIL_PAINT;
|
object->mode = OB_MODE_PAINT_GPENCIL;
|
||||||
gpd->flag |= GP_DATA_STROKE_PAINTMODE;
|
gpd->flag |= GP_DATA_STROKE_PAINTMODE;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1577,7 +1577,7 @@ void DRW_gpencil_populate_datablock(
|
|||||||
opacity = opacity * v3d->overlay.xray_alpha_bone;
|
opacity = opacity * v3d->overlay.xray_alpha_bone;
|
||||||
}
|
}
|
||||||
/* fade no active layers */
|
/* fade no active layers */
|
||||||
if ((overlay) && (draw_ctx->object_mode == OB_MODE_GPENCIL_PAINT) &&
|
if ((overlay) && (draw_ctx->object_mode == OB_MODE_PAINT_GPENCIL) &&
|
||||||
(v3d->gp_flag & V3D_GP_FADE_NOACTIVE_LAYERS) &&
|
(v3d->gp_flag & V3D_GP_FADE_NOACTIVE_LAYERS) &&
|
||||||
(draw_ctx->obact) && (draw_ctx->obact == ob) &&
|
(draw_ctx->obact) && (draw_ctx->obact == ob) &&
|
||||||
(gpl != gpl_active))
|
(gpl != gpl_active))
|
||||||
|
@ -1255,10 +1255,10 @@ static void drw_engines_enable_from_mode(int mode)
|
|||||||
case CTX_MODE_PAINT_VERTEX:
|
case CTX_MODE_PAINT_VERTEX:
|
||||||
case CTX_MODE_PAINT_TEXTURE:
|
case CTX_MODE_PAINT_TEXTURE:
|
||||||
case CTX_MODE_OBJECT:
|
case CTX_MODE_OBJECT:
|
||||||
case CTX_MODE_GPENCIL_PAINT:
|
case CTX_MODE_PAINT_GPENCIL:
|
||||||
case CTX_MODE_GPENCIL_EDIT:
|
case CTX_MODE_EDIT_GPENCIL:
|
||||||
case CTX_MODE_GPENCIL_SCULPT:
|
case CTX_MODE_SCULPT_GPENCIL:
|
||||||
case CTX_MODE_GPENCIL_WEIGHT:
|
case CTX_MODE_WEIGHT_GPENCIL:
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
BLI_assert(!"Draw mode invalid");
|
BLI_assert(!"Draw mode invalid");
|
||||||
|
@ -154,7 +154,7 @@ static bool is_cursor_visible(const DRWContextState *draw_ctx, Scene *scene, Vie
|
|||||||
/* no exception met? then don't draw cursor! */
|
/* no exception met? then don't draw cursor! */
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (draw_ctx->object_mode & OB_MODE_GPENCIL_WEIGHT) {
|
else if (draw_ctx->object_mode & OB_MODE_WEIGHT_GPENCIL) {
|
||||||
/* grease pencil hide always in some modes */
|
/* grease pencil hide always in some modes */
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -1192,7 +1192,7 @@ static bool gpsculpt_brush_init(bContext *C, wmOperator *op)
|
|||||||
ToolSettings *ts = CTX_data_tool_settings(C);
|
ToolSettings *ts = CTX_data_tool_settings(C);
|
||||||
Object *ob = CTX_data_active_object(C);
|
Object *ob = CTX_data_active_object(C);
|
||||||
|
|
||||||
const bool is_weight_mode = ob->mode == OB_MODE_GPENCIL_WEIGHT;
|
const bool is_weight_mode = ob->mode == OB_MODE_WEIGHT_GPENCIL;
|
||||||
/* set the brush using the tool */
|
/* set the brush using the tool */
|
||||||
#if 0
|
#if 0
|
||||||
GP_Sculpt_Settings *gset = &ts->gp_sculpt;
|
GP_Sculpt_Settings *gset = &ts->gp_sculpt;
|
||||||
|
@ -1555,8 +1555,8 @@ static bool gpencil_vertex_group_poll(bContext *C)
|
|||||||
if ((ob) && (ob->type == OB_GPENCIL)) {
|
if ((ob) && (ob->type == OB_GPENCIL)) {
|
||||||
if (!ID_IS_LINKED(ob) && !ID_IS_LINKED(ob->data) && ob->defbase.first) {
|
if (!ID_IS_LINKED(ob) && !ID_IS_LINKED(ob->data) && ob->defbase.first) {
|
||||||
if (ELEM(ob->mode,
|
if (ELEM(ob->mode,
|
||||||
OB_MODE_GPENCIL_EDIT,
|
OB_MODE_EDIT_GPENCIL,
|
||||||
OB_MODE_GPENCIL_SCULPT))
|
OB_MODE_SCULPT_GPENCIL))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@ -1572,7 +1572,7 @@ static bool gpencil_vertex_group_weight_poll(bContext *C)
|
|||||||
|
|
||||||
if ((ob) && (ob->type == OB_GPENCIL)) {
|
if ((ob) && (ob->type == OB_GPENCIL)) {
|
||||||
if (!ID_IS_LINKED(ob) && !ID_IS_LINKED(ob->data) && ob->defbase.first) {
|
if (!ID_IS_LINKED(ob) && !ID_IS_LINKED(ob->data) && ob->defbase.first) {
|
||||||
if (ob->mode == OB_MODE_GPENCIL_WEIGHT) {
|
if (ob->mode == OB_MODE_WEIGHT_GPENCIL) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -172,7 +172,7 @@ static int gpencil_editmode_toggle_exec(bContext *C, wmOperator *op)
|
|||||||
}
|
}
|
||||||
/* set mode */
|
/* set mode */
|
||||||
if (gpd->flag & GP_DATA_STROKE_EDITMODE) {
|
if (gpd->flag & GP_DATA_STROKE_EDITMODE) {
|
||||||
mode = OB_MODE_GPENCIL_EDIT;
|
mode = OB_MODE_EDIT_GPENCIL;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
mode = OB_MODE_OBJECT;
|
mode = OB_MODE_OBJECT;
|
||||||
@ -301,7 +301,7 @@ static int gpencil_paintmode_toggle_exec(bContext *C, wmOperator *op)
|
|||||||
gpd->flag ^= GP_DATA_STROKE_PAINTMODE;
|
gpd->flag ^= GP_DATA_STROKE_PAINTMODE;
|
||||||
/* set mode */
|
/* set mode */
|
||||||
if (gpd->flag & GP_DATA_STROKE_PAINTMODE) {
|
if (gpd->flag & GP_DATA_STROKE_PAINTMODE) {
|
||||||
mode = OB_MODE_GPENCIL_PAINT;
|
mode = OB_MODE_PAINT_GPENCIL;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
mode = OB_MODE_OBJECT;
|
mode = OB_MODE_OBJECT;
|
||||||
@ -316,7 +316,7 @@ static int gpencil_paintmode_toggle_exec(bContext *C, wmOperator *op)
|
|||||||
ob->mode = mode;
|
ob->mode = mode;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mode == OB_MODE_GPENCIL_PAINT) {
|
if (mode == OB_MODE_PAINT_GPENCIL) {
|
||||||
/* be sure we have brushes */
|
/* be sure we have brushes */
|
||||||
BKE_paint_ensure(ts, (Paint **)&ts->gp_paint);
|
BKE_paint_ensure(ts, (Paint **)&ts->gp_paint);
|
||||||
Paint *paint = &ts->gp_paint->paint;
|
Paint *paint = &ts->gp_paint->paint;
|
||||||
@ -400,7 +400,7 @@ static int gpencil_sculptmode_toggle_exec(bContext *C, wmOperator *op)
|
|||||||
gpd->flag ^= GP_DATA_STROKE_SCULPTMODE;
|
gpd->flag ^= GP_DATA_STROKE_SCULPTMODE;
|
||||||
/* set mode */
|
/* set mode */
|
||||||
if (gpd->flag & GP_DATA_STROKE_SCULPTMODE) {
|
if (gpd->flag & GP_DATA_STROKE_SCULPTMODE) {
|
||||||
mode = OB_MODE_GPENCIL_SCULPT;
|
mode = OB_MODE_SCULPT_GPENCIL;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
mode = OB_MODE_OBJECT;
|
mode = OB_MODE_OBJECT;
|
||||||
@ -488,7 +488,7 @@ static int gpencil_weightmode_toggle_exec(bContext *C, wmOperator *op)
|
|||||||
gpd->flag ^= GP_DATA_STROKE_WEIGHTMODE;
|
gpd->flag ^= GP_DATA_STROKE_WEIGHTMODE;
|
||||||
/* set mode */
|
/* set mode */
|
||||||
if (gpd->flag & GP_DATA_STROKE_WEIGHTMODE) {
|
if (gpd->flag & GP_DATA_STROKE_WEIGHTMODE) {
|
||||||
mode = OB_MODE_GPENCIL_WEIGHT;
|
mode = OB_MODE_WEIGHT_GPENCIL;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
mode = OB_MODE_OBJECT;
|
mode = OB_MODE_OBJECT;
|
||||||
|
@ -1650,7 +1650,7 @@ static Brush *gp_get_default_eraser(Main *bmain, ToolSettings *ts)
|
|||||||
Paint *paint = &ts->gp_paint->paint;
|
Paint *paint = &ts->gp_paint->paint;
|
||||||
Brush *brush_old = paint->brush;
|
Brush *brush_old = paint->brush;
|
||||||
for (Brush *brush = bmain->brush.first; brush; brush = brush->id.next) {
|
for (Brush *brush = bmain->brush.first; brush; brush = brush->id.next) {
|
||||||
if ((brush->ob_mode == OB_MODE_GPENCIL_PAINT) &&
|
if ((brush->ob_mode == OB_MODE_PAINT_GPENCIL) &&
|
||||||
(brush->gpencil_tool == GPAINT_TOOL_ERASE))
|
(brush->gpencil_tool == GPAINT_TOOL_ERASE))
|
||||||
{
|
{
|
||||||
/* save first eraser to use later if no default */
|
/* save first eraser to use later if no default */
|
||||||
@ -2794,7 +2794,7 @@ static int gpencil_draw_invoke(bContext *C, wmOperator *op, const wmEvent *event
|
|||||||
p->gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE;
|
p->gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE;
|
||||||
/* set workspace mode */
|
/* set workspace mode */
|
||||||
ob->restore_mode = ob->mode;
|
ob->restore_mode = ob->mode;
|
||||||
ob->mode = OB_MODE_GPENCIL_PAINT;
|
ob->mode = OB_MODE_PAINT_GPENCIL;
|
||||||
/* redraw mode on screen */
|
/* redraw mode on screen */
|
||||||
WM_event_add_notifier(C, NC_SCENE | ND_MODE, NULL);
|
WM_event_add_notifier(C, NC_SCENE | ND_MODE, NULL);
|
||||||
}
|
}
|
||||||
|
@ -1449,7 +1449,7 @@ static bool gp_check_cursor_region(bContext *C, int mval_i[2])
|
|||||||
Object *ob = CTX_data_active_object(C);
|
Object *ob = CTX_data_active_object(C);
|
||||||
|
|
||||||
if ((ob == NULL) ||
|
if ((ob == NULL) ||
|
||||||
(!ELEM(ob->mode, OB_MODE_GPENCIL_PAINT, OB_MODE_GPENCIL_SCULPT, OB_MODE_GPENCIL_WEIGHT)))
|
(!ELEM(ob->mode, OB_MODE_PAINT_GPENCIL, OB_MODE_SCULPT_GPENCIL, OB_MODE_WEIGHT_GPENCIL)))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -1705,13 +1705,13 @@ static void gpencil_verify_brush_type(bContext *C, int newmode)
|
|||||||
GP_Sculpt_Settings *gset = &ts->gp_sculpt;
|
GP_Sculpt_Settings *gset = &ts->gp_sculpt;
|
||||||
|
|
||||||
switch (newmode) {
|
switch (newmode) {
|
||||||
case OB_MODE_GPENCIL_SCULPT:
|
case OB_MODE_SCULPT_GPENCIL:
|
||||||
gset->flag &= ~GP_SCULPT_SETT_FLAG_WEIGHT_MODE;
|
gset->flag &= ~GP_SCULPT_SETT_FLAG_WEIGHT_MODE;
|
||||||
if ((gset->brushtype < 0) || (gset->brushtype >= GP_SCULPT_TYPE_WEIGHT)) {
|
if ((gset->brushtype < 0) || (gset->brushtype >= GP_SCULPT_TYPE_WEIGHT)) {
|
||||||
gset->brushtype = GP_SCULPT_TYPE_PUSH;
|
gset->brushtype = GP_SCULPT_TYPE_PUSH;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case OB_MODE_GPENCIL_WEIGHT:
|
case OB_MODE_WEIGHT_GPENCIL:
|
||||||
gset->flag |= GP_SCULPT_SETT_FLAG_WEIGHT_MODE;
|
gset->flag |= GP_SCULPT_SETT_FLAG_WEIGHT_MODE;
|
||||||
if ((gset->weighttype < GP_SCULPT_TYPE_WEIGHT) || (gset->weighttype >= GP_SCULPT_TYPE_MAX)) {
|
if ((gset->weighttype < GP_SCULPT_TYPE_WEIGHT) || (gset->weighttype >= GP_SCULPT_TYPE_MAX)) {
|
||||||
gset->weighttype = GP_SCULPT_TYPE_WEIGHT;
|
gset->weighttype = GP_SCULPT_TYPE_WEIGHT;
|
||||||
@ -1730,34 +1730,34 @@ void ED_gpencil_setup_modes(bContext *C, bGPdata *gpd, int newmode)
|
|||||||
}
|
}
|
||||||
|
|
||||||
switch (newmode) {
|
switch (newmode) {
|
||||||
case OB_MODE_GPENCIL_EDIT:
|
case OB_MODE_EDIT_GPENCIL:
|
||||||
gpd->flag |= GP_DATA_STROKE_EDITMODE;
|
gpd->flag |= GP_DATA_STROKE_EDITMODE;
|
||||||
gpd->flag &= ~GP_DATA_STROKE_PAINTMODE;
|
gpd->flag &= ~GP_DATA_STROKE_PAINTMODE;
|
||||||
gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE;
|
gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE;
|
||||||
gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE;
|
gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE;
|
||||||
ED_gpencil_toggle_brush_cursor(C, false, NULL);
|
ED_gpencil_toggle_brush_cursor(C, false, NULL);
|
||||||
break;
|
break;
|
||||||
case OB_MODE_GPENCIL_PAINT:
|
case OB_MODE_PAINT_GPENCIL:
|
||||||
gpd->flag &= ~GP_DATA_STROKE_EDITMODE;
|
gpd->flag &= ~GP_DATA_STROKE_EDITMODE;
|
||||||
gpd->flag |= GP_DATA_STROKE_PAINTMODE;
|
gpd->flag |= GP_DATA_STROKE_PAINTMODE;
|
||||||
gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE;
|
gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE;
|
||||||
gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE;
|
gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE;
|
||||||
ED_gpencil_toggle_brush_cursor(C, true, NULL);
|
ED_gpencil_toggle_brush_cursor(C, true, NULL);
|
||||||
break;
|
break;
|
||||||
case OB_MODE_GPENCIL_SCULPT:
|
case OB_MODE_SCULPT_GPENCIL:
|
||||||
gpd->flag &= ~GP_DATA_STROKE_EDITMODE;
|
gpd->flag &= ~GP_DATA_STROKE_EDITMODE;
|
||||||
gpd->flag &= ~GP_DATA_STROKE_PAINTMODE;
|
gpd->flag &= ~GP_DATA_STROKE_PAINTMODE;
|
||||||
gpd->flag |= GP_DATA_STROKE_SCULPTMODE;
|
gpd->flag |= GP_DATA_STROKE_SCULPTMODE;
|
||||||
gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE;
|
gpd->flag &= ~GP_DATA_STROKE_WEIGHTMODE;
|
||||||
gpencil_verify_brush_type(C, OB_MODE_GPENCIL_SCULPT);
|
gpencil_verify_brush_type(C, OB_MODE_SCULPT_GPENCIL);
|
||||||
ED_gpencil_toggle_brush_cursor(C, true, NULL);
|
ED_gpencil_toggle_brush_cursor(C, true, NULL);
|
||||||
break;
|
break;
|
||||||
case OB_MODE_GPENCIL_WEIGHT:
|
case OB_MODE_WEIGHT_GPENCIL:
|
||||||
gpd->flag &= ~GP_DATA_STROKE_EDITMODE;
|
gpd->flag &= ~GP_DATA_STROKE_EDITMODE;
|
||||||
gpd->flag &= ~GP_DATA_STROKE_PAINTMODE;
|
gpd->flag &= ~GP_DATA_STROKE_PAINTMODE;
|
||||||
gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE;
|
gpd->flag &= ~GP_DATA_STROKE_SCULPTMODE;
|
||||||
gpd->flag |= GP_DATA_STROKE_WEIGHTMODE;
|
gpd->flag |= GP_DATA_STROKE_WEIGHTMODE;
|
||||||
gpencil_verify_brush_type(C, OB_MODE_GPENCIL_WEIGHT);
|
gpencil_verify_brush_type(C, OB_MODE_WEIGHT_GPENCIL);
|
||||||
ED_gpencil_toggle_brush_cursor(C, true, NULL);
|
ED_gpencil_toggle_brush_cursor(C, true, NULL);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
@ -1719,7 +1719,7 @@ static int ui_id_brush_get_icon(const bContext *C, ID *id)
|
|||||||
|
|
||||||
/* reset the icon */
|
/* reset the icon */
|
||||||
if ((ob != NULL) &&
|
if ((ob != NULL) &&
|
||||||
(ob->mode & OB_MODE_GPENCIL_PAINT) &&
|
(ob->mode & OB_MODE_PAINT_GPENCIL) &&
|
||||||
(br->gpencil_settings != NULL))
|
(br->gpencil_settings != NULL))
|
||||||
{
|
{
|
||||||
switch (br->gpencil_settings->icon_id) {
|
switch (br->gpencil_settings->icon_id) {
|
||||||
|
@ -1615,8 +1615,8 @@ static const EnumPropertyItem *object_mode_set_itemsf(
|
|||||||
(input->value == OB_MODE_PARTICLE_EDIT && use_mode_particle_edit) ||
|
(input->value == OB_MODE_PARTICLE_EDIT && use_mode_particle_edit) ||
|
||||||
(ELEM(input->value, OB_MODE_SCULPT, OB_MODE_VERTEX_PAINT,
|
(ELEM(input->value, OB_MODE_SCULPT, OB_MODE_VERTEX_PAINT,
|
||||||
OB_MODE_WEIGHT_PAINT, OB_MODE_TEXTURE_PAINT) && (ob->type == OB_MESH)) ||
|
OB_MODE_WEIGHT_PAINT, OB_MODE_TEXTURE_PAINT) && (ob->type == OB_MESH)) ||
|
||||||
(ELEM(input->value, OB_MODE_GPENCIL_EDIT, OB_MODE_GPENCIL_PAINT,
|
(ELEM(input->value, OB_MODE_EDIT_GPENCIL, OB_MODE_PAINT_GPENCIL,
|
||||||
OB_MODE_GPENCIL_SCULPT, OB_MODE_GPENCIL_WEIGHT) && (ob->type == OB_GPENCIL)) ||
|
OB_MODE_SCULPT_GPENCIL, OB_MODE_WEIGHT_GPENCIL) && (ob->type == OB_GPENCIL)) ||
|
||||||
(input->value == OB_MODE_OBJECT))
|
(input->value == OB_MODE_OBJECT))
|
||||||
{
|
{
|
||||||
RNA_enum_item_add(&item, &totitem, input);
|
RNA_enum_item_add(&item, &totitem, input);
|
||||||
@ -1674,7 +1674,7 @@ static int object_mode_set_exec(bContext *C, wmOperator *op)
|
|||||||
|
|
||||||
/* by default the operator assume is a mesh, but if gp object change mode */
|
/* by default the operator assume is a mesh, but if gp object change mode */
|
||||||
if ((ob != NULL) && (ob->type == OB_GPENCIL) && (mode == OB_MODE_EDIT)) {
|
if ((ob != NULL) && (ob->type == OB_GPENCIL) && (mode == OB_MODE_EDIT)) {
|
||||||
mode = OB_MODE_GPENCIL_EDIT;
|
mode = OB_MODE_EDIT_GPENCIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ob || !ED_object_mode_compat_test(ob, mode))
|
if (!ob || !ED_object_mode_compat_test(ob, mode))
|
||||||
|
@ -74,13 +74,13 @@ static const char *object_mode_op_string(eObjectMode mode)
|
|||||||
return "PARTICLE_OT_particle_edit_toggle";
|
return "PARTICLE_OT_particle_edit_toggle";
|
||||||
if (mode == OB_MODE_POSE)
|
if (mode == OB_MODE_POSE)
|
||||||
return "OBJECT_OT_posemode_toggle";
|
return "OBJECT_OT_posemode_toggle";
|
||||||
if (mode == OB_MODE_GPENCIL_EDIT)
|
if (mode == OB_MODE_EDIT_GPENCIL)
|
||||||
return "GPENCIL_OT_editmode_toggle";
|
return "GPENCIL_OT_editmode_toggle";
|
||||||
if (mode == OB_MODE_GPENCIL_PAINT)
|
if (mode == OB_MODE_PAINT_GPENCIL)
|
||||||
return "GPENCIL_OT_paintmode_toggle";
|
return "GPENCIL_OT_paintmode_toggle";
|
||||||
if (mode == OB_MODE_GPENCIL_SCULPT)
|
if (mode == OB_MODE_SCULPT_GPENCIL)
|
||||||
return "GPENCIL_OT_sculptmode_toggle";
|
return "GPENCIL_OT_sculptmode_toggle";
|
||||||
if (mode == OB_MODE_GPENCIL_WEIGHT)
|
if (mode == OB_MODE_WEIGHT_GPENCIL)
|
||||||
return "GPENCIL_OT_weightmode_toggle";
|
return "GPENCIL_OT_weightmode_toggle";
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
@ -119,8 +119,8 @@ bool ED_object_mode_compat_test(const Object *ob, eObjectMode mode)
|
|||||||
return true;
|
return true;
|
||||||
break;
|
break;
|
||||||
case OB_GPENCIL:
|
case OB_GPENCIL:
|
||||||
if (mode & (OB_MODE_EDIT | OB_MODE_GPENCIL_EDIT | OB_MODE_GPENCIL_PAINT |
|
if (mode & (OB_MODE_EDIT | OB_MODE_EDIT_GPENCIL | OB_MODE_PAINT_GPENCIL |
|
||||||
OB_MODE_GPENCIL_SCULPT | OB_MODE_GPENCIL_WEIGHT))
|
OB_MODE_SCULPT_GPENCIL | OB_MODE_WEIGHT_GPENCIL))
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -118,7 +118,7 @@ static int brush_add_gpencil_exec(bContext *C, wmOperator *UNUSED(op))
|
|||||||
br = BKE_brush_copy(bmain, br);
|
br = BKE_brush_copy(bmain, br);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
br = BKE_brush_add(bmain, "Brush", OB_MODE_GPENCIL_PAINT);
|
br = BKE_brush_add(bmain, "Brush", OB_MODE_PAINT_GPENCIL);
|
||||||
id_us_min(&br->id); /* fake user only */
|
id_us_min(&br->id); /* fake user only */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -258,13 +258,13 @@ static void buttons_main_region_layout_tool(const bContext *C, ARegion *ar)
|
|||||||
case CTX_MODE_OBJECT:
|
case CTX_MODE_OBJECT:
|
||||||
ARRAY_SET_ITEMS(contexts, ".objectmode");
|
ARRAY_SET_ITEMS(contexts, ".objectmode");
|
||||||
break;
|
break;
|
||||||
case CTX_MODE_GPENCIL_PAINT:
|
case CTX_MODE_PAINT_GPENCIL:
|
||||||
ARRAY_SET_ITEMS(contexts, ".greasepencil_paint");
|
ARRAY_SET_ITEMS(contexts, ".greasepencil_paint");
|
||||||
break;
|
break;
|
||||||
case CTX_MODE_GPENCIL_SCULPT:
|
case CTX_MODE_SCULPT_GPENCIL:
|
||||||
ARRAY_SET_ITEMS(contexts, ".greasepencil_sculpt");
|
ARRAY_SET_ITEMS(contexts, ".greasepencil_sculpt");
|
||||||
break;
|
break;
|
||||||
case CTX_MODE_GPENCIL_WEIGHT:
|
case CTX_MODE_WEIGHT_GPENCIL:
|
||||||
ARRAY_SET_ITEMS(contexts, ".greasepencil_weight");
|
ARRAY_SET_ITEMS(contexts, ".greasepencil_weight");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@ -290,16 +290,16 @@ static void buttons_main_region_layout_tool(const bContext *C, ARegion *ar)
|
|||||||
* workspace->tools_space_type because this value is not available
|
* workspace->tools_space_type because this value is not available
|
||||||
*/
|
*/
|
||||||
switch (mode) {
|
switch (mode) {
|
||||||
case CTX_MODE_GPENCIL_PAINT:
|
case CTX_MODE_PAINT_GPENCIL:
|
||||||
ARRAY_SET_ITEMS(contexts, ".greasepencil_paint");
|
ARRAY_SET_ITEMS(contexts, ".greasepencil_paint");
|
||||||
break;
|
break;
|
||||||
case CTX_MODE_GPENCIL_SCULPT:
|
case CTX_MODE_SCULPT_GPENCIL:
|
||||||
ARRAY_SET_ITEMS(contexts, ".greasepencil_sculpt");
|
ARRAY_SET_ITEMS(contexts, ".greasepencil_sculpt");
|
||||||
break;
|
break;
|
||||||
case CTX_MODE_GPENCIL_WEIGHT:
|
case CTX_MODE_WEIGHT_GPENCIL:
|
||||||
ARRAY_SET_ITEMS(contexts, ".greasepencil_weight");
|
ARRAY_SET_ITEMS(contexts, ".greasepencil_weight");
|
||||||
break;
|
break;
|
||||||
case CTX_MODE_GPENCIL_EDIT:
|
case CTX_MODE_EDIT_GPENCIL:
|
||||||
ARRAY_SET_ITEMS(contexts, ".greasepencil_edit");
|
ARRAY_SET_ITEMS(contexts, ".greasepencil_edit");
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
@ -1849,9 +1849,9 @@ static bool ed_object_select_pick(
|
|||||||
{
|
{
|
||||||
/* set cursor */
|
/* set cursor */
|
||||||
if (ELEM(basact->object->mode,
|
if (ELEM(basact->object->mode,
|
||||||
OB_MODE_GPENCIL_PAINT,
|
OB_MODE_PAINT_GPENCIL,
|
||||||
OB_MODE_GPENCIL_SCULPT,
|
OB_MODE_SCULPT_GPENCIL,
|
||||||
OB_MODE_GPENCIL_WEIGHT))
|
OB_MODE_WEIGHT_GPENCIL))
|
||||||
{
|
{
|
||||||
ED_gpencil_toggle_brush_cursor(C, true, NULL);
|
ED_gpencil_toggle_brush_cursor(C, true, NULL);
|
||||||
}
|
}
|
||||||
|
@ -181,7 +181,7 @@ static int ed_undo_step(bContext *C, int step, const char *undoname, ReportList
|
|||||||
Object *obact = CTX_data_active_object(C);
|
Object *obact = CTX_data_active_object(C);
|
||||||
if (obact && (obact->type == OB_GPENCIL)) {
|
if (obact && (obact->type == OB_GPENCIL)) {
|
||||||
/* set cursor */
|
/* set cursor */
|
||||||
if (ELEM(obact->mode, OB_MODE_GPENCIL_PAINT, OB_MODE_GPENCIL_SCULPT, OB_MODE_GPENCIL_WEIGHT)) {
|
if (ELEM(obact->mode, OB_MODE_PAINT_GPENCIL, OB_MODE_SCULPT_GPENCIL, OB_MODE_WEIGHT_GPENCIL)) {
|
||||||
ED_gpencil_toggle_brush_cursor(C, true, NULL);
|
ED_gpencil_toggle_brush_cursor(C, true, NULL);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -37,16 +37,16 @@ typedef enum eObjectMode {
|
|||||||
OB_MODE_TEXTURE_PAINT = 1 << 4,
|
OB_MODE_TEXTURE_PAINT = 1 << 4,
|
||||||
OB_MODE_PARTICLE_EDIT = 1 << 5,
|
OB_MODE_PARTICLE_EDIT = 1 << 5,
|
||||||
OB_MODE_POSE = 1 << 6,
|
OB_MODE_POSE = 1 << 6,
|
||||||
OB_MODE_GPENCIL_EDIT = 1 << 7,
|
OB_MODE_EDIT_GPENCIL = 1 << 7,
|
||||||
OB_MODE_GPENCIL_PAINT = 1 << 8,
|
OB_MODE_PAINT_GPENCIL = 1 << 8,
|
||||||
OB_MODE_GPENCIL_SCULPT = 1 << 9,
|
OB_MODE_SCULPT_GPENCIL = 1 << 9,
|
||||||
OB_MODE_GPENCIL_WEIGHT = 1 << 10,
|
OB_MODE_WEIGHT_GPENCIL = 1 << 10,
|
||||||
} eObjectMode;
|
} eObjectMode;
|
||||||
|
|
||||||
/* Any mode where the brush system is used. */
|
/* Any mode where the brush system is used. */
|
||||||
#define OB_MODE_ALL_PAINT (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)
|
#define OB_MODE_ALL_PAINT (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT)
|
||||||
|
|
||||||
#define OB_MODE_ALL_PAINT_GPENCIL (OB_MODE_GPENCIL_PAINT | OB_MODE_GPENCIL_SCULPT | OB_MODE_GPENCIL_WEIGHT)
|
#define OB_MODE_ALL_PAINT_GPENCIL (OB_MODE_PAINT_GPENCIL | OB_MODE_SCULPT_GPENCIL | OB_MODE_WEIGHT_GPENCIL)
|
||||||
|
|
||||||
/* Any mode that uses Object.sculpt. */
|
/* Any mode that uses Object.sculpt. */
|
||||||
#define OB_MODE_ALL_SCULPT (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)
|
#define OB_MODE_ALL_SCULPT (OB_MODE_SCULPT | OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)
|
||||||
|
@ -675,7 +675,7 @@ static void rna_BrushGpencilSettings_default_eraser_update(Main *bmain, Scene *s
|
|||||||
/* disable default eraser in all brushes */
|
/* disable default eraser in all brushes */
|
||||||
for (Brush *brush = bmain->brush.first; brush; brush = brush->id.next) {
|
for (Brush *brush = bmain->brush.first; brush; brush = brush->id.next) {
|
||||||
if ((brush != brush_cur) &&
|
if ((brush != brush_cur) &&
|
||||||
(brush->ob_mode == OB_MODE_GPENCIL_PAINT) &&
|
(brush->ob_mode == OB_MODE_PAINT_GPENCIL) &&
|
||||||
(brush->gpencil_tool == GPAINT_TOOL_ERASE))
|
(brush->gpencil_tool == GPAINT_TOOL_ERASE))
|
||||||
{
|
{
|
||||||
brush->gpencil_settings->flag &= ~GP_BRUSH_DEFAULT_ERASER;
|
brush->gpencil_settings->flag &= ~GP_BRUSH_DEFAULT_ERASER;
|
||||||
@ -1820,7 +1820,7 @@ static void rna_def_brush(BlenderRNA *brna)
|
|||||||
RNA_def_property_ui_text(prop, "Use Texture", "Use this brush in texture paint mode");
|
RNA_def_property_ui_text(prop, "Use Texture", "Use this brush in texture paint mode");
|
||||||
|
|
||||||
prop = RNA_def_property(srna, "use_paint_grease_pencil", PROP_BOOLEAN, PROP_NONE);
|
prop = RNA_def_property(srna, "use_paint_grease_pencil", PROP_BOOLEAN, PROP_NONE);
|
||||||
RNA_def_property_boolean_sdna(prop, NULL, "ob_mode", OB_MODE_GPENCIL_PAINT);
|
RNA_def_property_boolean_sdna(prop, NULL, "ob_mode", OB_MODE_PAINT_GPENCIL);
|
||||||
RNA_def_property_ui_text(prop, "Use Sculpt", "Use this brush in grease pencil drawing mode");
|
RNA_def_property_ui_text(prop, "Use Sculpt", "Use this brush in grease pencil drawing mode");
|
||||||
|
|
||||||
/* texture */
|
/* texture */
|
||||||
|
@ -53,10 +53,10 @@ const EnumPropertyItem rna_enum_context_mode_items[] = {
|
|||||||
{CTX_MODE_PAINT_TEXTURE, "PAINT_TEXTURE", 0, "Texture Paint", ""},
|
{CTX_MODE_PAINT_TEXTURE, "PAINT_TEXTURE", 0, "Texture Paint", ""},
|
||||||
{CTX_MODE_PARTICLE, "PARTICLE", 0, "Particle", ""},
|
{CTX_MODE_PARTICLE, "PARTICLE", 0, "Particle", ""},
|
||||||
{CTX_MODE_OBJECT, "OBJECT", 0, "Object", ""},
|
{CTX_MODE_OBJECT, "OBJECT", 0, "Object", ""},
|
||||||
{CTX_MODE_GPENCIL_PAINT, "GPENCIL_PAINT", 0, "Grease Pencil Paint", "" },
|
{CTX_MODE_PAINT_GPENCIL, "PAINT_GPENCIL", 0, "Grease Pencil Paint", "" },
|
||||||
{CTX_MODE_GPENCIL_EDIT, "GPENCIL_EDIT", 0, "Grease Pencil Edit", "" },
|
{CTX_MODE_EDIT_GPENCIL, "EDIT_GPENCIL", 0, "Grease Pencil Edit", "" },
|
||||||
{CTX_MODE_GPENCIL_SCULPT, "GPENCIL_SCULPT", 0, "Grease Pencil Sculpt", "" },
|
{CTX_MODE_SCULPT_GPENCIL, "SCULPT_GPENCIL", 0, "Grease Pencil Sculpt", "" },
|
||||||
{CTX_MODE_GPENCIL_WEIGHT, "GPENCIL_WEIGHT", 0, "Grease Pencil Weight Paint", "" },
|
{CTX_MODE_WEIGHT_GPENCIL, "WEIGHT_GPENCIL", 0, "Grease Pencil Weight Paint", "" },
|
||||||
{0, NULL, 0, NULL, NULL}
|
{0, NULL, 0, NULL, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -74,10 +74,10 @@ const EnumPropertyItem rna_enum_object_mode_items[] = {
|
|||||||
{OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", ICON_WPAINT_HLT, "Weight Paint", ""},
|
{OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", ICON_WPAINT_HLT, "Weight Paint", ""},
|
||||||
{OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, "Texture Paint", ""},
|
{OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, "Texture Paint", ""},
|
||||||
{OB_MODE_PARTICLE_EDIT, "PARTICLE_EDIT", ICON_PARTICLEMODE, "Particle Edit", ""},
|
{OB_MODE_PARTICLE_EDIT, "PARTICLE_EDIT", ICON_PARTICLEMODE, "Particle Edit", ""},
|
||||||
{OB_MODE_GPENCIL_EDIT, "GPENCIL_EDIT", ICON_EDITMODE_HLT, "Edit Mode", "Edit Grease Pencil Strokes"},
|
{OB_MODE_EDIT_GPENCIL, "EDIT_GPENCIL", ICON_EDITMODE_HLT, "Edit Mode", "Edit Grease Pencil Strokes"},
|
||||||
{OB_MODE_GPENCIL_SCULPT, "GPENCIL_SCULPT", ICON_SCULPTMODE_HLT, "Sculpt Mode", "Sculpt Grease Pencil Strokes"},
|
{OB_MODE_SCULPT_GPENCIL, "SCULPT_GPENCIL", ICON_SCULPTMODE_HLT, "Sculpt Mode", "Sculpt Grease Pencil Strokes"},
|
||||||
{OB_MODE_GPENCIL_PAINT, "GPENCIL_PAINT", ICON_GREASEPENCIL, "Draw", "Paint Grease Pencil Strokes"},
|
{OB_MODE_PAINT_GPENCIL, "PAINT_GPENCIL", ICON_GREASEPENCIL, "Draw", "Paint Grease Pencil Strokes"},
|
||||||
{OB_MODE_GPENCIL_WEIGHT, "GPENCIL_WEIGHT", ICON_WPAINT_HLT, "Weight Paint", "Grease Pencil Weight Paint Strokes" },
|
{OB_MODE_WEIGHT_GPENCIL, "WEIGHT_GPENCIL", ICON_WPAINT_HLT, "Weight Paint", "Grease Pencil Weight Paint Strokes" },
|
||||||
{0, NULL, 0, NULL, NULL}
|
{0, NULL, 0, NULL, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -91,10 +91,10 @@ const EnumPropertyItem rna_enum_workspace_object_mode_items[] = {
|
|||||||
{OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", ICON_WPAINT_HLT, "Weight Paint", ""},
|
{OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", ICON_WPAINT_HLT, "Weight Paint", ""},
|
||||||
{OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, "Texture Paint", ""},
|
{OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, "Texture Paint", ""},
|
||||||
{OB_MODE_PARTICLE_EDIT, "PARTICLE_EDIT", ICON_PARTICLEMODE, "Particle Edit", ""},
|
{OB_MODE_PARTICLE_EDIT, "PARTICLE_EDIT", ICON_PARTICLEMODE, "Particle Edit", ""},
|
||||||
{OB_MODE_GPENCIL_EDIT, "GPENCIL_EDIT", ICON_EDITMODE_HLT, "Grease Pencil Edit Mode", "Edit Grease Pencil Strokes"},
|
{OB_MODE_EDIT_GPENCIL, "EDIT_GPENCIL", ICON_EDITMODE_HLT, "Grease Pencil Edit Mode", "Edit Grease Pencil Strokes"},
|
||||||
{OB_MODE_GPENCIL_SCULPT, "GPENCIL_SCULPT", ICON_SCULPTMODE_HLT, "Grease Pencil Sculpt Mode", "Sculpt Grease Pencil Strokes"},
|
{OB_MODE_SCULPT_GPENCIL, "SCULPT_GPENCIL", ICON_SCULPTMODE_HLT, "Grease Pencil Sculpt Mode", "Sculpt Grease Pencil Strokes"},
|
||||||
{OB_MODE_GPENCIL_PAINT, "GPENCIL_PAINT", ICON_GREASEPENCIL, "Grease Pencil Draw", "Paint Grease Pencil Strokes"},
|
{OB_MODE_PAINT_GPENCIL, "PAINT_GPENCIL", ICON_GREASEPENCIL, "Grease Pencil Draw", "Paint Grease Pencil Strokes"},
|
||||||
{OB_MODE_GPENCIL_WEIGHT, "GPENCIL_WEIGHT", ICON_WPAINT_HLT, "Grease Pencil Weight Paint", "Grease Pencil Weight Paint Strokes" },
|
{OB_MODE_WEIGHT_GPENCIL, "WEIGHT_GPENCIL", ICON_WPAINT_HLT, "Grease Pencil Weight Paint", "Grease Pencil Weight Paint Strokes" },
|
||||||
{0, NULL, 0, NULL, NULL}
|
{0, NULL, 0, NULL, NULL}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -342,7 +342,7 @@ static bool rna_Brush_mode_with_tool_poll(PointerRNA *ptr, PointerRNA value)
|
|||||||
if (slot_index != brush->gpencil_tool) {
|
if (slot_index != brush->gpencil_tool) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
mode = OB_MODE_GPENCIL_PAINT;
|
mode = OB_MODE_PAINT_GPENCIL;
|
||||||
}
|
}
|
||||||
|
|
||||||
return brush->ob_mode & mode;
|
return brush->ob_mode & mode;
|
||||||
|
@ -123,10 +123,10 @@ wmKeyMap *WM_keymap_guess_from_context(const bContext *C)
|
|||||||
case CTX_MODE_PAINT_TEXTURE: km_id = "Image Paint"; break;
|
case CTX_MODE_PAINT_TEXTURE: km_id = "Image Paint"; break;
|
||||||
case CTX_MODE_PARTICLE: km_id = "Particle"; break;
|
case CTX_MODE_PARTICLE: km_id = "Particle"; break;
|
||||||
case CTX_MODE_OBJECT: km_id = "Object Mode"; break;
|
case CTX_MODE_OBJECT: km_id = "Object Mode"; break;
|
||||||
case CTX_MODE_GPENCIL_PAINT: km_id = "Grease Pencil Stroke Paint Mode"; break;
|
case CTX_MODE_PAINT_GPENCIL: km_id = "Grease Pencil Stroke Paint Mode"; break;
|
||||||
case CTX_MODE_GPENCIL_EDIT: km_id = "Grease Pencil Stroke Edit Mode"; break;
|
case CTX_MODE_EDIT_GPENCIL: km_id = "Grease Pencil Stroke Edit Mode"; break;
|
||||||
case CTX_MODE_GPENCIL_SCULPT: km_id = "Grease Pencil Stroke Sculpt Mode"; break;
|
case CTX_MODE_SCULPT_GPENCIL: km_id = "Grease Pencil Stroke Sculpt Mode"; break;
|
||||||
case CTX_MODE_GPENCIL_WEIGHT: km_id = "Grease Pencil Stroke Weight Mode"; break;
|
case CTX_MODE_WEIGHT_GPENCIL: km_id = "Grease Pencil Stroke Weight Mode"; break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (sl->spacetype == SPACE_IMAGE) {
|
else if (sl->spacetype == SPACE_IMAGE) {
|
||||||
|
@ -205,7 +205,7 @@ static void toolsystem_ref_link(bContext *C, WorkSpace *workspace, bToolRef *tre
|
|||||||
Main *bmain = CTX_data_main(C);
|
Main *bmain = CTX_data_main(C);
|
||||||
|
|
||||||
if ((tref->space_type == SPACE_VIEW3D) &&
|
if ((tref->space_type == SPACE_VIEW3D) &&
|
||||||
(tref->mode == CTX_MODE_GPENCIL_SCULPT))
|
(tref->mode == CTX_MODE_SCULPT_GPENCIL))
|
||||||
{
|
{
|
||||||
const EnumPropertyItem *items = rna_enum_gpencil_sculpt_brush_items;
|
const EnumPropertyItem *items = rna_enum_gpencil_sculpt_brush_items;
|
||||||
const int i = RNA_enum_from_identifier(items, tref_rt->data_block);
|
const int i = RNA_enum_from_identifier(items, tref_rt->data_block);
|
||||||
@ -222,7 +222,7 @@ static void toolsystem_ref_link(bContext *C, WorkSpace *workspace, bToolRef *tre
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ((tref->space_type == SPACE_VIEW3D) &&
|
else if ((tref->space_type == SPACE_VIEW3D) &&
|
||||||
(tref->mode == CTX_MODE_GPENCIL_WEIGHT))
|
(tref->mode == CTX_MODE_WEIGHT_GPENCIL))
|
||||||
{
|
{
|
||||||
const EnumPropertyItem *items = rna_enum_gpencil_weight_brush_items;
|
const EnumPropertyItem *items = rna_enum_gpencil_weight_brush_items;
|
||||||
const int i = RNA_enum_from_identifier(items, tref_rt->data_block);
|
const int i = RNA_enum_from_identifier(items, tref_rt->data_block);
|
||||||
@ -471,9 +471,9 @@ void WM_toolsystem_ref_sync_from_context(
|
|||||||
/* pass */
|
/* pass */
|
||||||
}
|
}
|
||||||
else if ((tref->space_type == SPACE_VIEW3D) &&
|
else if ((tref->space_type == SPACE_VIEW3D) &&
|
||||||
(tref->mode == CTX_MODE_GPENCIL_SCULPT))
|
(tref->mode == CTX_MODE_SCULPT_GPENCIL))
|
||||||
{
|
{
|
||||||
if (ob->mode & OB_MODE_GPENCIL_SCULPT) {
|
if (ob->mode & OB_MODE_SCULPT_GPENCIL) {
|
||||||
const EnumPropertyItem *items = rna_enum_gpencil_sculpt_brush_items;
|
const EnumPropertyItem *items = rna_enum_gpencil_sculpt_brush_items;
|
||||||
const int i = RNA_enum_from_value(items, ts->gp_sculpt.brushtype);
|
const int i = RNA_enum_from_value(items, ts->gp_sculpt.brushtype);
|
||||||
const EnumPropertyItem *item = &items[i];
|
const EnumPropertyItem *item = &items[i];
|
||||||
@ -484,9 +484,9 @@ void WM_toolsystem_ref_sync_from_context(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if ((tref->space_type == SPACE_VIEW3D) &&
|
else if ((tref->space_type == SPACE_VIEW3D) &&
|
||||||
(tref->mode == CTX_MODE_GPENCIL_WEIGHT))
|
(tref->mode == CTX_MODE_WEIGHT_GPENCIL))
|
||||||
{
|
{
|
||||||
if (ob->mode & OB_MODE_GPENCIL_WEIGHT) {
|
if (ob->mode & OB_MODE_WEIGHT_GPENCIL) {
|
||||||
const EnumPropertyItem *items = rna_enum_gpencil_weight_brush_items;
|
const EnumPropertyItem *items = rna_enum_gpencil_weight_brush_items;
|
||||||
const int i = RNA_enum_from_value(items, ts->gp_sculpt.weighttype);
|
const int i = RNA_enum_from_value(items, ts->gp_sculpt.weighttype);
|
||||||
const EnumPropertyItem *item = &items[i];
|
const EnumPropertyItem *item = &items[i];
|
||||||
@ -791,11 +791,11 @@ static const char *toolsystem_default_tool(const bToolKey *tkey)
|
|||||||
case CTX_MODE_SCULPT:
|
case CTX_MODE_SCULPT:
|
||||||
case CTX_MODE_PAINT_VERTEX:
|
case CTX_MODE_PAINT_VERTEX:
|
||||||
case CTX_MODE_PAINT_WEIGHT:
|
case CTX_MODE_PAINT_WEIGHT:
|
||||||
case CTX_MODE_GPENCIL_WEIGHT:
|
case CTX_MODE_WEIGHT_GPENCIL:
|
||||||
case CTX_MODE_PAINT_TEXTURE:
|
case CTX_MODE_PAINT_TEXTURE:
|
||||||
case CTX_MODE_GPENCIL_PAINT:
|
case CTX_MODE_PAINT_GPENCIL:
|
||||||
return "Draw";
|
return "Draw";
|
||||||
case CTX_MODE_GPENCIL_SCULPT:
|
case CTX_MODE_SCULPT_GPENCIL:
|
||||||
return "Push";
|
return "Push";
|
||||||
/* end temporary hack. */
|
/* end temporary hack. */
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user