diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-21 13:26:36 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-21 13:26:36 +0300 |
| commit | 21777533fbef067fd680db9b6c6e5e79b823af9d (patch) | |
| tree | 0d4498e055501217a0b4f3481f8097cc9f060ebf /source/blender/makesrna/intern/rna_wm_api.c | |
| parent | 0e9605f44d2611b16fc7b4541aee33b4c681426c (diff) | |
| parent | 6d8aa8505115c03ab2a50489f23fe36dea8cd564 (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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c index ab534159a9e..e33f02c7a76 100644 --- a/source/blender/makesrna/intern/rna_wm_api.c +++ b/source/blender/makesrna/intern/rna_wm_api.c @@ -923,10 +923,10 @@ void RNA_api_keyconfigs(StructRNA *srna) parm = RNA_def_pointer(func, "properties", "OperatorProperties", "", ""); RNA_def_parameter_flags(parm, 0, PARM_RNAPTR); RNA_def_boolean(func, "is_hotkey", 0, "Hotkey", "Event is not a modifier"); - parm = RNA_def_pointer(func, "keymap", "KeyMap", "", ""); - RNA_def_parameter_flags(parm, 0, PARM_RNAPTR | PARM_OUTPUT); parm = RNA_def_pointer(func, "item", "KeyMapItem", "", ""); RNA_def_parameter_flags(parm, 0, PARM_RNAPTR); + parm = RNA_def_pointer(func, "keymap", "KeyMap", "", ""); + RNA_def_parameter_flags(parm, 0, PARM_RNAPTR | PARM_OUTPUT); RNA_def_function_return(func, parm); RNA_def_function(srna, "update", "rna_KeyConfig_update"); /* WM_keyconfig_update */ |