Merge branch 'master' into blender2.8

2018-07-06 10:18:52 +02:00
parent 6d38d82437 1daa20ad9f
commit de777ad9e6
256 changed files with 370 additions and 613 deletions
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -1067,4 +1067,3 @@ void ImageManager::device_free(Device *device)
 }

 CCL_NAMESPACE_END
-