missed this file in last commit.

5 files changed, 9 insertions, 6 deletions

diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 8078f57b98e..83cac0adf93 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -103,7 +103,7 @@ void CTX_store_free_list(ListBase *contexts);
 
 /* need to store if python is initialized or not */
 int CTX_py_init_get(bContext *C);
-int CTX_py_init_set(bContext *C, int value);
+void CTX_py_init_set(bContext *C, int value);
 
 /* Window Manager Context */
 
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 17349ecc919..08182dc873b 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -168,7 +168,7 @@ int CTX_py_init_get(bContext *C)
 {
 	return C->data.py_init;
 }
-int CTX_py_init_set(bContext *C, int value)
+void CTX_py_init_set(bContext *C, int value)
 {
 	C->data.py_init= value;
 }
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 3615df8bd3b..609d599a09a 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -150,8 +150,8 @@ void		WM_operator_properties_free(struct PointerRNA *ptr);
 
 		/* operator as a python command (resultuing string must be free'd) */
 char		*WM_operator_pystring(struct wmOperator *op);
-void		WM_operator_bl_idname(char *to, char *from);
-void		WM_operator_bl_idname(char *to, char *from);
+void		WM_operator_bl_idname(char *to, const char *from);
+void		WM_operator_py_idname(char *to, const char *from);
 
 			/* default operator callbacks for border/circle/lasso */
 int			WM_border_select_invoke	(struct bContext *C, struct wmOperator *op, struct wmEvent *event);
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 57c090f29ed..9e8c5dc7ca0 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -162,7 +162,7 @@ int WM_operatortype_remove(const char *idname)
 }
 
 /* SOME_OT_op -> some.op */
-void WM_operator_py_idname(char *to, char *from)
+void WM_operator_py_idname(char *to, const char *from)
 {
 	char *sep= strstr(from, "_OT_");
 	if(sep) {
@@ -181,7 +181,7 @@ void WM_operator_py_idname(char *to, char *from)
 }
 
 /* some.op -> SOME_OT_op */
-void WM_operator_bl_idname(char *to, char *from)
+void WM_operator_bl_idname(char *to, const char *from)
 {
 	char *sep= strstr(from, ".");
 
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 9bf09a46461..45288bfb9b5 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -549,6 +549,9 @@ int main(int argc, char **argv)
 	BPY_run_ui_scripts(C, 0); /* dont need to reload the first time */
 #endif
 	
+	CTX_py_init_set(C, 1);
+	WM_keymap_init(C); /* after BPY_run_ui_scripts() */
+
 #ifdef WITH_QUICKTIME
 
 	quicktime_init();