[Bf-blender-cvs] [2e9a10c9a37] greasepencil-object: Remove unused ADS_FILTER_NOPALETTE

[Antonio Vazquez]

Commit: 2e9a10c9a37641ac6cc470f296be165ff8255042
Author: Antonio Vazquez
Date:   Fri May 11 16:31:57 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB2e9a10c9a37641ac6cc470f296be165ff8255042

Remove unused ADS_FILTER_NOPALETTE

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

M	release/scripts/startup/bl_ui/space_dopesheet.py
M	source/blender/makesdna/DNA_action_types.h
M	source/blender/makesrna/intern/rna_action.c

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

diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py
index 1080b5c0565..1b8582ba8f2 100644
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@ -101,8 +101,6 @@ def dopesheet_filter(layout, context, genericFiltersOnly=False):
                 row.prop(dopesheet, "show_linestyles", text="")
             if bpy.data.grease_pencil:
                 row.prop(dopesheet, "show_gpencil", text="")
-            if bpy.data.palettes:
-                row.prop(dopesheet, "show_palettes", text="")
 
             layout.prop(dopesheet, "use_datablock_sort", text="")
 
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 01b930a4309..02a17c2ffad 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -646,9 +646,6 @@ typedef enum eDopeSheet_FilterFlag {
 	/* GPencil Mode */
 	ADS_FILTER_GP_3DONLY        = (1 << 29),  /* GP Mode - Only show datablocks used in the scene */
 
-	/* Palette filter */
-	ADS_FILTER_NOPALETTE        = (1 << 30), 
-
 	/* combination filters (some only used at runtime) */
 	ADS_FILTER_NOOBDATA = (ADS_FILTER_NOCAM | ADS_FILTER_NOMAT | ADS_FILTER_NOLAM | ADS_FILTER_NOCUR | ADS_FILTER_NOPART | ADS_FILTER_NOARM | ADS_FILTER_NOSPK | ADS_FILTER_NOMODIFIERS)
 } eDopeSheet_FilterFlag;	
diff --git a/source/blender/makesrna/intern/rna_action.c b/source/blender/makesrna/intern/rna_action.c
index cd4c28b7a37..fe6a325049b 100644
--- a/source/blender/makesrna/intern/rna_action.c
+++ b/source/blender/makesrna/intern/rna_action.c
@@ -513,12 +513,6 @@ static void rna_def_dopesheet(BlenderRNA *brna)
 	RNA_def_property_ui_text(prop, "Display Grease Pencil", "Include visualization of Grease Pencil related animation data and frames");
 	RNA_def_property_ui_icon(prop, ICON_GREASEPENCIL, 0);
 	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
-	
-	prop = RNA_def_property(srna, "show_palettes", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_negative_sdna(prop, NULL, "filterflag", ADS_FILTER_NOPALETTE);
-	RNA_def_property_ui_text(prop, "Display Palette", "Include visualization of Palettes related animation data");
-	RNA_def_property_ui_icon(prop, ICON_COLOR, 0);
-	RNA_def_property_update(prop, NC_ANIMATION | ND_ANIMCHAN | NA_EDITED, NULL);
 
 	/* GPencil Mode Settings */
 	prop = RNA_def_property(srna, "show_gpencil_3d_only", PROP_BOOLEAN, PROP_NONE);