diff options
| author | Matt Ebb <matt@mke3.net> | 2010-03-30 16:43:39 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-03-30 16:43:39 +0400 |
| commit | 1902de715f15454a5abf6c7972f156d5c6288f9d (patch) | |
| tree | e2b985373a45967d63171f179320141bdfb7402d /source | |
| parent | 515592438f0f5665cadbd12c7698554bd2b89146 (diff) | |
Attempted fixes for color picker trouble (can't reproduce here..)
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 63a3cf78eda..b9cb83b4ebb 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -2902,8 +2902,7 @@ static int ui_numedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data, int mx, float range; /* vertical 'value' strip */ - hsv[2]= y; - + /* exception only for value strip - use the range set in but->min/max */ range = but->softmax - but->softmin; hsv[2] = y*range + but->softmin; @@ -2914,7 +2913,7 @@ static int ui_numedit_but_HSVCUBE(uiBut *but, uiHandleButtonData *data, int mx, } hsv_to_rgb(hsv[0], hsv[1], hsv[2], rgb, rgb+1, rgb+2); - ui_set_but_vectorf(but, rgb); + copy_v3_v3(data->vec, rgb); data->draglastx= mx; data->draglasty= my; diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 7f70bfe335a..35add45b10a 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1736,11 +1736,11 @@ static void circle_picker(uiBlock *block, PointerRNA *ptr, const char *propname) uiBut *bt; /* HS circle */ - bt= uiDefButR(block, HSVCIRCLE, 0, "", 0, 0, PICKER_H, PICKER_W, ptr, propname, -1, 0.0, 0.0, 0, 0, ""); + bt= uiDefButR(block, HSVCIRCLE, 0, "", 0, 0, PICKER_H, PICKER_W, ptr, propname, 0, 0.0, 0.0, 0, 0, ""); uiButSetFunc(bt, do_picker_rna_cb, bt, NULL); /* value */ - bt= uiDefButR(block, HSVCUBE, 0, "", PICKER_W+PICKER_SPACE,0,PICKER_BAR,PICKER_H, ptr, propname, -1, 0.0, 0.0, UI_GRAD_V_ALT, 0, ""); + bt= uiDefButR(block, HSVCUBE, 0, "", PICKER_W+PICKER_SPACE,0,PICKER_BAR,PICKER_H, ptr, propname, 0, 0.0, 0.0, UI_GRAD_V_ALT, 0, ""); uiButSetFunc(bt, do_picker_rna_cb, bt, NULL); } @@ -1751,11 +1751,11 @@ static void square_picker(uiBlock *block, PointerRNA *ptr, const char *propname, int bartype = type + 3; /* HS square */ - bt= uiDefButR(block, HSVCUBE, 0, "", 0, PICKER_BAR+PICKER_SPACE, PICKER_TOTAL_W, PICKER_H, ptr, propname, -1, 0.0, 0.0, type, 0, ""); + bt= uiDefButR(block, HSVCUBE, 0, "", 0, PICKER_BAR+PICKER_SPACE, PICKER_TOTAL_W, PICKER_H, ptr, propname, 0, 0.0, 0.0, type, 0, ""); uiButSetFunc(bt, do_picker_rna_cb, bt, NULL); /* value */ - bt= uiDefButR(block, HSVCUBE, 0, "", 0, 0, PICKER_TOTAL_W, PICKER_BAR, ptr, propname, -1, 0.0, 0.0, bartype, 0, ""); + bt= uiDefButR(block, HSVCUBE, 0, "", 0, 0, PICKER_TOTAL_W, PICKER_BAR, ptr, propname, 0, 0.0, 0.0, bartype, 0, ""); uiButSetFunc(bt, do_picker_rna_cb, bt, NULL); } |