[Bf-blender-cvs] [b24ba9b1740] blender2.8: Object Mode Engine: Small cleanup

Clément Foucault noreply at git.blender.org
Wed Sep 27 21:21:54 CEST 2017


Commit: b24ba9b1740b4fd8ae400c68aeac2ddf6831198d
Author: Clément Foucault
Date:   Wed Sep 27 16:51:05 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBb24ba9b1740b4fd8ae400c68aeac2ddf6831198d

Object Mode Engine: Small cleanup

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

M	source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_frag.glsl
M	source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_vert.glsl
M	source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl

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

diff --git a/source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_frag.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_frag.glsl
index 6dcbc097468..07b36079884 100644
--- a/source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_frag.glsl
+++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_frag.glsl
@@ -1,7 +1,7 @@
 
 flat in int isSelected;
 #ifdef VERTEX_FACING
-in float facing;
+flat in float facing;
 #endif
 
 out vec4 FragColor;
diff --git a/source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_vert.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_vert.glsl
index b27a4bba4ca..fa3934c4b77 100644
--- a/source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_vert.glsl
+++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_facedot_vert.glsl
@@ -10,10 +10,8 @@ flat out int isSelected;
 uniform mat4 ProjectionMatrix;
 uniform mat4 ModelViewMatrix;
 uniform mat3 NormalMatrix;
-uniform vec3 eye;
 
-in vec3 vnor;
-out float facing;
+flat out float facing;
 #endif
 
 void main()
diff --git a/source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl b/source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl
index 6da9b0a0e86..8ebfa4376f0 100644
--- a/source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl
+++ b/source/blender/draw/modes/shaders/edit_mesh_overlay_vert.glsl
@@ -18,7 +18,6 @@ out ivec4 vData;
 #ifdef VERTEX_FACING
 uniform mat4 ProjectionMatrix;
 uniform mat3 NormalMatrix;
-uniform vec3 eye;
 
 in vec3 vnor;
 out float vFacing;



More information about the Bf-blender-cvs mailing list