[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47839] trunk/blender/source/blender/ render/intern/source: Fix #31754: strand width fade value 2. 0 gives wrong result, should fade out

[Brecht Van Lommel]

Revision: 47839
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47839
Author:   blendix
Date:     2012-06-13 15:33:59 +0000 (Wed, 13 Jun 2012)
Log Message:
-----------
Fix #31754: strand width fade value 2.0 gives wrong result, should fade out
strand entirely. Fix based on patch by Philipp Oeser.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/convertblender.c
    trunk/blender/source/blender/render/intern/source/strand.c

Modified: trunk/blender/source/blender/render/intern/source/convertblender.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/convertblender.c	2012-06-13 15:13:19 UTC (rev 47838)
+++ trunk/blender/source/blender/render/intern/source/convertblender.c	2012-06-13 15:33:59 UTC (rev 47839)
@@ -1729,7 +1729,7 @@
 			strandbuf->minwidth= ma->strand_min;
 
 			if (ma->strand_widthfade == 0.0f)
-				strandbuf->widthfade= 0.0f;
+				strandbuf->widthfade= -1.0f;
 			else if (ma->strand_widthfade >= 1.0f)
 				strandbuf->widthfade= 2.0f - ma->strand_widthfade;
 			else

Modified: trunk/blender/source/blender/render/intern/source/strand.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/strand.c	2012-06-13 15:13:19 UTC (rev 47838)
+++ trunk/blender/source/blender/render/intern/source/strand.c	2012-06-13 15:33:59 UTC (rev 47839)
@@ -400,7 +400,7 @@
 	interpolate_shade_result(&shr1, &shr2, t, ssamp->shr, addpassflag);
 
 	/* apply alpha along width */
-	if (sseg->buffer->widthfade != 0.0f) {
+	if (sseg->buffer->widthfade != -1.0f) {
 		s = 1.0f - powf(fabsf(s), sseg->buffer->widthfade);
 
 		strand_apply_shaderesult_alpha(ssamp->shr, s);