[Bf-blender-cvs] [8299296ed1c] greasepencil-object: Cleaunp previous commit
Antonio Vazquez
noreply at git.blender.org
Thu Feb 22 18:52:37 CET 2018
Commit: 8299296ed1cc829356faac235f1a19403a2d98b6
Author: Antonio Vazquez
Date: Thu Feb 22 18:52:29 2018 +0100
Branches: greasepencil-object
https://developer.blender.org/rB8299296ed1cc829356faac235f1a19403a2d98b6
Cleaunp previous commit
This avoid pass one matrix
===================================================================
M source/blender/draw/engines/gpencil/shaders/gpencil_pixel_frag.glsl
===================================================================
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_pixel_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_pixel_frag.glsl
index a109ea88613..0ccc31fe67c 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_pixel_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_pixel_frag.glsl
@@ -1,4 +1,3 @@
-uniform mat4 ModelViewProjectionMatrix;
uniform mat4 ProjectionMatrix;
uniform mat4 ViewMatrix;
@@ -23,7 +22,7 @@ vec2 nsize = max(size, 3.0);
void main()
{
vec2 uv = vec2(gl_FragCoord.xy);
- vec4 nloc = ModelViewProjectionMatrix * vec4(loc, 1.0);
+ vec4 nloc = ProjectionMatrix * ViewMatrix * vec4(loc.xyz, 1.0);
float dx = (ProjectionMatrix[3][3] == 0.0) ? (nsize[0] / (nloc.z * defaultpixsize)) : (nsize[0] / defaultpixsize);
float dy = (ProjectionMatrix[3][3] == 0.0) ? (nsize[1] / (nloc.z * defaultpixsize)) : (nsize[1] / defaultpixsize);
More information about the Bf-blender-cvs
mailing list