GP: Remove Object Onion Skin switch
authorAntonioya <blendergit@gmail.com>
Mon, 10 Dec 2018 15:42:40 +0000 (16:42 +0100)
committerAntonioya <blendergit@gmail.com>
Mon, 10 Dec 2018 19:18:15 +0000 (20:18 +0100)
It was confusing to have two switches.

release/scripts/startup/bl_ui/properties_data_gpencil.py
release/scripts/startup/bl_ui/properties_grease_pencil_common.py
source/blender/draw/engines/gpencil/gpencil_draw_utils.c

index 5a64389e5c6dec00275ef74de55905e093ab84b3..56612c3aa1b3a6962e9110758196d39648520317 100644 (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)
index 1bedc2c4f977587f40a969b226b9dae7f0ead1d1..fff4a063ef80d7577131409c98e76882633e531c 100644 (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(
index a0e9d124e6b5993549226c1d654ddfe0be9a0412..fe950d2a228d80f16c519fb0391f6ca4398e85a2 100644 (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;