Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 06:31:19 +0000 (08:31 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 12 Jul 2018 06:31:19 +0000 (08:31 +0200)
build_files/buildbot/slave_compile.py
source/blender/python/intern/bpy_rna.c

index 43964dda6912ec2c81147443f26eca1904582884..59b35a535aa864fd4f6bb311b0290993a41cf9cd 100644 (file)
@@ -77,7 +77,13 @@ if 'cmake' in builder:
         # cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc')
 
     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'):
                 cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64'])
             elif builder.startswith('win32'):
index 00ff63f7275394a2f45909c8ef0e72f53d069726..36df7c258671202fcfb18148dc6311b8e6f37bb9 100644 (file)
@@ -7659,10 +7659,12 @@ static int bpy_class_validate_recursive(PointerRNA *dummyptr, StructRNA *srna, v
                if (!(flag & PROP_REGISTER))
                        continue;
 
+               /* TODO(campbell): Use Python3.7x _PyObject_LookupAttr(), also in the macro below. */
                identifier = RNA_property_identifier(prop);
                item = PyObject_GetAttrString(py_class, identifier);
 
                if (item == NULL) {
+                       PyErr_Clear();
                        /* Sneaky workaround to use the class name as the bl_idname */
 
 #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);                                          \
                                }                                                             \
+                               else {                                                        \
+                                       PyErr_Clear();                                            \
+                               }                                                             \
                        }  /* intentionally allow else here */
 
                        if (false) {}  /* needed for macro */