diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-04-05 20:27:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-05 20:27:39 +0400 |
| commit | 01a87fe1b936d2bce0d7a16bfdf7aabe443d1d0b (patch) | |
| tree | af742bf6cdc4cdb9405adbc0c7ad0b119fdded4a /source/blender/windowmanager | |
| parent | 89926a0598a794043ed9b702f32d119fed888c04 (diff) | |
| parent | cf76d73b8386242d7f655974837d7843c774b36c (diff) | |
svn merge ^/trunk/blender -r55813:55815
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index aa9af4af154..f06bae1d084 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -964,10 +964,12 @@ static wmKeyMapItem *wm_keymap_item_find( RNA_pointer_create(NULL, ot->srna, properties_default, &opptr); if (WM_operator_properties_default(&opptr, true) || - (ot->prop && RNA_property_is_set(&opptr, ot->prop))) { + (ot->prop && RNA_property_is_set(&opptr, ot->prop))) + { /* for operator that has enum menu, unset it so it always matches */ - if (ot->prop) + if (ot->prop) { RNA_property_unset(&opptr, ot->prop); + } found = wm_keymap_item_find_props(C, opname, opcontext, properties_default, 0, hotkey, keymap_r); } |