[Bf-blender-cvs] [3c1e70dedfc] master: Cleanup: spelling

[Campbell Barton]

Commit: 3c1e70dedfc649180460ac869def657226c61653
Author: Campbell Barton
Date:   Sun Feb 14 11:19:06 2021 +1100
Branches: master
https://developer.blender.org/rB3c1e70dedfc649180460ac869def657226c61653

Cleanup: spelling

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

M	source/blender/draw/engines/overlay/shaders/grid_frag.glsl
M	source/blender/draw/intern/draw_common.c
M	source/blender/draw/intern/draw_common.h
M	source/blender/draw/intern/shaders/common_globals_lib.glsl

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

diff --git a/source/blender/draw/engines/overlay/shaders/grid_frag.glsl b/source/blender/draw/engines/overlay/shaders/grid_frag.glsl
index 9cf6898cf18..3220adbff36 100644
--- a/source/blender/draw/engines/overlay/shaders/grid_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/grid_frag.glsl
@@ -187,8 +187,8 @@ void main()
 
     FragColor = colorGrid;
     FragColor.a *= gridA * blend;
-    FragColor = mix(FragColor, mix(colorGrid, colorGridEmphasise, blend), gridB);
-    FragColor = mix(FragColor, colorGridEmphasise, gridC);
+    FragColor = mix(FragColor, mix(colorGrid, colorGridEmphasis, blend), gridB);
+    FragColor = mix(FragColor, colorGridEmphasis, gridC);
   }
   else {
     FragColor = vec4(colorGrid.rgb, 0.0);
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index fef8ba4b606..132b5274517 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -168,7 +168,7 @@ void DRW_globals_update(void)
        gb->colorBackground[0] + gb->colorBackground[1] + gb->colorBackground[2]) ?
           20 :
           -10,
-      gb->colorGridEmphasise);
+      gb->colorGridEmphasis);
   /* Grid Axis */
   UI_GetThemeColorBlendShade4fv(TH_GRID, TH_AXIS_X, 0.5f, -10, gb->colorGridAxisX);
   UI_GetThemeColorBlendShade4fv(TH_GRID, TH_AXIS_Y, 0.5f, -10, gb->colorGridAxisY);
diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h
index a059ac32311..6e3a73a8314 100644
--- a/source/blender/draw/intern/draw_common.h
+++ b/source/blender/draw/intern/draw_common.h
@@ -131,7 +131,7 @@ typedef struct GlobalsUboStorage {
   float colorCurrentFrame[4];
 
   float colorGrid[4];
-  float colorGridEmphasise[4];
+  float colorGridEmphasis[4];
   float colorGridAxisX[4];
   float colorGridAxisY[4];
   float colorGridAxisZ[4];
diff --git a/source/blender/draw/intern/shaders/common_globals_lib.glsl b/source/blender/draw/intern/shaders/common_globals_lib.glsl
index 91fb822edac..3c76c8a5b28 100644
--- a/source/blender/draw/intern/shaders/common_globals_lib.glsl
+++ b/source/blender/draw/intern/shaders/common_globals_lib.glsl
@@ -95,7 +95,7 @@ layout(std140) uniform globalsBlock
   vec4 colorCurrentFrame;
 
   vec4 colorGrid;
-  vec4 colorGridEmphasise;
+  vec4 colorGridEmphasis;
   vec4 colorGridAxisX;
   vec4 colorGridAxisY;
   vec4 colorGridAxisZ;