diff options
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_draw.c')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 8 |
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 5b068750d76..5405867be56 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -1294,7 +1294,7 @@ static void draw_viewport_name(ARegion *region, View3D *v3d, int xoffset, int *y static void draw_selected_name( Scene *scene, ViewLayer *view_layer, Object *ob, int xoffset, int *yoffset) { - const int cfra = CFRA; + const int cfra = scene->r.cfra; const char *msg_pin = " (Pinned)"; const char *msg_sep = " : "; @@ -1786,11 +1786,13 @@ void ED_view3d_draw_offscreen_simple(Depsgraph *depsgraph, } /* Disable other overlays (set all available _HIDE_ flags). */ v3d.overlay.flag |= V3D_OVERLAY_HIDE_CURSOR | V3D_OVERLAY_HIDE_TEXT | - V3D_OVERLAY_HIDE_MOTION_PATHS | V3D_OVERLAY_HIDE_BONES | - V3D_OVERLAY_HIDE_OBJECT_ORIGINS; + V3D_OVERLAY_HIDE_MOTION_PATHS | V3D_OVERLAY_HIDE_OBJECT_ORIGINS; if ((draw_flags & V3D_OFSDRAW_SHOW_OBJECT_EXTRAS) == 0) { v3d.overlay.flag |= V3D_OVERLAY_HIDE_OBJECT_XTRAS; } + if ((object_type_exclude_viewport_override & (1 << OB_ARMATURE)) != 0) { + v3d.overlay.flag |= V3D_OVERLAY_HIDE_BONES; + } v3d.flag |= V3D_HIDE_HELPLINES; } |