[Bf-blender-cvs] [2ac75fe] master: Fix: Color of frame/selected object indicator in 3D View didn't indicate GPencil keyframes when there was no active object
Joshua Leung
noreply at git.blender.org
Fri Aug 26 08:52:07 CEST 2016
Commit: 2ac75fe035458972ddf29cdbb33eb5af4ada2477
Author: Joshua Leung
Date: Fri Aug 26 16:07:25 2016 +1200
Branches: master
https://developer.blender.org/rB2ac75fe035458972ddf29cdbb33eb5af4ada2477
Fix: Color of frame/selected object indicator in 3D View didn't indicate GPencil keyframes
when there was no active object
===================================================================
M source/blender/editors/space_view3d/view3d_draw.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index d2a52de..a01f5db 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -951,9 +951,11 @@ static void draw_selected_name(Scene *scene, Object *ob, rcti *rect)
UI_ThemeColor(TH_TEXT_HI);
}
else {
- /* no object */
- /* color is always white */
- UI_ThemeColor(TH_TEXT_HI);
+ /* no object */
+ if (ED_gpencil_has_keyframe_v3d(scene, NULL, cfra))
+ UI_ThemeColor(TH_TIME_GP_KEYFRAME);
+ else
+ UI_ThemeColor(TH_TEXT_HI);
}
if (markern) {
More information about the Bf-blender-cvs
mailing list