[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47278] branches/soc-2011-tomato/source/ blender/blenkernel/intern/mask.c: save calling srgb_to_linearrgb() for 0 or 1 when converting mask color.

Campbell Barton ideasman42 at gmail.com
Thu May 31 15:43:22 CEST 2012


Revision: 47278
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47278
Author:   campbellbarton
Date:     2012-05-31 13:43:21 +0000 (Thu, 31 May 2012)
Log Message:
-----------
save calling srgb_to_linearrgb() for 0 or 1 when converting mask color.

Modified Paths:
--------------
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c

Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2012-05-31 13:37:32 UTC (rev 47277)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2012-05-31 13:43:21 UTC (rev 47278)
@@ -1756,9 +1756,9 @@
 
 	int i = size;
 	while (i--) {
-		if      (*arr < 0.0f) *arr = 0.0f;
-		else if (*arr > 1.0f) *arr = 1.0f;
-		else                  *arr = srgb_to_linearrgb(*arr);
+		if      (*arr <= 0.0f) *arr = 0.0f;
+		else if (*arr >= 1.0f) *arr = 1.0f;
+		else                   *arr = srgb_to_linearrgb(*arr);
 		arr--;
 	}
 }




More information about the Bf-blender-cvs mailing list