[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51033] trunk/blender/source/blender/ editors/interface/interface_widgets.c: fix for using hsv uninitialized in ui_draw_but_HSVCIRCLE()

[Campbell Barton]

Revision: 51033
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51033
Author:   campbellbarton
Date:     2012-10-04 09:55:10 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
fix for using hsv uninitialized in ui_draw_but_HSVCIRCLE()

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

Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c	2012-10-04 09:43:27 UTC (rev 51032)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c	2012-10-04 09:55:10 UTC (rev 51033)
@@ -1913,6 +1913,7 @@
 	float radius = (float)mini(BLI_rcti_size_x(rect), BLI_rcti_size_y(rect)) / 2.0f;
 
 	/* gouraud triangle fan */
+	const float *hsv_ptr = ui_block_hsv_get(but->block);
 	float ang = 0.0f;
 	float cursor_radius;
 	float rgb[3], hsvo[3], hsv[3], col[3], colcent[3];
@@ -1924,8 +1925,12 @@
 	
 	/* color */
 	ui_get_but_vectorf(but, rgb);
-	/* copy_v3_v3(hsv, ui_block_hsv_get(but->block)); */ /* UNUSED */
 
+	/* since we use compat functions on both 'hsv' and 'hsvo', they need to be initialized */
+	hsvo[0] = hsv[0] = hsv_ptr[0];
+	hsvo[1] = hsv[1] = hsv_ptr[1];
+	hsvo[2] = hsv[2] = hsv_ptr[2];
+
 	rgb_to_hsv_compat_v(rgb, hsvo);
 
 	if (color_profile)