Merge branch 'master' into blender2.8

2017-04-24 22:11:05 +10:00
parent f93f4169cb aff30aaf2d
commit 2010dbe8a5
29 changed files with 780 additions and 553 deletions
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -7107,8 +7107,8 @@ static int deferred_register_prop(StructRNA *srna, PyObject *key, PyObject *item
 				    RNA_struct_idprops_contains_datablock(type_srna))
 				{
 					PyErr_Format(PyExc_ValueError,
-								 "bpy_struct \"%.200s\" doesn't support datablock properties \n",
-								 RNA_struct_identifier(srna));
+					             "bpy_struct \"%.200s\" doesn't support datablock properties \n",
+					             RNA_struct_identifier(srna));
 					return -1;
 				}
 			}