diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-02-06 02:33:14 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-02-06 02:34:09 +0300 |
| commit | 8996e26116f063ce28a9784899fc36d87f31dabe (patch) | |
| tree | 5085a8fdfec51ef1c807142859393d963efe10d3 /source/blender/gpu/GPU_batch.h | |
| parent | dbd7f36da8ec3ac1c2898aee346beecb86aac8a2 (diff) | |
Fix T61196: Mesh select ignores clipping
Select clipping now works when x-ray is disabled.
Diffstat (limited to 'source/blender/gpu/GPU_batch.h')
| -rw-r--r-- | source/blender/gpu/GPU_batch.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/gpu/GPU_batch.h b/source/blender/gpu/GPU_batch.h index 4311b73d1ef..9637ef74b8c 100644 --- a/source/blender/gpu/GPU_batch.h +++ b/source/blender/gpu/GPU_batch.h @@ -122,7 +122,11 @@ int GPU_batch_vertbuf_add_ex(GPUBatch *, GPUVertBuf *, bool own_vbo); void GPU_batch_program_set_no_use(GPUBatch *, uint32_t program, const GPUShaderInterface *); void GPU_batch_program_set(GPUBatch *, uint32_t program, const GPUShaderInterface *); -void GPU_batch_program_set_builtin(GPUBatch *batch, eGPUBuiltinShader shader_id); +void GPU_batch_program_set_shader(GPUBatch *, GPUShader *shader); +void GPU_batch_program_set_builtin( + GPUBatch *batch, eGPUBuiltinShader shader_id); +void GPU_batch_program_set_builtin_with_config( + GPUBatch *batch, eGPUBuiltinShader shader_id, eGPUShaderConfig shader_cfg); /* Entire batch draws with one shader program, but can be redrawn later with another program. */ /* Vertex shader's inputs must be compatible with the batch's vertex format. */ |