diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2018-06-09 08:40:40 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2018-06-09 08:41:43 +0300 |
| commit | 4f2532e88cca35a3aaad753cbb27cb93d13dbb7a (patch) | |
| tree | a82667b940f5b3203f632c4e4cbd01722dc6a842 | |
| parent | 7d5297305af5f46f84cf270095f187ef34aebb5c (diff) | |
Use common_view_lib.glsl instead of including the ProjectionMatrix uniform directly in hair shaders.
| -rw-r--r-- | source/blender/draw/engines/eevee/eevee_materials.c | 1 | ||||
| -rw-r--r-- | source/blender/draw/engines/eevee/shaders/prepass_vert.glsl | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/draw/engines/eevee/eevee_materials.c b/source/blender/draw/engines/eevee/eevee_materials.c index b61be355087..a511cc3f994 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.c +++ b/source/blender/draw/engines/eevee/eevee_materials.c @@ -611,6 +611,7 @@ void EEVEE_materials_init(EEVEE_ViewLayerData *sldata, EEVEE_StorageList *stl, E "#define CLIP_PLANES\n"); char *hair_fiber_vert_str = BLI_string_joinN( + datatoc_common_view_lib_glsl, datatoc_common_hair_lib_glsl, datatoc_hair_lib_glsl, datatoc_prepass_vert_glsl); diff --git a/source/blender/draw/engines/eevee/shaders/prepass_vert.glsl b/source/blender/draw/engines/eevee/shaders/prepass_vert.glsl index 52192a4ce86..b1dfa851fa1 100644 --- a/source/blender/draw/engines/eevee/shaders/prepass_vert.glsl +++ b/source/blender/draw/engines/eevee/shaders/prepass_vert.glsl @@ -3,7 +3,6 @@ uniform mat4 ModelViewProjectionMatrix; uniform mat4 ModelMatrix; uniform mat4 ModelViewMatrix; uniform mat4 ModelViewMatrixInverse; -uniform mat4 ProjectionMatrix; /* keep in sync with DRWManager.view_data */ layout(std140) uniform clip_block { |