diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-02 17:05:23 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-05-02 17:05:23 +0300 |
| commit | 43e6bb85cee0802887eae9489a2bd73836daf41d (patch) | |
| tree | eaa106429af8341bf2123d7445fdab0af71b3dda /source/blender/draw/modes/shaders/common_hair_lib.glsl | |
| parent | 7daeb1f9aee284d958abe87622b43c70c21af967 (diff) | |
| parent | ffaf91b5fc03f91e1fc90bd2f1d5dc5aa75656ff (diff) | |
Merge 'master' into 'collada'
Diffstat (limited to 'source/blender/draw/modes/shaders/common_hair_lib.glsl')
| -rw-r--r-- | source/blender/draw/modes/shaders/common_hair_lib.glsl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/draw/modes/shaders/common_hair_lib.glsl b/source/blender/draw/modes/shaders/common_hair_lib.glsl index 02254908232..1c0a31c59fd 100644 --- a/source/blender/draw/modes/shaders/common_hair_lib.glsl +++ b/source/blender/draw/modes/shaders/common_hair_lib.glsl @@ -38,8 +38,8 @@ uniform usamplerBuffer hairStrandBuffer; /* R32UI */ uniform usamplerBuffer hairStrandSegBuffer; /* R16UI */ /* Not used, use one buffer per uv layer */ -//uniform samplerBuffer hairUVBuffer; /* RG32F */ -//uniform samplerBuffer hairColBuffer; /* RGBA16 linear color */ +// uniform samplerBuffer hairUVBuffer; /* RG32F */ +// uniform samplerBuffer hairColBuffer; /* RGBA16 linear color */ /* -- Subdivision stage -- */ /** |