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:
authorCampbell Barton <ideasman42@gmail.com>2019-04-13 13:23:07 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-13 13:45:02 +0300
commit65b03129041f42dabe1cdfd5154fc6efa6e1e758 (patch)
treecef91a2e1528912b23f16f2dc1c5e41aab0d0315 /source/blender/draw/intern
parentcd60843aef84b1801c9e0ff5c8d63926a20435cd (diff)
3D View: move gizmo draw options out of overlays
Gizmo's now have their own popover in preparation for making transform gizmos accessible without having to use tools See: T63518
Diffstat (limited to 'source/blender/draw/intern')
-rw-r--r--source/blender/draw/intern/draw_manager.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index a96ef4ed8fa..699ac8d5b0b 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1581,9 +1581,7 @@ void DRW_draw_render_loop_ex(
if (DST.draw_ctx.evil_C) {
/* needed so gizmo isn't obscured */
- if (((v3d->flag2 & V3D_HIDE_OVERLAYS) == 0) &&
- ((v3d->gizmo_flag & V3D_GIZMO_HIDE) == 0))
- {
+ if ((v3d->gizmo_flag & V3D_GIZMO_HIDE) == 0) {
glDisable(GL_DEPTH_TEST);
DRW_draw_gizmo_3d();
}
@@ -1601,7 +1599,7 @@ void DRW_draw_render_loop_ex(
GPU_depth_test(true);
}
- if ((v3d->flag2 & V3D_HIDE_OVERLAYS) == 0) {
+ if ((v3d->gizmo_flag & V3D_GIZMO_HIDE) == 0) {
/* Draw 2D after region info so we can draw on top of the camera passepartout overlay.
* 'DRW_draw_region_info' sets the projection in pixel-space. */
GPU_depth_test(false);