Merge branch 'master' into blender2.8

2018-06-08 08:10:35 +02:00
parent d352a0adc5 a25c11fd8d
commit 908b6960c0
191 changed files with 36025 additions and 2057 deletions
--- a/source/blender/render/intern/include/initrender.h
+++ b/source/blender/render/intern/include/initrender.h
@@ -31,7 +31,7 @@


 #ifndef __INITRENDER_H__
-#define __INITRENDER_H__ 
+#define __INITRENDER_H__

 /* Functions */