diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-01-31 20:30:04 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-01-31 20:30:04 +0000 |
commit | 4650985dd0e898b82e0d2ec225931297d4fadccf (patch) | |
tree | eb0e8002cf3ebf1009110b6fec47fa90f873d824 /media-gfx/blender/files | |
parent | 67f76a858f1ac826bd8a550d756d9ec6e340ed4f (diff) |
gentoo resync : 31.01.2018
Diffstat (limited to 'media-gfx/blender/files')
-rw-r--r-- | media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch b/media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch new file mode 100644 index 000000000000..6b22f9335fd7 --- /dev/null +++ b/media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch @@ -0,0 +1,26 @@ +From d089875c4c753f084e02849462ec1bd6f785eadf Mon Sep 17 00:00:00 2001 +From: Brecht Van Lommel <brechtvanlommel@gmail.com> +Date: Sat, 18 Nov 2017 06:11:17 +0100 +Subject: [PATCH] Fix build with OSL 1.9.x, automatically aligns to 16 bytes + now. + +--- + intern/cycles/kernel/osl/osl_closures.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/intern/cycles/kernel/osl/osl_closures.cpp b/intern/cycles/kernel/osl/osl_closures.cpp +index e3e85705ebc..597d25e9f30 100644 +--- a/intern/cycles/kernel/osl/osl_closures.cpp ++++ b/intern/cycles/kernel/osl/osl_closures.cpp +@@ -232,7 +232,11 @@ static void register_closure(OSL::ShadingSystem *ss, const char *name, int id, O + /* optimization: it's possible to not use a prepare function at all and + * only initialize the actual class when accessing the closure component + * data, but then we need to map the id to the class somehow */ ++#if OSL_LIBRARY_VERSION_CODE >= 10900 ++ ss->register_closure(name, id, params, prepare, NULL); ++#else + ss->register_closure(name, id, params, prepare, NULL, 16); ++#endif + } + + void OSLShader::register_closures(OSLShadingSystem *ss_) |