[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35956] trunk/blender/source/blender/ blenkernel/intern/texture.c: fix [#26732] Colorband bug with compositing.

Campbell Barton ideasman42 at gmail.com
Sat Apr 2 09:04:34 CEST 2011


Revision: 35956
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35956
Author:   campbellbarton
Date:     2011-04-02 07:04:34 +0000 (Sat, 02 Apr 2011)
Log Message:
-----------
fix [#26732] Colorband bug with compositing.
reported on IRC but submitted to the tracker for example file reference.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/texture.c

Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c	2011-04-02 05:53:42 UTC (rev 35955)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c	2011-04-02 07:04:34 UTC (rev 35956)
@@ -342,8 +342,11 @@
 		
 				if(cbd2->pos!=cbd1->pos)
 					fac= (in-cbd1->pos)/(cbd2->pos-cbd1->pos);
-				else
-					fac= 0.0f;
+				else {
+					/* was setting to 0.0 in 2.56 & previous, but this
+					 * is incorrect for the last element, see [#26732] */
+					fac= (a != coba->tot) ? 0.0f : 1.0f;
+				}
 				
 				if (coba->ipotype==4) {
 					/* constant */




More information about the Bf-blender-cvs mailing list