[Bf-blender-cvs] [486755460ab] master: Cleanup: DRW: Remove one useless matrix multiplication
Clément Foucault
noreply at git.blender.org
Fri Jun 14 19:17:19 CEST 2019
Commit: 486755460ab23f555036537f1ac79037d5e7ef08
Author: Clément Foucault
Date: Fri Jun 14 18:21:34 2019 +0200
Branches: master
https://developer.blender.org/rB486755460ab23f555036537f1ac79037d5e7ef08
Cleanup: DRW: Remove one useless matrix multiplication
===================================================================
M source/blender/draw/modes/shaders/overlay_face_wireframe_vert.glsl
===================================================================
diff --git a/source/blender/draw/modes/shaders/overlay_face_wireframe_vert.glsl b/source/blender/draw/modes/shaders/overlay_face_wireframe_vert.glsl
index 9022456abb2..722f62d9b6d 100644
--- a/source/blender/draw/modes/shaders/overlay_face_wireframe_vert.glsl
+++ b/source/blender/draw/modes/shaders/overlay_face_wireframe_vert.glsl
@@ -29,16 +29,14 @@ flat out float edgeSharpness;
void main()
{
- mat4 projmat = ProjectionMatrix;
-
- vec4 wpos = ModelMatrix * vec4(pos, 1.0);
- gl_Position = projmat * (ViewMatrix * wpos);
+ vec3 wpos = point_object_to_world(pos);
+ gl_Position = point_world_to_ndc(wpos);
vec3 wnor = normalize(normal_object_to_world(nor));
facing_g = dot(wnor, ViewMatrixInverse[2].xyz);
edgeSharpness_g = get_edge_sharpness(wd);
#ifdef USE_WORLD_CLIP_PLANES
- world_clip_planes_calc_clip_distance(wpos.xyz);
+ world_clip_planes_calc_clip_distance(wpos);
#endif
}
More information about the Bf-blender-cvs
mailing list