diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-21 11:54:51 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-21 11:54:51 +0300 |
| commit | 0e9605f44d2611b16fc7b4541aee33b4c681426c (patch) | |
| tree | c37a84738f4bdec7041d5e21ff2fbccb6dce6c0e /source/blender/makesrna/intern/rna_wm_api.c | |
| parent | 698dbd65006fe686c991ef3d104cf569d3373711 (diff) | |
| parent | 4198c18f157cc5c718e5d96ab78a656df00762ca (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_wm_api.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_wm_api.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index da6fb4a0019..ab534159a9e 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -337,17 +337,17 @@ static PointerRNA rna_KeyConfig_find_item_from_operator( int opcontext, PointerRNA *properties, int is_hotkey, - PointerRNA *kmi_ptr) + PointerRNA *km_ptr) { char idname_bl[OP_MAX_TYPENAME]; WM_operator_bl_idname(idname_bl, idname); wmKeyMap *km = NULL; wmKeyMapItem *kmi = WM_key_event_operator(C, idname_bl, opcontext, properties->data, (bool)is_hotkey, &km); - PointerRNA km_ptr; - RNA_pointer_create(&wm->id, &RNA_KeyMap, km, kmi_ptr); - RNA_pointer_create(&wm->id, &RNA_KeyMapItem, kmi, &km_ptr); - return km_ptr; + PointerRNA kmi_ptr; + RNA_pointer_create(&wm->id, &RNA_KeyMap, km, km_ptr); + RNA_pointer_create(&wm->id, &RNA_KeyMapItem, kmi, &kmi_ptr); + return kmi_ptr; } static void rna_KeyConfig_update(wmWindowManager *wm) |