diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-07 05:06:18 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-11-07 05:08:24 +0300 |
| commit | 2440415bd32a11561a1b7a57f9740978b2f93bdf (patch) | |
| tree | d6252c8470a53a4121f207520e4192fef99f049e | |
| parent | 83de7c4094beb73036e71b5170502512c6936766 (diff) | |
| parent | 0e3fd70d7ac62c12ed85d3a90266994fac26bad0 (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 16 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_image.c | 5 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 12 |
4 files changed, 5 insertions, 32 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 742383a9ded..40671071921 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1369,10 +1369,6 @@ if(CMAKE_COMPILER_IS_GNUCC) elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") - if(APPLE AND WITH_OPENMP) # we need the Intel omp lib linked here to not fail all tests due presence of -fopenmp ! - set(CMAKE_REQUIRED_FLAGS "-L${LIBDIR}/openmp/lib -liomp5") # these are only used for the checks - endif() - # strange, clang complains these are not supported, but then uses them. ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall) ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 7e3f889b73f..ca01e08afe9 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -390,22 +390,6 @@ if(WITH_OPENMP) set(WITH_OPENMP OFF) else() # vanilla gcc or clang_omp support OpenMP message(STATUS "Using special OpenMP enabled compiler !") # letting find_package(OpenMP) module work for gcc - if(CMAKE_C_COMPILER_ID MATCHES "Clang") # clang-omp in darwin libs - set(OPENMP_FOUND ON) - set(OpenMP_C_FLAGS "-fopenmp" CACHE STRING "C compiler flags for OpenMP parallization" FORCE) - set(OpenMP_CXX_FLAGS "-fopenmp" CACHE STRING "C++ compiler flags for OpenMP parallization" FORCE) - include_directories(${LIBDIR}/openmp/include) - link_directories(${LIBDIR}/openmp/lib) - # This is a workaround for our helperbinaries ( datatoc, masgfmt, ... ), - # They are linked also to omp lib, so we need it in builddir for runtime exexcution, - # TODO: remove all unneeded dependencies from these - - # for intermediate binaries, in respect to lib ID - execute_process( - COMMAND ditto -arch ${CMAKE_OSX_ARCHITECTURES} - ${LIBDIR}/openmp/lib/libiomp5.dylib - ${CMAKE_BINARY_DIR}/Resources/lib/libiomp5.dylib) - endif() endif() endif() diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c index 09ea2efcd85..75d9c1fe7fb 100644 --- a/source/blender/makesrna/intern/rna_image.c +++ b/source/blender/makesrna/intern/rna_image.c @@ -175,6 +175,11 @@ static void rna_ImageUser_update(Main *UNUSED(bmain), Scene *scene, PointerRNA * ImageUser *iuser = ptr->data; BKE_image_user_frame_calc(iuser, scene->r.cfra, 0); + + if(ptr->id.data) { + /* Update material or texture for render preview. */ + DEG_id_tag_update(ptr->id.data, 0); + } } diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 78257cb7d1e..c5acd7e640e 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -900,18 +900,6 @@ elseif(APPLE) blender.app/Contents/ ) - if(WITH_OPENMP AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4') - install( - FILES ${LIBDIR}/openmp/lib/libiomp5.dylib - DESTINATION blender.app/Contents/Resources/lib/ - ) - install( - FILES ${LIBDIR}/openmp/LICENSE.txt - DESTINATION "." - RENAME LICENSE-libiomp5.txt - ) - endif() - if(WITH_LLVM AND NOT LLVM_STATIC) install( FILES ${LIBDIR}/llvm/lib/libLLVM-3.4.dylib |