Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2016-08-26 07:07:25 +0300
committerJoshua Leung <aligorith@gmail.com>2016-08-26 07:15:48 +0300
commit2ac75fe035458972ddf29cdbb33eb5af4ada2477 (patch)
treeb0e0db5dd04534069b6c63ce72ccd21a46c91de6
parent84cd13750390a38a5321259f354ef401f45a95a2 (diff)
Fix: Color of frame/selected object indicator in 3D View didn't indicate GPencil keyframes
when there was no active object
-rw-r--r--source/blender/editors/space_view3d/view3d_draw.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index d2a52de0e28..a01f5dbc640 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) {