griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

#4361

Browse Source 
Eyedropper (in ColorPicker) bug: It was reading a 4xfloat color into a
single float. tsk tsk!
This commit is contained in:
Ton Roosendaal
2006-06-20 11:15:00 +00:00
parent 5124edfcc5
commit 9410c7a731
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/src/interface.c
View File

@@ -3077,8 +3077,7 @@ static void do_palette_sample_cb(void *bt1, void *col1) /* frontbuf */
{
uiBut *but1= (uiBut *)bt1;
uiBut *but;
float *col= (float *)col1;
float tempcol;
float tempcol[4];
int x=0, y=0;
short mval[2];
float hsv[3];
@@ -3121,15 +3120,13 @@ static void do_palette_sample_cb(void *bt1, void *col1) /* frontbuf */
/* if we've got a glick, use OpenGL to sample the colour under the mouse pointer */
glReadBuffer(GL_FRONT);
glReadPixels(x, y, 1, 1, GL_RGBA, GL_FLOAT, &tempcol);
glReadPixels(x, y, 1, 1, GL_RGBA, GL_FLOAT, tempcol);
glReadBuffer(GL_BACK);
col = (float *)&tempcol;
/* and send that colour back to the picker */
rgb_to_hsv(col[0], col[1], col[2], hsv, hsv+1, hsv+2);
rgb_to_hsv(tempcol[0], tempcol[1], tempcol[2], hsv, hsv+1, hsv+2);
update_picker_buts_hsv(but1->block, hsv, but1->poin);
update_picker_hex(but1->block, col);
update_picker_hex(but1->block, tempcol);
for (but= but1->block->buttons.first; but; but= but->next) {
ui_check_but(but);