diff options
author | Jeroen Bakker <jeroen@blender.org> | 2019-12-10 17:18:16 +0300 |
---|---|---|
committer | Jeroen Bakker <jeroen@blender.org> | 2019-12-11 18:58:14 +0300 |
commit | 7878adf49cfff6ccbb18203f21c6355a518b34db (patch) | |
tree | 8f54eacad26647c6bd6db0b665ea4ff8063ab2ec /source/blender/draw/intern/draw_manager_text.c | |
parent | 61e0e936441828c148b701c9a942d2ab6d9fe3a9 (diff) |
DrawManager: Disable Clipping in material/rendered mode
Viewport: Disable Clipping For EEVEE and External Renderers
Currently it is possible that, when using viewport clipping, the display and tools communicate
different information to the user then the renderer does. The reason is
that the renderer does not support viewport clipping. Both EEVEE and
Cycles do not support it.
This patch will disable the clipping in all the tools and drawing code
when the viewport drawing mode is `Material Preview` or `Rendered`.
This patch introduces a `RV3D_CLIPPING_ENABLED` util that checks if
clipping is enabled for the given `rv3d` and `v3d`. Also in places where
it was needed we added the `ViewContext` as a carrier for the `View3D`
and `RegionView3D`.
There are a few areas in the tooling (select, projection painting) that
still needs to be tackled after this patch.
Reviewed By: fclem
Differential Revision: https://developer.blender.org/D6047
Diffstat (limited to 'source/blender/draw/intern/draw_manager_text.c')
-rw-r--r-- | source/blender/draw/intern/draw_manager_text.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/draw/intern/draw_manager_text.c b/source/blender/draw/intern/draw_manager_text.c index b6dab0b2077..9462a0d8072 100644 --- a/source/blender/draw/intern/draw_manager_text.c +++ b/source/blender/draw/intern/draw_manager_text.c @@ -119,7 +119,7 @@ void DRW_text_cache_add(DRWTextStore *dt, } } -void DRW_text_cache_draw(DRWTextStore *dt, ARegion *ar) +void DRW_text_cache_draw(DRWTextStore *dt, ARegion *ar, struct View3D *v3d) { RegionView3D *rv3d = ar->regiondata; ViewCachedString *vos; @@ -147,7 +147,7 @@ void DRW_text_cache_draw(DRWTextStore *dt, ARegion *ar) if (tot) { int col_pack_prev = 0; - if (rv3d->rflag & RV3D_CLIPPING) { + if (RV3D_CLIPPING_ENABLED(v3d, rv3d)) { ED_view3d_clipping_disable(); } @@ -185,7 +185,7 @@ void DRW_text_cache_draw(DRWTextStore *dt, ARegion *ar) GPU_matrix_pop(); GPU_matrix_projection_set(original_proj); - if (rv3d->rflag & RV3D_CLIPPING) { + if (RV3D_CLIPPING_ENABLED(v3d, rv3d)) { ED_view3d_clipping_enable(); } } |