[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47277] branches/soc-2011-tomato/source/ blender/blenkernel/intern/mask.c: convert mask to linear color.

[Campbell Barton]

Revision: 47277
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47277
Author:   campbellbarton
Date:     2012-05-31 13:37:32 +0000 (Thu, 31 May 2012)
Log Message:
-----------
convert mask to linear 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:05:00 UTC (rev 47276)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/mask.c	2012-05-31 13:37:32 UTC (rev 47277)
@@ -1750,7 +1750,7 @@
 	}
 }
 
-static void clamp_vn_vn(float *array, const int size)
+static void linear_clamp_vn_vn(float *array, const int size)
 {
 	float *arr = array + (size - 1);
 
@@ -1758,6 +1758,7 @@
 	while (i--) {
 		if      (*arr < 0.0f) *arr = 0.0f;
 		else if (*arr > 1.0f) *arr = 1.0f;
+		else                  *arr = srgb_to_linearrgb(*arr);
 		arr--;
 	}
 }
@@ -1877,7 +1878,7 @@
 		}
 
 		/* clamp at the end */
-		clamp_vn_vn(buffer, buffer_size);
+		linear_clamp_vn_vn(buffer, buffer_size);
 	}
 
 	MEM_freeN(buffer_tmp);