[Bf-blender-cvs] [3102821c9cc] blender2.8: Revert "Fix/workaround RNA build error in C++ API."

Campbell Barton noreply at git.blender.org
Mon May 21 12:40:05 CEST 2018


Commit: 3102821c9ccc9535cd0f8ed1208287a52a306861
Author: Campbell Barton
Date:   Mon May 21 12:38:47 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3102821c9ccc9535cd0f8ed1208287a52a306861

Revert "Fix/workaround RNA build error in C++ API."

This reverts commit 9f2ae547c0a4f8a230135423e163b22053251f1d.

Args were reordered.

===================================================================

M	source/blender/makesrna/intern/rna_wm_api.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c
index e33f02c7a76..ab534159a9e 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, "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);
+	parm = RNA_def_pointer(func, "item", "KeyMapItem", "", "");
+	RNA_def_parameter_flags(parm, 0, PARM_RNAPTR);
 	RNA_def_function_return(func, parm);
 
 	RNA_def_function(srna, "update", "rna_KeyConfig_update"); /* WM_keyconfig_update */



More information about the Bf-blender-cvs mailing list