archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-08-31 14:53:34 +10:00
parent b1ccb6ad25 976f14fbcf
commit ac9e1e692c
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/python/intern/bpy_interface.c
View File

@@ -628,13 +628,10 @@ bool BPY_execute_string_as_number(bContext *C, const char *expr, const bool verb
*/
bool BPY_execute_string_as_string(bContext *C, const char *expr, const bool verbose, char **r_value)
{
BLI_assert(r_value && expr);
PyGILState_STATE gilstate;
bool ok = true;
if (!r_value || !expr) {
return -1;
}
if (expr[0] == '\0') {
*r_value = NULL;
return ok;
@@ -665,13 +662,10 @@ bool BPY_execute_string_as_string(bContext *C, const char *expr, const bool verb
*/
bool BPY_execute_string_as_intptr(bContext *C, const char *expr, const bool verbose, intptr_t *r_value)
{
BLI_assert(r_value && expr);
PyGILState_STATE gilstate;
bool ok = true;
if (!r_value || !expr) {
return -1;
}
if (expr[0] == '\0') {
*r_value = 0;
return ok;
@@ -697,14 +691,13 @@ bool BPY_execute_string_as_intptr(bContext *C, const char *expr, const bool verb
bool BPY_execute_string_ex(bContext *C, const char *expr, bool use_eval)
{
BLI_assert(expr);
PyGILState_STATE gilstate;
PyObject *main_mod = NULL;
PyObject *py_dict, *retval;
bool ok = true;
Main *bmain_back; /* XXX, quick fix for release (Copy Settings crash), needs further investigation */
if (!expr) return -1;
if (expr[0] == '\0') {
return ok;
}