[Bf-blender-cvs] [2469a6871ec] hair_guides_grooming: Taper thickness value was applied invertedly, giving zero width at thickness 1.0.

[Lukas Tönne]

Commit: 2469a6871eca3add5855a247fa0863cee2106e3a
Author: Lukas Tönne
Date:   Thu Jun 28 06:22:43 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rB2469a6871eca3add5855a247fa0863cee2106e3a

Taper thickness value was applied invertedly, giving zero width at thickness 1.0.

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

M	source/blender/draw/modes/shaders/common_hair_guides_lib.glsl

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

diff --git a/source/blender/draw/modes/shaders/common_hair_guides_lib.glsl b/source/blender/draw/modes/shaders/common_hair_guides_lib.glsl
index b044420e037..83ac4bcceb2 100644
--- a/source/blender/draw/modes/shaders/common_hair_guides_lib.glsl
+++ b/source/blender/draw/modes/shaders/common_hair_guides_lib.glsl
@@ -76,8 +76,8 @@ void calc_taper_factor(DeformParams params, float t, out DualFloat taper)
 void deform_clump(DualFloat taper, DualVec3 target, float thickness, inout vec3 co, inout vec3 tang)
 {
 	DualFloat factor;
-	factor.v = taper.v * thickness;
-	factor.dv = taper.dv * thickness;
+	factor.v = taper.v * (1.0 - thickness);
+	factor.dv = taper.dv * (1.0 - thickness);
 
 	vec3 nco;
 	vec3 ntang;