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
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-11 15:00:38 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-11 15:01:18 +0300
commit6fed1525a1538fcdc207c42145396731f2bd3ed6 (patch)
tree92b79124259695a389e0e588541964c5a126e36f /source
parentc642474704db6a33120da2e8cfa34d502046cf98 (diff)
3D View: Show the camera frame when Extra's is off
Diffstat (limited to 'source')
-rw-r--r--source/blender/draw/modes/object_mode.c6
1 files changed, 5 insertions, 1 deletions
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) &&