blender
/
blender
134
400
Fork 583
Code Issues 6.3k Pull Requests 758 Projects 19 Wiki Activity

UI: Grease Pencil Onion Skin minor tweaks 

Avoid double label for same properties in single-column.
Onion Skinning: Group custom colors together, and frame before/after together.

Small changes to tooltips.
This commit is contained in:
Pablo Vazquez 2018-07-31 15:13:08 +02:00
parent 1b0c1c551a
commit ddd44315b8
3 changed files with 23 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
release/scripts/startup/bl_ui/properties_data_gpencil.py
View File

@ -215,7 +215,7 @@ class DATA_PT_gpencil_layer_optionpanel(LayerDataButtonsPanel, Panel):
layout.enabled = not gpl.lock
col = layout.column(align=True)
col.prop(gpl, "tint_color")
col.prop(gpl, "tint_factor", slider=True)
col.prop(gpl, "tint_factor", text="Factor", slider=True)
# Offsets - Thickness
col = layout.row(align=True)
@ -236,10 +236,10 @@ class DATA_PT_gpencil_parentpanel(LayerDataButtonsPanel, Panel):
layout.use_property_decorate = False
gpl = context.active_gpencil_layer
col = layout.column(align=True)
col = layout.column()
col.active = not gpl.lock
col.prop(gpl, "parent", text="Parent")
col.prop(gpl, "parent_type", text="Parent Type")
col.prop(gpl, "parent")
col.prop(gpl, "parent_type", text="Type")
parent = gpl.parent
if parent and gpl.parent_type == 'BONE' and parent.type == 'ARMATURE':

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

@ -785,43 +785,31 @@ class GreasePencilOnionPanel:
@staticmethod
def draw_settings(layout, gp):
col = layout.column()
col.prop(gp, "onion_mode")
col.prop(gp, "onion_factor", text="Opacity", slider=True)
row = col.row()
row.prop(gp, "onion_factor", text="Opacity", slider=True)
if gp.onion_mode in ('ABSOLUTE', 'RELATIVE'):
col = layout.column(align=True)
col.prop(gp, "ghost_before_range", text="Frames Before")
col.prop(gp, "ghost_after_range", text="After")
# Frames before.
sub = layout.column(align=True)
row = sub.row(align=True)
row.active = gp.use_ghost_custom_colors
row.prop(gp, "before_color", text="Color Before")
layout.prop(gp, "use_ghost_custom_colors", text="Use Custom Colors")
row = sub.row(align=True)
row.active = gp.onion_mode in ('ABSOLUTE', 'RELATIVE')
row.prop(gp, "ghost_before_range", text="Frames Before")
if gp.use_ghost_custom_colors:
col = layout.column(align=True)
col.active = gp.use_ghost_custom_colors
col.prop(gp, "before_color", text="Color Before")
col.prop(gp, "after_color", text="After")
# Frames after.
sub = layout.column(align=True)
row = sub.row(align=True)
row.active = gp.use_ghost_custom_colors
row.prop(gp, "after_color", text="Color After")
row = sub.row(align=True)
row.active = gp.onion_mode in ('ABSOLUTE', 'RELATIVE')
row.prop(gp, "ghost_after_range", text="Frames After")
layout.prop(gp, "use_ghost_custom_colors", text="Use Custom Color")
layout.prop(gp, "use_ghosts_always", text="View In Render")
# Fade and loop.
row = layout.row()
row.active = gp.use_onion_skinning
row.prop(gp, "use_onion_fade", text="Fade")
col = layout.column(align=True)
col.active = gp.use_onion_skinning
col.prop(gp, "use_onion_fade", text="Fade")
if hasattr(gp, "use_onion_loop"): # XXX
subrow = layout.row()
subrow.active = gp.onion_mode in ('RELATIVE', 'SELECTED')
subrow.prop(gp, "use_onion_loop", text="Loop")
sub = layout.column()
sub.active = gp.onion_mode in ('RELATIVE', 'SELECTED')
sub.prop(gp, "use_onion_loop", text="Loop")
class GreasePencilToolsPanel:

4
source/blender/makesrna/intern/rna_gpencil.c
View File

@ -1073,7 +1073,7 @@ static void rna_def_gpencil_layer(BlenderRNA *brna)
/* Onion-Skinning */
prop = RNA_def_property(srna, "use_onion_skinning", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "onion_flag", GP_LAYER_ONIONSKIN);
RNA_def_property_ui_text(prop, "Onion Skinning", "Ghost frames on either side of frame");
RNA_def_property_ui_text(prop, "Onion Skinning", "Display onion skins before and after the current frame");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
/* Flags */
@ -1303,7 +1303,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
prop = RNA_def_property(srna, "show_constant_thickness", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", GP_DATA_STROKE_KEEPTHICKNESS);
RNA_def_property_ui_text(prop, "Keep thickness", "Show stroke with same thickness when viewport zoom change");
RNA_def_property_ui_text(prop, "Keep Thickness", "Maintain the thickness of the stroke when the viewport zoom changes");
RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update");
prop = RNA_def_property(srna, "pixfactor", PROP_FLOAT, PROP_NONE);