[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27373] trunk/blender/source/blender/ editors/interface/interface_ops.c: Fix [#21520] Using sample tool from color ramp sets alpha to 0

[Matt Ebb]

Revision: 27373
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27373
Author:   broken
Date:     2010-03-10 02:59:50 +0100 (Wed, 10 Mar 2010)

Log Message:
-----------
Fix [#21520] Using sample tool from color ramp sets alpha to 0

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_ops.c

Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c	2010-03-09 23:30:32 UTC (rev 27372)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c	2010-03-10 01:59:50 UTC (rev 27373)
@@ -94,15 +94,16 @@
 
 static void eyedropper_sample(bContext *C, Eyedropper *eye, short mx, short my)
 {
-	const int color_manage = CTX_data_scene(C)->r.color_mgt_flag & R_COLOR_MANAGEMENT;
-	float col[3];
+	if(RNA_property_type(eye->prop) == PROP_FLOAT) {
+		const int color_manage = CTX_data_scene(C)->r.color_mgt_flag & R_COLOR_MANAGEMENT;
+		float col[4];
+	
+		RNA_property_float_get_array(&eye->ptr, eye->prop, col);
 		
-	glReadBuffer(GL_FRONT);
-	glReadPixels(mx, my, 1, 1, GL_RGB, GL_FLOAT, col);
-	glReadBuffer(GL_BACK);
+		glReadBuffer(GL_FRONT);
+		glReadPixels(mx, my, 1, 1, GL_RGB, GL_FLOAT, col);
+		glReadBuffer(GL_BACK);
 	
-	if(RNA_property_type(eye->prop) == PROP_FLOAT) {
-		
 		if (RNA_property_array_length(&eye->ptr, eye->prop) < 3) return;
 
 		/* convert from screen (srgb) space to linear rgb space */