[Bf-blender-cvs] [4b31f1e5911] blender2.8: Edit Mesh overlay: remove sizeNormal from ubo.

[Clément Foucault]

Commit: 4b31f1e5911e32cab3c2971572fae604d2e86808
Author: Clément Foucault
Date:   Thu Mar 9 01:29:04 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB4b31f1e5911e32cab3c2971572fae604d2e86808

Edit Mesh overlay: remove sizeNormal from ubo.

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

M	source/blender/draw/intern/draw_common.c
M	source/blender/draw/intern/draw_common.h
M	source/blender/draw/modes/shaders/edit_overlay_facedot_frag.glsl
M	source/blender/draw/modes/shaders/edit_overlay_facedot_vert.glsl
M	source/blender/draw/modes/shaders/edit_overlay_facefill_vert.glsl
M	source/blender/draw/modes/shaders/edit_overlay_frag.glsl
M	source/blender/draw/modes/shaders/edit_overlay_geom_edge.glsl
M	source/blender/draw/modes/shaders/edit_overlay_geom_tri.glsl
M	source/blender/draw/modes/shaders/edit_overlay_loosevert_vert.glsl

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

diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index b9c73e8c352..6a8848a06b0 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -79,7 +79,6 @@ void DRW_globals_update(void)
 	ts.sizeFaceDot = UI_GetThemeValuef(TH_FACEDOT_SIZE) * M_SQRT2;
 	ts.sizeEdge = 1.0f / 2.0f; /* TODO Theme */
 	ts.sizeEdgeFix = 0.5f + 2.0f * (2.0f * (MAX2(ts.sizeVertex, ts.sizeEdge)) * M_SQRT1_2);
-	ts.sizeNormal = 1.0f; /* TODO compute */
 
 	/* TODO Waiting for notifiers to invalidate cache */
 	if (globals_ubo) {
diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h
index 400a7e73998..ad155224cdb 100644
--- a/source/blender/draw/intern/draw_common.h
+++ b/source/blender/draw/intern/draw_common.h
@@ -69,7 +69,7 @@ typedef struct GlobalsUboStorage {
 
 	/* Pack individual float at the end of the buffer to avoid alignement errors */
 	float sizeLampCenter, sizeLampCircle, sizeLampCircleShadow;
-	float sizeVertex, sizeEdge, sizeEdgeFix, sizeNormal, sizeFaceDot;
+	float sizeVertex, sizeEdge, sizeEdgeFix, sizeFaceDot;
 } GlobalsUboStorage;
 /* Keep in sync with globalsBlock in shaders */
 
diff --git a/source/blender/draw/modes/shaders/edit_overlay_facedot_frag.glsl b/source/blender/draw/modes/shaders/edit_overlay_facedot_frag.glsl
index 0bcc8aafc1f..316f532ab1e 100644
--- a/source/blender/draw/modes/shaders/edit_overlay_facedot_frag.glsl
+++ b/source/blender/draw/modes/shaders/edit_overlay_facedot_frag.glsl
@@ -38,7 +38,6 @@ layout(std140) uniform globalsBlock {
 	float sizeVertex;
 	float sizeEdge;
 	float sizeEdgeFix;
-	float sizeNormal;
 	float sizeFaceDot;
 };
 
diff --git a/source/blender/draw/modes/shaders/edit_overlay_facedot_vert.glsl b/source/blender/draw/modes/shaders/edit_overlay_facedot_vert.glsl
index b075d39c29e..76c6cadc988 100644
--- a/source/blender/draw/modes/shaders/edit_overlay_facedot_vert.glsl
+++ b/source/blender/draw/modes/shaders/edit_overlay_facedot_vert.glsl
@@ -38,7 +38,6 @@ layout(std140) uniform globalsBlock {
 	float sizeVertex;
 	float sizeEdge;
 	float sizeEdgeFix;
-	float sizeNormal;
 	float sizeFaceDot;
 };
 
diff --git a/source/blender/draw/modes/shaders/edit_overlay_facefill_vert.glsl b/source/blender/draw/modes/shaders/edit_overlay_facefill_vert.glsl
index be4cd4568cd..7c51f4108d9 100644
--- a/source/blender/draw/modes/shaders/edit_overlay_facefill_vert.glsl
+++ b/source/blender/draw/modes/shaders/edit_overlay_facefill_vert.glsl
@@ -40,7 +40,6 @@ layout(std140) uniform globalsBlock {
 	float sizeVertex;
 	float sizeEdge;
 	float sizeEdgeFix;
-	float sizeNormal;
 	float sizeFaceDot;
 };
 
diff --git a/source/blender/draw/modes/shaders/edit_overlay_frag.glsl b/source/blender/draw/modes/shaders/edit_overlay_frag.glsl
index 43b3e412b9d..a08be7ec502 100644
--- a/source/blender/draw/modes/shaders/edit_overlay_frag.glsl
+++ b/source/blender/draw/modes/shaders/edit_overlay_frag.glsl
@@ -44,7 +44,6 @@ layout(std140) uniform globalsBlock {
 	float sizeVertex;
 	float sizeEdge;
 	float sizeEdgeFix;
-	float sizeNormal;
 	float sizeFaceDot;
 };
 
diff --git a/source/blender/draw/modes/shaders/edit_overlay_geom_edge.glsl b/source/blender/draw/modes/shaders/edit_overlay_geom_edge.glsl
index f376969d083..44971a5dd2d 100644
--- a/source/blender/draw/modes/shaders/edit_overlay_geom_edge.glsl
+++ b/source/blender/draw/modes/shaders/edit_overlay_geom_edge.glsl
@@ -44,7 +44,6 @@ layout(std140) uniform globalsBlock {
 	float sizeVertex;
 	float sizeEdge;
 	float sizeEdgeFix;
-	float sizeNormal;
 	float sizeFaceDot;
 };
 
diff --git a/source/blender/draw/modes/shaders/edit_overlay_geom_tri.glsl b/source/blender/draw/modes/shaders/edit_overlay_geom_tri.glsl
index 7d9deeec397..5310d12f3b5 100644
--- a/source/blender/draw/modes/shaders/edit_overlay_geom_tri.glsl
+++ b/source/blender/draw/modes/shaders/edit_overlay_geom_tri.glsl
@@ -44,7 +44,6 @@ layout(std140) uniform globalsBlock {
 	float sizeVertex;
 	float sizeEdge;
 	float sizeEdgeFix;
-	float sizeNormal;
 	float sizeFaceDot;
 };
 
diff --git a/source/blender/draw/modes/shaders/edit_overlay_loosevert_vert.glsl b/source/blender/draw/modes/shaders/edit_overlay_loosevert_vert.glsl
index a046676b6e3..5ffaf02297d 100644
--- a/source/blender/draw/modes/shaders/edit_overlay_loosevert_vert.glsl
+++ b/source/blender/draw/modes/shaders/edit_overlay_loosevert_vert.glsl
@@ -44,7 +44,6 @@ layout(std140) uniform globalsBlock {
 	float sizeVertex;
 	float sizeEdge;
 	float sizeEdgeFix;
-	float sizeNormal;
 	float sizeFaceDot;
 };