From 0967935b42bc73e65b910cabf3428485f113f1f5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 17 Aug 2020 18:16:54 +1000 Subject: Cleanup: split BPY_run_string_ex into two functions Using a boolean to select between eval/exec behavior wasn't very readable. --- source/creator/creator_args.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/creator') diff --git a/source/creator/creator_args.c b/source/creator/creator_args.c index 90c01436520..164e670c444 100644 --- a/source/creator/creator_args.c +++ b/source/creator/creator_args.c @@ -1852,7 +1852,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_run_string_ex(C, NULL, argv[1], false)); + BPY_CTX_SETUP(ok = BPY_run_string_exec(C, NULL, argv[1])); if (!ok && app_state.exit_code_on_error.python) { printf("\nError: script failed, expr: '%s', exiting.\n", argv[1]); BPY_python_end(); @@ -1879,7 +1879,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_run_string(C, (const char *[]){"code", NULL}, "code.interact()")); + BPY_CTX_SETUP(BPY_run_string_eval(C, (const char *[]){"code", NULL}, "code.interact()")); return 0; # else @@ -1952,7 +1952,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_run_string_ex(C, NULL, str, false)); + BPY_CTX_SETUP(BPY_run_string_exec(C, NULL, str)); free(str); # else UNUSED_VARS(argv, data); -- cgit v1.2.3