missed this file in last commit.

This commit is contained in:
2009-07-18 19:42:13 +00:00
parent 9b75187c55
commit 2d88c069bc
5 changed files with 9 additions and 6 deletions

View File

@@ -103,7 +103,7 @@ void CTX_store_free_list(ListBase *contexts);
/* need to store if python is initialized or not */ /* need to store if python is initialized or not */
int CTX_py_init_get(bContext *C); 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 */ /* Window Manager Context */

View File

@@ -168,7 +168,7 @@ int CTX_py_init_get(bContext *C)
{ {
return C->data.py_init; 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; C->data.py_init= value;
} }

View File

@@ -150,8 +150,8 @@ void WM_operator_properties_free(struct PointerRNA *ptr);
/* operator as a python command (resultuing string must be free'd) */ /* operator as a python command (resultuing string must be free'd) */
char *WM_operator_pystring(struct wmOperator *op); char *WM_operator_pystring(struct wmOperator *op);
void WM_operator_bl_idname(char *to, char *from); void WM_operator_bl_idname(char *to, const char *from);
void WM_operator_bl_idname(char *to, char *from); void WM_operator_py_idname(char *to, const char *from);
/* default operator callbacks for border/circle/lasso */ /* default operator callbacks for border/circle/lasso */
int WM_border_select_invoke (struct bContext *C, struct wmOperator *op, struct wmEvent *event); int WM_border_select_invoke (struct bContext *C, struct wmOperator *op, struct wmEvent *event);

View File

@@ -162,7 +162,7 @@ int WM_operatortype_remove(const char *idname)
} }
/* SOME_OT_op -> some.op */ /* 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_"); char *sep= strstr(from, "_OT_");
if(sep) { if(sep) {
@@ -181,7 +181,7 @@ void WM_operator_py_idname(char *to, char *from)
} }
/* some.op -> SOME_OT_op */ /* 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, "."); char *sep= strstr(from, ".");

View File

@@ -549,6 +549,9 @@ int main(int argc, char **argv)
BPY_run_ui_scripts(C, 0); /* dont need to reload the first time */ BPY_run_ui_scripts(C, 0); /* dont need to reload the first time */
#endif #endif
CTX_py_init_set(C, 1);
WM_keymap_init(C); /* after BPY_run_ui_scripts() */
#ifdef WITH_QUICKTIME #ifdef WITH_QUICKTIME
quicktime_init(); quicktime_init();