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:
Diffstat (limited to 'source/blender/draw/engines')
-rw-r--r--source/blender/draw/engines/overlay/shaders/edit_uv_verts_frag.glsl22
-rw-r--r--source/blender/draw/engines/overlay/shaders/edit_uv_verts_vert.glsl6
-rw-r--r--source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl8
3 files changed, 18 insertions, 18 deletions
diff --git a/source/blender/draw/engines/overlay/shaders/edit_uv_verts_frag.glsl b/source/blender/draw/engines/overlay/shaders/edit_uv_verts_frag.glsl
index 11694de38ca..1d936e4e072 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_uv_verts_frag.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_uv_verts_frag.glsl
@@ -9,17 +9,17 @@ void main()
{
float dist = length(gl_PointCoord - vec2(0.5));
- // transparent outside of point
- // --- 0 ---
- // smooth transition
- // --- 1 ---
- // pure outline color
- // --- 2 ---
- // smooth transition
- // --- 3 ---
- // pure fill color
- // ...
- // dist = 0 at center of point
+ /* transparent outside of point
+ * --- 0 ---
+ * smooth transition
+ * --- 1 ---
+ * pure outline color
+ * --- 2 ---
+ * smooth transition
+ * --- 3 ---
+ * pure fill color
+ * ...
+ * dist = 0 at center of point */
float midStroke = 0.5 * (radii[1] + radii[2]);
diff --git a/source/blender/draw/engines/overlay/shaders/edit_uv_verts_vert.glsl b/source/blender/draw/engines/overlay/shaders/edit_uv_verts_vert.glsl
index eb8f380072f..9e9df82a77d 100644
--- a/source/blender/draw/engines/overlay/shaders/edit_uv_verts_vert.glsl
+++ b/source/blender/draw/engines/overlay/shaders/edit_uv_verts_vert.glsl
@@ -30,15 +30,15 @@ void main()
gl_Position = vec4(point_world_to_ndc(world_pos).xy, depth, 1.0);
gl_PointSize = pointSize;
- // calculate concentric radii in pixels
+ /* calculate concentric radii in pixels */
float radius = 0.5 * pointSize;
- // start at the outside and progress toward the center
+ /* start at the outside and progress toward the center */
radii[0] = radius;
radii[1] = radius - 1.0;
radii[2] = radius - outlineWidth;
radii[3] = radius - outlineWidth - 1.0;
- // convert to PointCoord units
+ /* convert to PointCoord units */
radii /= pointSize;
}
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl
index 0d67ba2b9e4..102a8ddca7b 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_effect_dof_frag.glsl
@@ -342,23 +342,23 @@ void main()
# define mnmx3(a, b, c) \
mx3(a, b, c); \
- s2(a, b); // 3 exchanges
+ s2(a, b); /* 3 exchanges */
# define mnmx4(a, b, c, d) \
s2(a, b); \
s2(c, d); \
s2(a, c); \
- s2(b, d); // 4 exchanges
+ s2(b, d); /* 4 exchanges */
# define mnmx5(a, b, c, d, e) \
s2(a, b); \
s2(c, d); \
mn3(a, c, e); \
- mx3(b, d, e); // 6 exchanges
+ mx3(b, d, e); /* 6 exchanges */
# define mnmx6(a, b, c, d, e, f) \
s2(a, d); \
s2(b, e); \
s2(c, f); \
mn3(a, b, c); \
- mx3(d, e, f); // 7 exchanges
+ mx3(d, e, f); /* 7 exchanges */
vec v[9];