Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 20 Dec 2018 01:24:37 +0000 (12:24 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 20 Dec 2018 01:24:37 +0000 (12:24 +1100)
source/blender/python/intern/bpy_rna.c

index 903d0e33ec5c264bdc01a5770a08452b4fbe8d83..77728829066fd5f1aa272e81a4aae52992ba94de 100644 (file)
@@ -1206,7 +1206,7 @@ static int pyrna_string_to_enum(
                if (!RNA_property_enum_value(BPy_GetContext(), ptr, prop, param, r_value)) {
                        const char *enum_str = pyrna_enum_as_string(ptr, prop);
                        PyErr_Format(PyExc_TypeError,
-                                    "%.200s enum \"%.200s\" not found in (%.200s)",
+                                    "%.200s enum \"%.200s\" not found in (%s)",
                                     error_prefix, param, enum_str);
                        MEM_freeN((void *)enum_str);
                        return -1;