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/draw/intern/shaders/common_hair_lib.glsl | |
| parent | f06d361da1249c93568153bae88bcdf43b4774a1 (diff) | |
| parent | 314b27850ccb6d103cf5c73855187cfc11ec48d8 (diff) | |
Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-remesh-voxel
Diffstat (limited to 'source/blender/draw/intern/shaders/common_hair_lib.glsl')
| -rw-r--r-- | source/blender/draw/intern/shaders/common_hair_lib.glsl | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/draw/intern/shaders/common_hair_lib.glsl b/source/blender/draw/intern/shaders/common_hair_lib.glsl index 6a8f1132e1b..ff52b483d77 100644 --- a/source/blender/draw/intern/shaders/common_hair_lib.glsl +++ b/source/blender/draw/intern/shaders/common_hair_lib.glsl @@ -211,6 +211,11 @@ void hair_get_pos_tan_binor_time(bool is_persp, wpos += wbinor * thick_time * scale; } + else { + /* Note: Ensures 'hairThickTime' is initialised - + * avoids undefined behaviour on certain macOS configurations. */ + thick_time = 0.0; + } } float hair_get_customdata_float(const samplerBuffer cd_buf) |