diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/imbuf/intern/oiio/openimageio_api.cpp | 1 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/imbuf/intern/oiio/openimageio_api.cpp b/source/blender/imbuf/intern/oiio/openimageio_api.cpp index 34d5cccac84..7c64fdfc9df 100644 --- a/source/blender/imbuf/intern/oiio/openimageio_api.cpp +++ b/source/blender/imbuf/intern/oiio/openimageio_api.cpp @@ -203,7 +203,6 @@ struct ImBuf *imb_load_photoshop(const char *filename, int flags, char colorspac struct ImBuf *ibuf = NULL; int width, height, components; bool is_float, is_alpha; - TypeDesc typedesc; int basesize; char file_colorspace[IM_MAX_SPACE]; diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index c5bd0f8d88b..0e8091944bc 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -908,6 +908,13 @@ elseif(APPLE) blender.app/Contents/ ) + if(WITH_OPENMP AND OPENMP_CUSTOM) + install( + FILES ${LIBDIR}/openmp/lib/libomp.dylib + DESTINATION blender.app/Contents/Resources/lib + ) + endif() + if(WITH_LLVM AND NOT LLVM_STATIC) install( FILES ${LIBDIR}/llvm/lib/libLLVM-3.4.dylib |