diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2014-09-18 14:45:49 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2014-09-18 14:51:54 +0400 |
| commit | 90c1afb02005671bb631c0fcb8b4981c3aa6e89e (patch) | |
| tree | 3d5532d9e9f119bec1d72895773729401cd66a0e /source/blender/editors/include | |
| parent | 44121442e97496963a13a80a3d96c24d8b38392f (diff) | |
Fix T41708, active palette indicator not refreshing when clicking
Issue, after a lot of blood sweat and tears, was found in
ui_but_update_from_old_block, where we restore a button to its old
values when possible. The problem here is that a1 and a2 are not really
meant to store temporary variables, because they tend to get overriden
and palette selection is one of those temporary states.
Instead, we now store the position of each button in the palette in a2
and pointer to the palette in the customdata pointer of each button and
use that to test if it's active. The positions won't change when
clicking so we are guaranteed that the old button won't override the new
one with garbage.
It's still hacky but it is better than testing button types when copying
old values.
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/UI_interface.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 1e9756ff771..bc794bf3350 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -295,7 +295,6 @@ typedef enum { #define UI_GRAD_L_ALT 10 #define UI_PALETTE_COLOR 20 -#define UI_PALETTE_COLOR_ACTIVE 1 /* Drawing * |