[Bf-blender-cvs] [d7b27b8] GPencil_EditStrokes: Remove check for "Grease Pencil Mode" from color swatch drawing for GP Layer entries in preparation for upcoming changes here

[Joshua Leung]

Commit: d7b27b866872179f2536ef983364aa1043b32f45
Author: Joshua Leung
Date:   Thu Nov 27 01:31:34 2014 +1300
Branches: GPencil_EditStrokes
https://developer.blender.org/rBd7b27b866872179f2536ef983364aa1043b32f45

Remove check for "Grease Pencil Mode" from color swatch drawing for GP Layer entries
in preparation for upcoming changes here

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

M	source/blender/editors/animation/anim_channels_defines.c

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

diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c
index 0d4cd68..7e72da4 100644
--- a/source/blender/editors/animation/anim_channels_defines.c
+++ b/source/blender/editors/animation/anim_channels_defines.c
@@ -3432,7 +3432,7 @@ void ANIM_channel_draw(bAnimContext *ac, bAnimListElem *ale, float yminc, float
 			/* just skip - drawn as widget now */
 			offset += ICON_WIDTH; 
 		}
-		else if ((ac->datatype == ANIMCONT_GPENCIL) && (ale->type == ANIMTYPE_GPLAYER)) {
+		else if (ale->type == ANIMTYPE_GPLAYER) {
 			/* just skip - drawn as a widget */
 			offset += ICON_WIDTH;
 		}
@@ -3896,7 +3896,7 @@ void ANIM_channel_draw_widgets(bContext *C, bAnimContext *ac, bAnimListElem *ale
 			draw_setting_widget(ac, ale, acf, block, offset, ymid, ACHANNEL_SETTING_SOLO);
 			offset += ICON_WIDTH; 
 		}
-		else if ((ac->datatype == ANIMCONT_GPENCIL) && (ale->type == ANIMTYPE_GPLAYER)) {
+		else if (ale->type == ANIMTYPE_GPLAYER) {
 			/* color swatch for layer color */
 			bGPDlayer *gpl = (bGPDlayer *)ale->data;
 			PointerRNA ptr;