Merge branch 'master' into blender2.8

2018-06-29 08:05:38 +02:00
parent be983295ea af36dd4664
commit 9bd0c63382
263 changed files with 0 additions and 281 deletions
--- a/source/blender/makesrna/intern/rna_image_api.c
+++ b/source/blender/makesrna/intern/rna_image_api.c
@@ -397,4 +397,3 @@ void RNA_api_image(StructRNA *srna)
 }

 #endif
-