diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2016-11-02 12:48:06 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2016-11-02 12:59:52 +0300 |
| commit | a41bbd3053c8f07c24ccb07eaeff09cc078cc4d4 (patch) | |
| tree | aed76b27fa7b6fde5023b6d3ecd5f5079ed24aad /source/blender/gpu/GPU_shader.h | |
| parent | fb6f42dc4f0dc24a992a631b7aac3290449e815a (diff) | |
| parent | 13ee9b8ebe08ee95478f51537f10e9a1b1e4d863 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
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 aead5baaaf1..74dc91b55ef 100644 --- a/source/blender/gpu/GPU_shader.h +++ b/source/blender/gpu/GPU_shader.h @@ -89,6 +89,7 @@ typedef enum GPUBuiltinShader { GPU_SHADER_SEP_GAUSSIAN_BLUR = 1, GPU_SHADER_SMOKE = 2, GPU_SHADER_SMOKE_FIRE = 3, + GPU_SHADER_SMOKE_COBA = 4, /* specialized drawing */ GPU_SHADER_TEXT, |