[Bf-blender-cvs] [84f0aee3d72] greasepencil-object: GPencil: Change Onion key type filter to Range mode

[Antonioya]

Commit: 84f0aee3d724b047523b8bf8e2878e2db69632f5
Author: Antonioya
Date:   Thu May 16 13:38:23 2019 +0200
Branches: greasepencil-object
https://developer.blender.org/rB84f0aee3d724b047523b8bf8e2878e2db69632f5

GPencil: Change Onion key type filter to Range mode

The filter is more useful in this mode, not selected.

===================================================================

M	release/scripts/startup/bl_ui/properties_data_gpencil.py
M	source/blender/draw/engines/gpencil/gpencil_draw_utils.c
M	source/blender/makesrna/intern/rna_gpencil.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_data_gpencil.py b/release/scripts/startup/bl_ui/properties_data_gpencil.py
index 2fcf7132d51..06a5bcbd44a 100644
--- a/release/scripts/startup/bl_ui/properties_data_gpencil.py
+++ b/release/scripts/startup/bl_ui/properties_data_gpencil.py
@@ -267,7 +267,6 @@ class DATA_PT_gpencil_onion_skinning(DataButtonsPanel, Panel):
             col = layout.column(align=True)
             col.prop(gpd, "ghost_before_range", text="Keyframes Before")
             col.prop(gpd, "ghost_after_range", text="Keyframes After")
-        elif gpd.onion_mode == 'SELECTED':
             col.prop(gpd, "onion_keyframe_type")
  
 
diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index e029f7c7398..671461750c8 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1208,7 +1208,7 @@ static void gpencil_draw_onionskins(GpencilBatchCache *cache,
       continue;
     }
     /* verify keyframe type */
-    if ((mode == GP_ONION_MODE_SELECTED) && (onion_keytype > -1)) {
+    if ((mode == GP_ONION_MODE_RELATIVE) && (onion_keytype > -1)) {
       if (gf->key_type != onion_keytype) {
         continue;
       }
@@ -1270,7 +1270,7 @@ static void gpencil_draw_onionskins(GpencilBatchCache *cache,
       continue;
     }
     /* verify keyframe type */
-    if ((mode == GP_ONION_MODE_SELECTED) && (onion_keytype > -1)) {
+    if ((mode == GP_ONION_MODE_RELATIVE) && (onion_keytype > -1)) {
       if (gf->key_type != onion_keytype) {
         continue;
       }
diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c
index 543cd8a00bb..7823f1aa96e 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -1767,6 +1767,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
   RNA_def_property_int_sdna(prop, NULL, "gstep");
   RNA_def_property_range(prop, 0, 120);
   RNA_def_property_int_default(prop, 1);
+  RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0);
   RNA_def_property_ui_text(prop,
                            "Frames Before",
                            "Maximum number of frames to show before current frame "
@@ -1777,6 +1778,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna)
   RNA_def_property_int_sdna(prop, NULL, "gstep_next");
   RNA_def_property_range(prop, 0, 120);
   RNA_def_property_int_default(prop, 1);
+  RNA_def_parameter_clear_flags(prop, PROP_ANIMATABLE, 0);
   RNA_def_property_ui_text(prop,
                            "Frames After",
                            "Maximum number of frames to show after current frame "