diff options
author | Antony Riakiotakis <kalast@gmail.com> | 2014-02-05 12:45:14 +0400 |
---|---|---|
committer | Antony Riakiotakis <kalast@gmail.com> | 2014-02-05 12:45:14 +0400 |
commit | fc9626b1df5f9a05673199e82f4aafd1f4d42d08 (patch) | |
tree | 4ebd15c0e7850f58c5628b332a03fda5753e2f75 /source/blender/editors/interface/interface_intern.h | |
parent | 88843caaa3dd95e887f43f4c66ff7e47c6d31d66 (diff) |
Change confusing check discovered while working on HCL color wheel:
COLOR widgets never get created with UI_GRAD_V_ALT values. This is
intended for HSVCUBE color sliders only so reverting this to old value
before it was substituted with a define, which was -1.
There's one case where COLOR buttons get defined with a1 value different
than -1 which is in ui_def_but_rna. There the step value of the RNA
property is used. However, that meant that if step equaled to 9, which
is UI_GRAD_V_ALT value (unlikely) or if UI_GRAD_V_ALT was changed to 10
in future, or we added check for e.g. UI_GRAD_L_ALT which is 10 in HCL
branch, color widget would not get a color selection menu spawned.
Diffstat (limited to 'source/blender/editors/interface/interface_intern.h')
-rw-r--r-- | source/blender/editors/interface/interface_intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h index 6ee436d9638..379ddc27197 100644 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@ -181,7 +181,7 @@ struct uiBut { /* both these values use depends on the button type * (polymorphic struct or union would be nicer for this stuff) */ - /* (type == COLOR), Use UI_GRAD_* values. + /* (type == HSVCUBE), Use UI_GRAD_* values. * (type == NUM), Use to store RNA 'step' value, for dragging and click-step. * (type == LABEL), Use (a1 == 1.0f) to use a2 as a blending factor (wow, this is imaginative!). * (type == SCROLL) Use as scroll size. |