[Bf-blender-cvs] [922b77f142b] gsoc-2018-many-light-sampling: Fix/workaround RNA build error in C++ API.

Brecht Van Lommel noreply at git.blender.org
Fri Jun 1 16:17:01 CEST 2018


Commit: 922b77f142b09f1a8c6b5f597c20c7932905c300
Author: Brecht Van Lommel
Date:   Mon May 21 11:13:56 2018 +0200
Branches: gsoc-2018-many-light-sampling
https://developer.blender.org/rB922b77f142b09f1a8c6b5f597c20c7932905c300

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

It seems output parameter needs to be the last one.

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

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 4ba214447fd..c8125615402 100644
--- a/source/blender/makesrna/intern/rna_wm_api.c
+++ b/source/blender/makesrna/intern/rna_wm_api.c
@@ -820,10 +820,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 */



More information about the Bf-blender-cvs mailing list