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/gpu/GPU_basic_shader.h
+++ b/source/blender/gpu/GPU_basic_shader.h
@@ -131,4 +131,3 @@ void GPU_basic_shader_line_width(float line_width);
 #endif

 #endif
-