diff options
| author | Fabian Schempp <fabianschempp@googlemail.com> | 2022-04-18 23:28:08 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2022-04-18 23:28:08 +0300 |
| commit | 01616f9ed2da14b5cad40efac03d1a22dbb759f3 (patch) | |
| tree | 4955ad12f260e557aa1c0f724a320e565f8bce5c /source/blender/gpu/shaders/material/gpu_shader_material_mix_rgb.glsl | |
| parent | f06d361da1249c93568153bae88bcdf43b4774a1 (diff) | |
| parent | 314b27850ccb6d103cf5c73855187cfc11ec48d8 (diff) | |
Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-voxel
Diffstat (limited to 'source/blender/gpu/shaders/material/gpu_shader_material_mix_rgb.glsl')
| -rw-r--r-- | source/blender/gpu/shaders/material/gpu_shader_material_mix_rgb.glsl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/gpu/shaders/material/gpu_shader_material_mix_rgb.glsl b/source/blender/gpu/shaders/material/gpu_shader_material_mix_rgb.glsl index e089aec1d92..157a6a27c15 100644 --- a/source/blender/gpu/shaders/material/gpu_shader_material_mix_rgb.glsl +++ b/source/blender/gpu/shaders/material/gpu_shader_material_mix_rgb.glsl @@ -1,3 +1,5 @@ +#pragma BLENDER_REQUIRE(gpu_shader_material_color_util.glsl) + void mix_blend(float fac, vec4 col1, vec4 col2, out vec4 outcol) { fac = clamp(fac, 0.0, 1.0); |