diff options
| author | Colin Basnett <cmbasnett@gmail.com> | 2022-09-17 03:50:37 +0300 |
|---|---|---|
| committer | Colin Basnett <cmbasnett@gmail.com> | 2022-09-17 03:50:37 +0300 |
| commit | 564bda241a973396da51d7c3ccd9efd97d51728a (patch) | |
| tree | 4d9aa4cccd82e2e606b47774afa5e1015bf14768 /source/blender/gpu/intern/gpu_immediate.cc | |
| parent | 0fff238150d076576053c25b646f653d6e3b0edb (diff) | |
| parent | 48d7ff68f0df209c77bbb081ab46fbc109fd825a (diff) | |
Merge branch 'master' into feature-imformatfeature-imformat
Diffstat (limited to 'source/blender/gpu/intern/gpu_immediate.cc')
| -rw-r--r-- | source/blender/gpu/intern/gpu_immediate.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/gpu/intern/gpu_immediate.cc b/source/blender/gpu/intern/gpu_immediate.cc index 69467e5b28a..3b4accf9cc5 100644 --- a/source/blender/gpu/intern/gpu_immediate.cc +++ b/source/blender/gpu/intern/gpu_immediate.cc @@ -18,7 +18,6 @@ #include "gpu_context_private.hh" #include "gpu_immediate_private.hh" #include "gpu_shader_private.hh" -#include "gpu_vertex_buffer_private.hh" #include "gpu_vertex_format_private.h" using namespace blender::gpu; @@ -132,15 +131,12 @@ static void wide_line_workaround_start(GPUPrimType prim_type) case GPU_SHADER_3D_CLIPPED_UNIFORM_COLOR: polyline_sh = GPU_SHADER_3D_POLYLINE_CLIPPED_UNIFORM_COLOR; break; - case GPU_SHADER_2D_UNIFORM_COLOR: case GPU_SHADER_3D_UNIFORM_COLOR: polyline_sh = GPU_SHADER_3D_POLYLINE_UNIFORM_COLOR; break; - case GPU_SHADER_2D_FLAT_COLOR: case GPU_SHADER_3D_FLAT_COLOR: polyline_sh = GPU_SHADER_3D_POLYLINE_FLAT_COLOR; break; - case GPU_SHADER_2D_SMOOTH_COLOR: case GPU_SHADER_3D_SMOOTH_COLOR: polyline_sh = GPU_SHADER_3D_POLYLINE_SMOOTH_COLOR; break; |