diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-10 02:57:35 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-10 02:57:35 +0300 |
| commit | 0121258770584b495964f5ba241bdead2018eb22 (patch) | |
| tree | f8d70746768ccbabd1328d40e462de068e162398 /source/creator | |
| parent | 2f44ea68d3dcbf60887617255136e659d7edff37 (diff) | |
| parent | 7efac2b0b09d9e76d9fc573ec7936a1c6440c067 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/creator_args.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 2d24704e09e..12d8cd1d5b8 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -1684,7 +1684,7 @@ static int arg_handle_python_expr_run(int argc, const char **argv, void *data) /* workaround for scripts not getting a bpy.context.scene, causes internal errors elsewhere */ if (argc > 1) { bool ok; - BPY_CTX_SETUP(ok = BPY_execute_string_ex(C, argv[1], false)); + BPY_CTX_SETUP(ok = BPY_execute_string_ex(C, NULL, argv[1], false)); if (!ok && app_state.exit_code_on_error.python) { printf("\nError: script failed, expr: '%s', exiting.\n", argv[1]); exit(app_state.exit_code_on_error.python); @@ -1710,7 +1710,7 @@ static int arg_handle_python_console_run(int UNUSED(argc), const char **argv, vo #ifdef WITH_PYTHON bContext *C = data; - BPY_CTX_SETUP(BPY_execute_string(C, "__import__('code').interact()")); + BPY_CTX_SETUP(BPY_execute_string(C, (const char *[]){"code", NULL}, "code.interact()")); return 0; #else @@ -1766,7 +1766,7 @@ static int arg_handle_addons_set(int argc, const char **argv, void *data) BLI_snprintf(str, slen, script_str, argv[1]); BLI_assert(strlen(str) + 1 == slen); - BPY_CTX_SETUP(BPY_execute_string_ex(C, str, false)); + BPY_CTX_SETUP(BPY_execute_string_ex(C, NULL, str, false)); free(str); #else UNUSED_VARS(argv, data); |