[Bf-blender-cvs] [eec3fc1273e] blender2.8: Armature: Set outline width to 2.0.
Clément Foucault
noreply at git.blender.org
Sat May 5 21:13:55 CEST 2018
Commit: eec3fc1273e6c02ab5749a054261287fb0da0f89
Author: Clément Foucault
Date: Sat May 5 20:22:05 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBeec3fc1273e6c02ab5749a054261287fb0da0f89
Armature: Set outline width to 2.0.
Correspond roughly to 1px width.
===================================================================
M source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl
M source/blender/draw/modes/shaders/armature_shape_outline_geom.glsl
M source/blender/draw/modes/shaders/armature_sphere_outline_vert.glsl
===================================================================
diff --git a/source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl b/source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl
index c7958148588..e534e8cef1d 100644
--- a/source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl
+++ b/source/blender/draw/modes/shaders/armature_envelope_outline_vert.glsl
@@ -5,7 +5,7 @@ uniform mat4 ViewProjectionMatrix;
uniform mat4 ProjectionMatrix;
uniform vec2 viewportSize;
-uniform float lineThickness = 3.0;
+uniform float lineThickness = 2.0;
/* ---- Instanciated Attribs ---- */
in vec2 pos0;
diff --git a/source/blender/draw/modes/shaders/armature_shape_outline_geom.glsl b/source/blender/draw/modes/shaders/armature_shape_outline_geom.glsl
index 3d3cb692634..07eea8a1f34 100644
--- a/source/blender/draw/modes/shaders/armature_shape_outline_geom.glsl
+++ b/source/blender/draw/modes/shaders/armature_shape_outline_geom.glsl
@@ -13,7 +13,7 @@ in vec4 vCol[];
flat out vec4 finalColor;
uniform mat4 ProjectionMatrix;
uniform vec2 viewportSize;
-uniform float lineThickness = 3.0;
+uniform float lineThickness = 2.0;
vec2 compute_dir(vec2 v0, vec2 v1)
{
diff --git a/source/blender/draw/modes/shaders/armature_sphere_outline_vert.glsl b/source/blender/draw/modes/shaders/armature_sphere_outline_vert.glsl
index 8fe20decdca..b5601e56210 100644
--- a/source/blender/draw/modes/shaders/armature_sphere_outline_vert.glsl
+++ b/source/blender/draw/modes/shaders/armature_sphere_outline_vert.glsl
@@ -2,7 +2,7 @@
uniform mat4 ViewMatrix;
uniform mat4 ProjectionMatrix;
uniform vec2 viewportSize;
-uniform float lineThickness = 3.0;
+uniform float lineThickness = 2.0;
/* ---- Instanciated Attribs ---- */
in vec2 pos0;
More information about the Bf-blender-cvs
mailing list