blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

GP: Remove Object Onion Skin switch 

It was confusing to have two switches.
This commit is contained in:
Antonio Vazquez 2018-12-10 16:42:40 +01:00
parent 2debee96ec
commit 18d354a5eb
3 changed files with 2 additions and 11 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

@ -240,18 +240,14 @@ class DATA_PT_gpencil_onionpanel(Panel):
def poll(cls, context):
return bool(context.active_gpencil_layer)
@staticmethod
def draw_header(self, context):
self.layout.prop(context.gpencil_data, "use_onion_skinning", text="")
def draw(self, context):
gpd = context.gpencil_data
layout = self.layout
layout.use_property_split = True
layout.enabled = gpd.use_onion_skinning and gpd.users <= 1
layout.enabled = gpd.users <= 1
if gpd.use_onion_skinning and gpd.users > 1:
if gpd.users > 1:
layout.label(text="Multiuser datablock not supported", icon='ERROR')
GreasePencilOnionPanel.draw_settings(layout, gpd)

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

@ -855,7 +855,6 @@ class GreasePencilOnionPanel:
layout.prop(gp, "use_ghosts_always", text="View In Render")
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
sub = layout.column()
@ -995,7 +994,6 @@ class GPENCIL_UL_layer(UIList):
icon='ONIONSKIN_ON' if gpl.use_onion_skinning else 'ONIONSKIN_OFF',
emboss=False,
)
subrow.active = gpd.use_onion_skinning
elif self.layout_type == 'GRID':
layout.alignment = 'CENTER'
layout.label(

3
source/blender/draw/engines/gpencil/gpencil_draw_utils.c
View File

@ -369,9 +369,6 @@ static DRWShadingGroup *DRW_gpencil_shgroup_fill_create(
/* check if some onion is enabled */
bool DRW_gpencil_onion_active(bGPdata *gpd)
{
if ((gpd->flag & GP_DATA_SHOW_ONIONSKINS) == 0) {
return false;
}
for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
if (gpl->onion_flag & GP_LAYER_ONIONSKIN) {
return true;