blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

3D View: don't show manipulators when overlay is disabled

This commit is contained in:
Campbell Barton 2018-06-18 18:33:02 +02:00
parent f0245a18d1
commit e92d61797b
Notes: blender-bot 2023-02-14 10:21:10 +01:00 
Referenced by issue #55379, Manipulator refuses to hide
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/draw/intern/draw_manager.c
View File

@ -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();