diff options
| author | Jeroen Bakker <jeroen@blender.org> | 2019-12-11 16:47:35 +0300 |
|---|---|---|
| committer | Jeroen Bakker <jeroen@blender.org> | 2019-12-18 12:59:35 +0300 |
| commit | 2a35383bb0b49dd7a7ee0c507ec012372587f6e5 (patch) | |
| tree | bc1b7f931743ca8d4798442e6c7c8a28ef264387 | |
| parent | b30a722f2d6faecccd3b81efc1f0aa567064bb3a (diff) | |
Fix T72353: Camera Limits Visibility
Due to recent refactoring of the overlay unification the camera limits
were also visible when the overlays were turned off. This was because
the `draw_extra` had an exception for when looking through the camera.
This change also takes the global hide overlays into account. So now the
camera limits will not be drawn when overlays are turned off. This also
fixed other camera related overlay drawing.
Reviewed By: fclem
Differential Revision: https://developer.blender.org/D6394
| -rw-r--r-- | source/blender/draw/engines/overlay/overlay_engine.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/draw/engines/overlay/overlay_engine.c b/source/blender/draw/engines/overlay/overlay_engine.c index 06044ff92b3..fe39b8580e3 100644 --- a/source/blender/draw/engines/overlay/overlay_engine.c +++ b/source/blender/draw/engines/overlay/overlay_engine.c @@ -202,9 +202,10 @@ static void OVERLAY_cache_populate(void *vedata, Object *ob) const bool draw_bone_selection = (ob->type == OB_MESH) && pd->armature.do_pose_fade_geom && !is_select; const bool draw_extras = - ((pd->overlay.flag & V3D_OVERLAY_HIDE_OBJECT_XTRAS) == 0) || - /* Show if this is the camera we're looking through since it's useful for selecting. */ - ((draw_ctx->rv3d->persp == RV3D_CAMOB) && ((ID *)draw_ctx->v3d->camera == ob->id.orig_id)); + (!pd->hide_overlays) && + (((pd->overlay.flag & V3D_OVERLAY_HIDE_OBJECT_XTRAS) == 0) || + /* Show if this is the camera we're looking through since it's useful for selecting. */ + ((draw_ctx->rv3d->persp == RV3D_CAMOB) && ((ID *)draw_ctx->v3d->camera == ob->id.orig_id))); const bool draw_motion_paths = (pd->overlay.flag & V3D_OVERLAY_HIDE_MOTION_PATHS) == 0; |