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:
authorClément Foucault <foucault.clem@gmail.com>2020-07-18 00:00:55 +0300
committerClément Foucault <foucault.clem@gmail.com>2020-07-18 04:43:52 +0300
commit4c28b1c74ec2a96055fcc393920f3967666dd735 (patch)
treeb85643f0b470eb092c0c3706cb10f56dddc2cade /source/blender/draw/intern/draw_manager_text.c
parent59975b0adf42cfbc51a90c02caaed49085abafa2 (diff)
Cleanup: GPU: Encapsulate clipDistances
This also remove some non functionnal state changes that were left from legacy code.
Diffstat (limited to 'source/blender/draw/intern/draw_manager_text.c')
-rw-r--r--source/blender/draw/intern/draw_manager_text.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/draw/intern/draw_manager_text.c b/source/blender/draw/intern/draw_manager_text.c
index f4601fe4f48..b3c4c97715e 100644
--- a/source/blender/draw/intern/draw_manager_text.c
+++ b/source/blender/draw/intern/draw_manager_text.c
@@ -38,6 +38,7 @@
#include "DNA_view3d_types.h"
#include "GPU_matrix.h"
+#include "GPU_state.h"
#include "ED_screen.h"
#include "ED_view3d.h"
@@ -149,8 +150,9 @@ void DRW_text_cache_draw(DRWTextStore *dt, ARegion *region, struct View3D *v3d)
if (tot) {
int col_pack_prev = 0;
+ /* Disable clipping for text */
if (RV3D_CLIPPING_ENABLED(v3d, rv3d)) {
- ED_view3d_clipping_disable();
+ GPU_clip_distances(0);
}
float original_proj[4][4];
@@ -188,7 +190,7 @@ void DRW_text_cache_draw(DRWTextStore *dt, ARegion *region, struct View3D *v3d)
GPU_matrix_projection_set(original_proj);
if (RV3D_CLIPPING_ENABLED(v3d, rv3d)) {
- ED_view3d_clipping_enable();
+ GPU_clip_distances(6);
}
}
}