[Bf-blender-cvs] [4f2532e88cc] hair_guides: Use common_view_lib.glsl instead of including the ProjectionMatrix uniform directly in hair shaders.

[Lukas Tönne]

Commit: 4f2532e88cca35a3aaad753cbb27cb93d13dbb7a
Author: Lukas Tönne
Date:   Sat Jun 9 06:40:40 2018 +0100
Branches: hair_guides
https://developer.blender.org/rB4f2532e88cca35a3aaad753cbb27cb93d13dbb7a

Use common_view_lib.glsl instead of including the ProjectionMatrix uniform 
directly in hair shaders.

===================================================================

M       source/blender/draw/engines/eevee/eevee_materials.c
M       source/blender/draw/engines/eevee/shaders/prepass_vert.glsl

===================================================================

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 {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs