diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2010-09-04 22:49:07 +0400 |
| commit | 90b464d3728d9ed8ec26fdf59058d236b99dbcd9 (patch) | |
| tree | e88cab4fb1358e962b19f658064ca8c9f8d29f5b /source/blender/windowmanager/intern/wm_keymap.c | |
| parent | 08d02dd04d836976b25793bb1d4c6a86b3f924c7 (diff) | |
| parent | b0b787ef38f9947b3176642556f5282eb3518f69 (diff) | |
COLLADA branch: merge from trunk -r 28015:31610.soc-2009-chingachgook
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; |