Commit: 0503f31c6630d7c499dec2e9408348389e1b70ad
Author: Campbell Barton
Date: Fri May 4 19:22:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB0503f31c6630d7c499dec2e9408348389e1b70ad
Cleanup: trailing space
===================================================================
M source/blender/draw/engines/workbench/shaders/workbench_shadow_geom.glsl
M source/blender/draw/engines/workbench/workbench_studiolight.c
===================================================================
diff --git
a/source/blender/draw/engines/workbench/shaders/workbench_shadow_geom.glsl
b/source/blender/draw/engines/workbench/shaders/workbench_shadow_geom.glsl
index a1abfb3fe1c..854cbee571d 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_shadow_geom.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_shadow_geom.glsl
@@ -22,10 +22,10 @@ void main()
vec4 v2 = gl_in[1].gl_Position;
vec4 v3 = gl_in[2].gl_Position;
bool backface = dot(face_normal(v1.xyz, v2.xyz, v3.xyz),
light_direction.xyz) > 0.0;
-
+
int index0 = backface?0:2;
int index2 = backface?2:0;
-
+
/* back cap */
gl_Position = vertexData[index0].backPosition;
EmitVertex();
diff --git a/source/blender/draw/engines/workbench/workbench_studiolight.c
b/source/blender/draw/engines/workbench/workbench_studiolight.c
index f93a7341212..bb75d12f10f 100644
--- a/source/blender/draw/engines/workbench/workbench_studiolight.c
+++ b/source/blender/draw/engines/workbench/workbench_studiolight.c
@@ -37,7 +37,7 @@
const float studiolights[][6][3] = {
{
- {1.0, 0.8, 0.6},
+ {1.0, 0.8, 0.6},
{1.0, 0.6, 0.6},
{0.9, 0.9, 1.0},
{0.05, 0.025, 0.025},
@@ -45,36 +45,36 @@ const float studiolights[][6][3] = {
{1.0, 0.95, 0.8},
},
{
- {0.0, 0.0, 0.0},
- {0.0, 0.0, 0.0},
- {0.0, 0.0, 0.0},
- {0.0, 0.0, 0.0},
- {0.8, 0.8, 1.0},
- {0.0, 0.0, 0.0},
+ {0.0, 0.0, 0.0},
+ {0.0, 0.0, 0.0},
+ {0.0, 0.0, 0.0},
+ {0.0, 0.0, 0.0},
+ {0.8, 0.8, 1.0},
+ {0.0, 0.0, 0.0},
},
{
- {0.4, 0.3, 0.8},
- {0.4, 0.3, 0.8},
- {0.8, 0.8, 0.2},
- {0.0, 0.0, 0.0},
- {0.4, 0.4, 0.8},
- {0.0, 0.0, 0.0},
+ {0.4, 0.3, 0.8},
+ {0.4, 0.3, 0.8},
+ {0.8, 0.8, 0.2},
+ {0.0, 0.0, 0.0},
+ {0.4, 0.4, 0.8},
+ {0.0, 0.0, 0.0},
},
{
- {0.2, 0.2, 0.0},
- {0.8, 0.2, 0.0},
- {0.8, 0.2, 0.0},
- {0.2, 0.2, 0.0},
- {0.8, 0.6, 0.4},
- {0.0, 0.0, 0.0},
+ {0.2, 0.2, 0.0},
+ {0.8, 0.2, 0.0},
+ {0.8, 0.2, 0.0},
+ {0.2, 0.2, 0.0},
+ {0.8, 0.6, 0.4},
+ {0.0, 0.0, 0.0},
},
{
- {0.8, 0.2, 0.0},
- {0.8, 0.2, 0.0},
- {0.8, 0.6, 0.0},
- {0.2, 0.2, 0.0},
- {1.0, 0.5, 0.0},
- {0.0, 0.0, 0.0},
+ {0.8, 0.2, 0.0},
+ {0.8, 0.2, 0.0},
+ {0.8, 0.6, 0.0},
+ {0.2, 0.2, 0.0},
+ {1.0, 0.5, 0.0},
+ {0.0, 0.0, 0.0},
},
};
@@ -91,7 +91,7 @@ unsigned int *WORKBENCH_generate_studiolight_preview(int
studiolight_id, int ico
unsigned int* rect = MEM_mallocN(icon_size * icon_size *
sizeof(unsigned int), __func__);
int icon_center = icon_size / 2;
float sphere_radius = icon_center * 0.9;
-
+
int offset = 0;
for (int y = 0 ; y < icon_size ; y ++) {
float dy = y - icon_center;
@@ -135,4 +135,4 @@ unsigned int *WORKBENCH_generate_studiolight_preview(int
studiolight_id, int ico
}
}
return rect;
-}
\ No newline at end of file
+}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
