From 6fed1525a1538fcdc207c42145396731f2bd3ed6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 11 Apr 2019 14:00:38 +0200 Subject: 3D View: Show the camera frame when Extra's is off --- source/blender/draw/modes/object_mode.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source') diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c index 94935da0f05..11575cbf227 100644 --- a/source/blender/draw/modes/object_mode.c +++ b/source/blender/draw/modes/object_mode.c @@ -2987,7 +2987,11 @@ static void OBJECT_cache_populate(void *vedata, Object *ob) (draw_ctx->v3d->flag & V3D_SELECT_OUTLINE) && ((ob->base_flag & BASE_SELECTED) != 0) && ((DRW_object_is_renderable(ob) && (ob->dt > OB_WIRE)) || (ob->dt == OB_WIRE))); const bool show_relations = ((draw_ctx->v3d->flag & V3D_HIDE_HELPLINES) == 0); - const bool hide_object_extra = (v3d->overlay.flag & V3D_OVERLAY_HIDE_OBJECT_XTRAS) != 0; + const bool hide_object_extra = ( + (v3d->overlay.flag & V3D_OVERLAY_HIDE_OBJECT_XTRAS) != 0 && + /* Show if this is the camera we're looking through + * since it's useful for moving the camera. */ + (((rv3d->persp == RV3D_CAMOB) && ((ID *)v3d->camera == ob->id.orig_id)) == 0)); if (do_outlines) { if (!BKE_object_is_in_editmode(ob) && -- cgit v1.2.3