diff options
| author | Matt Ebb <matt@mke3.net> | 2010-06-28 03:57:58 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2010-06-28 03:57:58 +0400 |
| commit | a52632182c9d50d177abe56a037d7a76ed5d1003 (patch) | |
| tree | 1c8d6fde289fd1f5392e99657d4ef393278bc2d6 /source/blender/windowmanager/intern/wm_keymap.c | |
| parent | 32f83b91a42a2d8332a371b00637dca8d9f01393 (diff) | |
[#22682] some missing keymaps
Added proportional influence up/down to transform modal keymap.
Also fixed a crash in restoring to previous key map item after edits.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index ca6cabe3cce..e79d08dc2f1 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -708,8 +708,11 @@ void WM_keymap_restore_item_to_default(bContext *C, wmKeyMap *keymap, wmKeyMapIt WM_keymap_properties_reset(kmi); } - kmi->properties= IDP_CopyProperty(orig->properties); - kmi->ptr->data= kmi->properties; + + if (orig->properties) { + kmi->properties= IDP_CopyProperty(orig->properties); + kmi->ptr->data= kmi->properties; + } kmi->propvalue = orig->propvalue; kmi->type = orig->type; |