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/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -352,4 +352,3 @@ struct RenderView *RE_RenderViewGetByName(struct RenderResult *res, const char *
 RenderResult *RE_DuplicateRenderResult(RenderResult *rr);

 #endif /* __RE_PIPELINE_H__ */
-