forked from bartvdbraak/blender
Merge branch 'master' into blender2.8
This commit is contained in:
commit
55354d734e
@ -77,7 +77,13 @@ if 'cmake' in builder:
|
|||||||
# cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc')
|
# cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc')
|
||||||
|
|
||||||
elif builder.startswith('win'):
|
elif builder.startswith('win'):
|
||||||
if builder.endswith('_vc2015'):
|
if builder.endswith('_vc2017'):
|
||||||
|
if builder.startswith('win64'):
|
||||||
|
cmake_options.extend(['-G', 'Visual Studio 15 2017 Win64'])
|
||||||
|
elif builder.startswith('win32'):
|
||||||
|
bits = 32
|
||||||
|
cmake_options.extend(['-G', 'Visual Studio 15 2017'])
|
||||||
|
elif builder.endswith('_vc2015'):
|
||||||
if builder.startswith('win64'):
|
if builder.startswith('win64'):
|
||||||
cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64'])
|
cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64'])
|
||||||
elif builder.startswith('win32'):
|
elif builder.startswith('win32'):
|
||||||
|
@ -7659,10 +7659,12 @@ static int bpy_class_validate_recursive(PointerRNA *dummyptr, StructRNA *srna, v
|
|||||||
if (!(flag & PROP_REGISTER))
|
if (!(flag & PROP_REGISTER))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
/* TODO(campbell): Use Python3.7x _PyObject_LookupAttr(), also in the macro below. */
|
||||||
identifier = RNA_property_identifier(prop);
|
identifier = RNA_property_identifier(prop);
|
||||||
item = PyObject_GetAttrString(py_class, identifier);
|
item = PyObject_GetAttrString(py_class, identifier);
|
||||||
|
|
||||||
if (item == NULL) {
|
if (item == NULL) {
|
||||||
|
PyErr_Clear();
|
||||||
/* Sneaky workaround to use the class name as the bl_idname */
|
/* Sneaky workaround to use the class name as the bl_idname */
|
||||||
|
|
||||||
#define BPY_REPLACEMENT_STRING(rna_attr, py_attr) \
|
#define BPY_REPLACEMENT_STRING(rna_attr, py_attr) \
|
||||||
@ -7678,6 +7680,9 @@ static int bpy_class_validate_recursive(PointerRNA *dummyptr, StructRNA *srna, v
|
|||||||
} \
|
} \
|
||||||
Py_DECREF(item); \
|
Py_DECREF(item); \
|
||||||
} \
|
} \
|
||||||
|
else { \
|
||||||
|
PyErr_Clear(); \
|
||||||
|
} \
|
||||||
} /* intentionally allow else here */
|
} /* intentionally allow else here */
|
||||||
|
|
||||||
if (false) {} /* needed for macro */
|
if (false) {} /* needed for macro */
|
||||||
|
Loading…
Reference in New Issue
Block a user