diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-03 05:48:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-03 05:48:51 +0300 |
| commit | 88a893a83876bd983291881dbea8855600610e2b (patch) | |
| tree | d47af71eb1069f6e3e870f54ca5312af2536deb5 /source/blender/python/BPY_extern.h | |
| parent | 0c389862c4fff3fb9eca9027e300774ce1c3eb7e (diff) | |
| parent | 7ff1750218bf3c2ef4c57f9ea4a12b738f4b7264 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/python/BPY_extern.h')
| -rw-r--r-- | source/blender/python/BPY_extern.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h index 24d2ef0463d..ff14ba62ed0 100644 --- a/source/blender/python/BPY_extern.h +++ b/source/blender/python/BPY_extern.h @@ -75,9 +75,11 @@ void BPY_thread_restore(BPy_ThreadStatePtr tstate); bool BPY_execute_filepath(struct bContext *C, const char *filepath, struct ReportList *reports); bool BPY_execute_text(struct bContext *C, struct Text *text, struct ReportList *reports, const bool do_jump); -bool BPY_execute_string_as_number(struct bContext *C, const char *expr, const bool verbose, double *r_value); -bool BPY_execute_string_as_intptr(struct bContext *C, const char *expr, const bool verbose, intptr_t *r_value); -bool BPY_execute_string_as_string(struct bContext *C, const char *expr, const bool verbose, char **r_value); + +bool BPY_execute_string_as_number(struct bContext *C, const char *imports[], const char *expr, const bool verbose, double *r_value); +bool BPY_execute_string_as_intptr(struct bContext *C, const char *imports[], const char *expr, const bool verbose, intptr_t *r_value); +bool BPY_execute_string_as_string(struct bContext *C, const char *imports[], const char *expr, const bool verbose, char **r_value); + bool BPY_execute_string_ex(struct bContext *C, const char *expr, bool use_eval); bool BPY_execute_string(struct bContext *C, const char *expr); |