diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-30 20:08:48 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-03-30 20:08:48 +0400 |
| commit | 953af01d2ae4cc18789616edcb75454851ef4202 (patch) | |
| tree | dfe104764c27ee3c8ab96d2bbc4255020e3fa194 /source/blender/editors/interface | |
| parent | 83ec6dd1bd574ad0102c4a9b8ec9a59294ff2c24 (diff) | |
Fix #30708: pressing escape in the color picker popup did not reset to the previous color.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 4213a67130b..420cae87851 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -1014,9 +1014,14 @@ static void ui_apply_button(bContext *C, uiBlock *block, uiBut *but, uiHandleBut case ICONTEXTROW: case BLOCK: case PULLDOWN: - case COL: ui_apply_but_BLOCK(C, but, data); break; + case COL: + if(data->cancel) + ui_apply_but_VEC(C, but, data); + else + ui_apply_but_BLOCK(C, but, data); + break; case BUTM: ui_apply_but_BUTM(C, but, data); break; |