diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-08 09:04:53 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-08 09:04:53 +0100 |
commit | 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (patch) | |
tree | 2878053f3e7faed19a1f82c733d3bd29df69991e /media-gfx/blender/files | |
parent | 2018227e9344edb9da15fc6a4a8298086cc2aa77 (diff) |
gentoo resync : 08.06.2019
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, 0 insertions, 26 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 deleted file mode 100644 index 6b22f9335fd7..000000000000 --- a/media-gfx/blender/files/blender-2.79-fix-build-with-OSL-1.9.x.patch +++ /dev/null @@ -1,26 +0,0 @@ -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_) |