[Bf-blender-cvs] [159f56f4abf] blender2.8: add missing matrix uniforms to material shader

Mike Erwin noreply at git.blender.org
Mon Mar 27 07:18:25 CEST 2017


Commit: 159f56f4abf30ed1f4b81645a325d051e880cb16
Author: Mike Erwin
Date:   Mon Mar 27 00:28:52 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB159f56f4abf30ed1f4b81645a325d051e880cb16

add missing matrix uniforms to material shader

My bad again! Failed to test this part of 4c08c5b192415190ab8b11637d8dc4f2a66c2ddf

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

M	source/blender/gpu/shaders/gpu_shader_material.glsl

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

diff --git a/source/blender/gpu/shaders/gpu_shader_material.glsl b/source/blender/gpu/shaders/gpu_shader_material.glsl
index 67f1b45701c..6fb70c98330 100644
--- a/source/blender/gpu/shaders/gpu_shader_material.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_material.glsl
@@ -1,3 +1,10 @@
+
+uniform mat4 ModelViewMatrix;
+uniform mat4 ProjectionMatrix;
+uniform mat4 ModelViewMatrixInverse;
+uniform mat4 ProjectionMatrixInverse;
+uniform mat3 NormalMatrix;
+
 /* Converters */
 
 float convert_rgba_to_float(vec4 color)




More information about the Bf-blender-cvs mailing list