[Bf-blender-cvs] [adc92cc23e7] master: Fix T103357: Grease pencil layer color not displayed in main dopesheet backdrop
Amelie Fondevilla
noreply at git.blender.org
Tue Dec 20 14:49:08 CET 2022
Commit: adc92cc23e74ce10cff95f58fd517ed7c23d3779
Author: Amelie Fondevilla
Date: Tue Dec 20 13:14:21 2022 +0100
Branches: master
https://developer.blender.org/rBadc92cc23e74ce10cff95f58fd517ed7c23d3779
Fix T103357: Grease pencil layer color not displayed in main dopesheet backdrop
Reviewed By: Sybren A. Stüvel
Differential Revision: https://developer.blender.org/D16822
===================================================================
M source/blender/editors/space_action/action_draw.c
===================================================================
diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c
index 343975919e2..de3d306a0be 100644
--- a/source/blender/editors/space_action/action_draw.c
+++ b/source/blender/editors/space_action/action_draw.c
@@ -272,6 +272,20 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *region
}
break;
}
+ case ANIMTYPE_GPLAYER: {
+ if (show_group_colors) {
+ uchar gpl_col[4];
+ bGPDlayer *gpl = (bGPDlayer *)ale->data;
+ rgb_float_to_uchar(gpl_col, gpl->color);
+ gpl_col[3] = col1[3];
+
+ immUniformColor4ubv(sel ? col1 : gpl_col);
+ }
+ else {
+ immUniformColor4ubv(sel ? col1 : col2);
+ }
+ break;
+ }
default: {
immUniformColor4ubv(sel ? col1 : col2);
}
More information about the Bf-blender-cvs
mailing list