Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-02-27 04:02:02 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-27 04:26:49 +0300
commit1079742db92576d79ec89a28d95336aff847a82a (patch)
tree2e440e498c20d3205c2a64eedf4f84bf57abcb84 /source/blender/draw/modes/shaders/common_globals_lib.glsl
parent918941483f7ec5fc6320d345c755e953b963c710 (diff)
Cleanup: rename lamp -> light
Diffstat (limited to 'source/blender/draw/modes/shaders/common_globals_lib.glsl')
-rw-r--r--source/blender/draw/modes/shaders/common_globals_lib.glsl10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/draw/modes/shaders/common_globals_lib.glsl b/source/blender/draw/modes/shaders/common_globals_lib.glsl
index 1cb8a440469..88540b13941 100644
--- a/source/blender/draw/modes/shaders/common_globals_lib.glsl
+++ b/source/blender/draw/modes/shaders/common_globals_lib.glsl
@@ -10,7 +10,7 @@ layout(std140) uniform globalsBlock {
vec4 colorLibrarySelect;
vec4 colorLibrary;
vec4 colorTransform;
- vec4 colorLamp;
+ vec4 colorLight;
vec4 colorSpeaker;
vec4 colorCamera;
vec4 colorEmpty;
@@ -35,7 +35,7 @@ layout(std140) uniform globalsBlock {
vec4 colorFaceDot;
vec4 colorDeselect;
vec4 colorOutline;
- vec4 colorLampNoAlpha;
+ vec4 colorLightNoAlpha;
vec4 colorBackground;
vec4 colorEditMeshMiddle;
@@ -66,9 +66,9 @@ layout(std140) uniform globalsBlock {
vec4 colorGridAxisY;
vec4 colorGridAxisZ;
- float sizeLampCenter;
- float sizeLampCircle;
- float sizeLampCircleShadow;
+ float sizeLightCenter;
+ float sizeLightCircle;
+ float sizeLightCircleShadow;
float sizeVertex;
float sizeEdge;
float sizeEdgeFix;