diff options
author | Matt Ebb <matt@mke3.net> | 2010-01-07 12:55:11 +0300 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-01-07 12:55:11 +0300 |
commit | cf9b728c6a1cb600c721bea1823206047ab1c5c7 (patch) | |
tree | 981352c911d626f84da09010b00a50d0201524fe /source/blender/editors/interface/interface_anim.c | |
parent | 4463597dcd382a84be8a2a59e03adcfe149c23b2 (diff) |
Color Picker work:
Restored the old Eyedropper tool from the 2.4 colour picker. Now it's an operator,
working nicely using rna properties (fixes #19475 and some todo items)
This ended up being a bit more work than expected, it involved converting the
colour picker to use RNA properties directly, rather than temporary values. This has
several advantages, including being able to type in RGB values greater than 1,
however there are still some redraw issues with sliders.
Also removed the alternate color pickers after this time spent testing, the current one
should be sufficient, or alternatives to the wheel can possibly become preferences
in the current design.
Converting the picker to RNA also made it very trivial to make a cool new
ColorWheel template, which can be embedded in UI layouts. I've enabled it already
in texture/vertex paint brush properties and the sequence editor color correction:
http://mke3.net/blender/devel/2.5/colorwheels.jpg
Diffstat (limited to 'source/blender/editors/interface/interface_anim.c')
-rw-r--r-- | source/blender/editors/interface/interface_anim.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_anim.c b/source/blender/editors/interface/interface_anim.c index acfd48e0269..e35ffade342 100644 --- a/source/blender/editors/interface/interface_anim.c +++ b/source/blender/editors/interface/interface_anim.c @@ -168,7 +168,7 @@ void uiAnimContextProperty(const bContext *C, struct PointerRNA *ptr, struct Pro if(ar) { for(block=ar->uiblocks.first; block; block=block->next) { for(but=block->buttons.first; but; but= but->next) { - if(but->active && but->rnapoin.id.data) { + if((but->active || but->flag & UI_BUT_LAST_ACTIVE) && but->rnapoin.id.data) { *ptr= but->rnapoin; *prop= but->rnaprop; *index= but->rnaindex; |