diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2011-02-18 18:06:02 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2011-02-18 18:06:02 +0300 |
| commit | a0b88e1c4920f1406f6eb80bc14a20f4936be9bc (patch) | |
| tree | 506134f25bb401d6d24ea83d20649e169a22a49b /source/blender/editors/interface | |
| parent | 0f661b154fe7ab0f18abc66f09fc1c580623253e (diff) | |
Fix for #26111, #26112 & #26121, "only first button click worked in windows"
* In windows the old button was tested to be equal to the new button (ui_but_equals_old()) even if their optype wasn't the same. Adding a check for optypes fixes all three reported issues.
* For some strange reason this didn't happen on other platforms.
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 9d7da2cf194..2144262c082 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -497,6 +497,7 @@ static int ui_but_equals_old(uiBut *but, uiBut *oldbut) if(oldbut->func_arg1 != oldbut && but->func_arg1 != oldbut->func_arg1) return 0; if(oldbut->func_arg2 != oldbut && but->func_arg2 != oldbut->func_arg2) return 0; if(!but->funcN && ((but->poin != oldbut->poin && (uiBut*)oldbut->poin != oldbut) || but->pointype != oldbut->pointype)) return 0; + if(but->optype != oldbut->optype) return 0; return 1; } |