[Bf-blender-cvs] [e92d61797b0] blender2.8: 3D View: don't show manipulators when overlay is disabled
Campbell Barton
noreply at git.blender.org
Mon Jun 18 18:33:20 CEST 2018
Commit: e92d61797b08e3aa4c61ce9ea3a0c123f06fd131
Author: Campbell Barton
Date: Mon Jun 18 18:33:02 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe92d61797b08e3aa4c61ce9ea3a0c123f06fd131
3D View: don't show manipulators when overlay is disabled
===================================================================
M source/blender/draw/intern/draw_manager.c
===================================================================
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index a91b9fad35e..ef42b88fd72 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1360,15 +1360,21 @@ void DRW_draw_render_loop_ex(
if (DST.draw_ctx.evil_C) {
/* needed so manipulator isn't obscured */
- glDisable(GL_DEPTH_TEST);
- DRW_draw_manipulator_3d();
+ if (((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) &&
+ ((v3d->twflag & V3D_MANIPULATOR_DRAW) != 0))
+ {
+ glDisable(GL_DEPTH_TEST);
+ DRW_draw_manipulator_3d();
+ }
DRW_draw_region_info();
- /* 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. */
- DRW_draw_manipulator_2d();
- glEnable(GL_DEPTH_TEST);
+ if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 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. */
+ DRW_draw_manipulator_2d();
+ glEnable(GL_DEPTH_TEST);
+ }
}
DRW_stats_reset();
More information about the Bf-blender-cvs
mailing list