diff options
| author | Mike Erwin <significant.bit@gmail.com> | 2016-11-08 18:51:42 +0300 |
|---|---|---|
| committer | Mike Erwin <significant.bit@gmail.com> | 2016-11-08 18:55:23 +0300 |
| commit | f90b480f957f17ad86ab76a90bb46d74f27ab521 (patch) | |
| tree | 74bf312eb58e05da25970f415fd360fb71dded8e /source/blender/gpu/GPU_shader.h | |
| parent | 4e80bd2d6d2f54db3b65d9f65341ac9c99ee8751 (diff) | |
OpenGL: wm_operators.c uses new immediate mode
D2311 by @ianwill
This is the radial control that appears when we change the size of a brush in sculpt and vertex and texture painting modes, by pressing "f".
Also includes a new built-in shader that can be useful in other places.
Part of T49043
Diffstat (limited to 'source/blender/gpu/GPU_shader.h')
| -rw-r--r-- | source/blender/gpu/GPU_shader.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h index 4084e3d4180..cf7e00d682c 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -107,6 +107,7 @@ typedef enum GPUBuiltinShader { GPU_SHADER_3D_SMOOTH_COLOR, GPU_SHADER_3D_DEPTH_ONLY, /* basic image drawing */ + GPU_SHADER_2D_IMAGE_MASK_UNIFORM_COLOR, GPU_SHADER_3D_IMAGE_MODULATE_ALPHA, GPU_SHADER_3D_IMAGE_RECT_MODULATE_ALPHA, GPU_SHADER_3D_IMAGE_DEPTH, |