[Bf-blender-cvs] [f275168] blender2.8: fix simple 2D built-in shaders

Mike Erwin noreply at git.blender.org
Sun Aug 7 07:37:47 CEST 2016


Commit: f27516839faaba9c29d975492929b014cb98a019
Author: Mike Erwin
Date:   Sun Aug 7 01:26:29 2016 -0400
Branches: blender2.8
https://developer.blender.org/rBf27516839faaba9c29d975492929b014cb98a019

fix simple 2D built-in shaders

Forgot the projection matrix.

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

M	source/blender/gpu/shaders/gpu_shader_2D_smooth_color_vert.glsl
M	source/blender/gpu/shaders/gpu_shader_2D_uniform_color_vert.glsl

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

diff --git a/source/blender/gpu/shaders/gpu_shader_2D_smooth_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_smooth_color_vert.glsl
index e74485b..49bed5d 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_smooth_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_smooth_color_vert.glsl
@@ -13,6 +13,6 @@
 
 void main()
 {
-	gl_Position = gl_ModelViewMatrix * vec4(pos, 0.0, 1.0);
+	gl_Position = gl_ModelViewProjectionMatrix * vec4(pos, 0.0, 1.0);
 	finalColor = color;
 }
diff --git a/source/blender/gpu/shaders/gpu_shader_2D_uniform_color_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_uniform_color_vert.glsl
index 68d9941..7ad3005 100644
--- a/source/blender/gpu/shaders/gpu_shader_2D_uniform_color_vert.glsl
+++ b/source/blender/gpu/shaders/gpu_shader_2D_uniform_color_vert.glsl
@@ -7,5 +7,5 @@
 
 void main()
 {
-	gl_Position = gl_ModelViewMatrix * vec4(pos, 0.0, 1.0);
+	gl_Position = gl_ModelViewProjectionMatrix * vec4(pos, 0.0, 1.0);
 }




More information about the Bf-blender-cvs mailing list