From 8d4c4775a0a686e93fbaaf02057f8ab8ef4896c3 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 26 Jan 2019 14:46:38 +0100 Subject: Cleanup: fix compiler warnings. --- source/blender/imbuf/intern/oiio/openimageio_api.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'source') 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]; -- cgit v1.2.3 From b7a9e980a11a085a3bc7ef8e267b967197f47447 Mon Sep 17 00:00:00 2001 From: Arto Kitula Date: Sat, 26 Jan 2019 14:14:51 +0100 Subject: macOS: add support for OpenMP, making smoke/fluid/cloth simulations faster. This bring macOS on par with Windows and Linux. It uses the OpenMP library added to our precompiled libraries. Custom flags are set because FindOpenMP from CMake below 3.12 does not support AppleClang, and more recent versions do not work with our custom directory location either. Differential Revision: https://developer.blender.org/D4257 --- source/creator/CMakeLists.txt | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source') diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index a553b8a569b..d2255bbd894 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -914,6 +914,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 -- cgit v1.2.3