diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-13 12:58:24 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-08-13 12:58:24 +0300 |
commit | d3250593d07857e4f73b31bbff54536fb306a245 (patch) | |
tree | accbbf4e40ed3d42f2dd095888bae10f26e6e88d | |
parent | 4710af81a4003cf1c19f7fc16c08a53146bf3fba (diff) | |
parent | 844b40b0c174bbf5117b42427b0bc020a73bb60c (diff) |
Merge branch 'master' into blender2.8
-rw-r--r-- | build_files/build_environment/cmake/blosc.cmake | 19 | ||||
-rw-r--r-- | build_files/build_environment/cmake/harvest.cmake | 15 | ||||
-rw-r--r-- | build_files/build_environment/cmake/openal.cmake | 10 | ||||
-rw-r--r-- | build_files/build_environment/cmake/versions.cmake | 16 | ||||
-rw-r--r-- | build_files/build_environment/cmake/zlib.cmake | 26 | ||||
-rw-r--r-- | build_files/build_environment/patches/blosc.diff | 28 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/particle_child.c | 4 |
7 files changed, 75 insertions, 43 deletions
diff --git a/build_files/build_environment/cmake/blosc.cmake b/build_files/build_environment/cmake/blosc.cmake index 9a5ef745985..02f98dfe1f3 100644 --- a/build_files/build_environment/cmake/blosc.cmake +++ b/build_files/build_environment/cmake/blosc.cmake @@ -33,7 +33,7 @@ ExternalProject_Add(external_blosc DOWNLOAD_DIR ${DOWNLOAD_DIR} URL_HASH MD5=${BLOSC_HASH} PREFIX ${BUILD_DIR}/blosc - PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/blosc/src/external_blosc < ${PATCH_DIR}/blosc.diff + #PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/blosc/src/external_blosc < ${PATCH_DIR}/blosc.diff CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/blosc ${DEFAULT_CMAKE_FLAGS} ${BLOSC_EXTRA_ARGS} INSTALL_DIR ${LIBDIR}/blosc ) @@ -48,3 +48,20 @@ if(WIN32) external_pthreads ) endif() + +if (WIN32) + if(BUILD_MODE STREQUAL Release) + ExternalProject_Add_Step(external_blosc after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/ + DEPENDEES install + ) + endif() + if(BUILD_MODE STREQUAL Debug) + ExternalProject_Add_Step(external_blosc after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib + DEPENDEES install + ) + endif() +endif() + diff --git a/build_files/build_environment/cmake/harvest.cmake b/build_files/build_environment/cmake/harvest.cmake index 4bbe01974f6..277e414a7d9 100644 --- a/build_files/build_environment/cmake/harvest.cmake +++ b/build_files/build_environment/cmake/harvest.cmake @@ -28,11 +28,7 @@ message("HARVEST_TARGET = ${HARVEST_TARGET}") if(WIN32) if(BUILD_MODE STREQUAL Release) add_custom_target(Harvest_Release_Results - # Zlib Rename the lib file and copy the include/bin folders - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic.lib ${HARVEST_TARGET}/zlib/lib/libz_st.lib && - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/ && - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/bin/ ${HARVEST_TARGET}/zlib/bin/ && - # jpeg rename libfile + copy include + COMMAND # jpeg rename libfile + copy include ${CMAKE_COMMAND} -E copy ${LIBDIR}/jpg/lib/jpeg-static.lib ${HARVEST_TARGET}/jpeg/lib/libjpeg.lib && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/jpg/include/ ${HARVEST_TARGET}/jpeg/include/ && # pthreads, rename include dir @@ -45,10 +41,6 @@ if(BUILD_MODE STREQUAL Release) ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/include/sdl2 ${HARVEST_TARGET}/sdl/include && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/lib ${HARVEST_TARGET}/sdl/lib && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/sdl/bin ${HARVEST_TARGET}/sdl/lib && - # openal - ${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/lib/openal32.lib ${HARVEST_TARGET}/openal/lib/openal32.lib && - ${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/bin/openal32.dll ${HARVEST_TARGET}/openal/lib/openal32.dll && - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openal/include/ ${HARVEST_TARGET}/openal/include/ && # OpenImageIO ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/include ${HARVEST_TARGET}/OpenImageIO/include && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/OpenImageIO/lib ${HARVEST_TARGET}/OpenImageIO/lib && @@ -86,9 +78,6 @@ if(BUILD_MODE STREQUAL Release) ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/osl/ ${HARVEST_TARGET}/osl && # OpenVDB ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openVDB/ ${HARVEST_TARGET}/openVDB && - # blosc - ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib && - ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/blosc/include/ ${HARVEST_TARGET}/blosc/include/ && # tbb ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/tbb/include/ ${HARVEST_TARGET}/tbb/include/ && @@ -134,8 +123,6 @@ if(BUILD_MODE STREQUAL Debug) ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/pcre.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/pcre_d.lib && ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/UTF.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/UTF_d.lib && ${CMAKE_COMMAND} -E copy ${LIBDIR}/opencollada/lib/opencollada/xml.lib ${HARVEST_TARGET}/opencollada/lib/opencollada/xml_d.lib && - # blosc - ${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc_d.lib ${HARVEST_TARGET}/blosc/lib/libblosc_d.lib && # osl ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslcomp.lib ${HARVEST_TARGET}/osl/lib/oslcomp_d.lib && ${CMAKE_COMMAND} -E copy ${LIBDIR}/osl/lib/oslexec.lib ${HARVEST_TARGET}/osl/lib/oslexec_d.lib && diff --git a/build_files/build_environment/cmake/openal.cmake b/build_files/build_environment/cmake/openal.cmake index 0bc0452dd8c..3cd3a0aac72 100644 --- a/build_files/build_environment/cmake/openal.cmake +++ b/build_files/build_environment/cmake/openal.cmake @@ -41,4 +41,14 @@ if(BUILD_MODE STREQUAL Release) INSTALL_DIR ${LIBDIR}/openal PATCH_COMMAND ${PATCH_CMD} -p 1 -d ${BUILD_DIR}/openal/src/external_openal < ${PATCH_DIR}/openal.diff ) + + if(WIN32) + ExternalProject_Add_Step(external_openal after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/lib/openal32.lib ${HARVEST_TARGET}/openal/lib/openal32.lib + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openal/bin/openal32.dll ${HARVEST_TARGET}/openal/lib/openal32.dll + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openal/include/ ${HARVEST_TARGET}/openal/include/ + DEPENDEES install + ) + endif() + endif() diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index eac8e94b539..27cd1d200e0 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -16,13 +16,13 @@ # # ***** END GPL LICENSE BLOCK ***** -set(ZLIB_VERSION 1.2.8) -set(ZLIB_URI https://netcologne.dl.sourceforge.net/project/libpng/zlib/${ZLIB_VERSION}/zlib-${ZLIB_VERSION}.tar.gz) -set(ZLIB_HASH 44d667c142d7cda120332623eab69f40) +set(ZLIB_VERSION 1.2.11) +set(ZLIB_URI https://zlib.net/zlib-${ZLIB_VERSION}.tar.gz) +set(ZLIB_HASH 1c9f62f0778697a09d36121ead88e08e) -set(OPENAL_VERSION 1.17.2) +set(OPENAL_VERSION 1.18.2) set(OPENAL_URI http://kcat.strangesoft.net/openal-releases/openal-soft-${OPENAL_VERSION}.tar.bz2) -set(OPENAL_HASH 1764e0d8fec499589b47ebc724e0913d) +set(OPENAL_HASH d4eeb0889812e2fdeaa1843523d76190) set(PNG_VERSION 1.6.35) set(PNG_URI http://prdownloads.sourceforge.net/libpng/libpng-${PNG_VERSION}.tar.xz) @@ -37,9 +37,9 @@ set(BOOST_VERSION_NODOTS 1_68_0) set(BOOST_URI https://dl.bintray.com/boostorg/release/${BOOST_VERSION}/source/boost_${BOOST_VERSION_NODOTS}.tar.gz) set(BOOST_HASH 5d8b4503582fffa9eefdb9045359c239) -set(BLOSC_VERSION 1.7.1) -set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.zip) -set(BLOSC_HASH ff5cc729a5a25934ef714217218eed26) +set(BLOSC_VERSION 1.14.4) +set(BLOSC_URI https://github.com/Blosc/c-blosc/archive/v${BLOSC_VERSION}.tar.gz) +set(BLOSC_HASH e80dfc71e4cba03b8d01ed0876547ffe) set(PTHREADS_VERSION 2-9-1) set(PTHREADS_URI ftp://sourceware.org/pub/pthreads-win32/pthreads-w32-${PTHREADS_VERSION}-release.tar.gz) diff --git a/build_files/build_environment/cmake/zlib.cmake b/build_files/build_environment/cmake/zlib.cmake index 3307cb1f167..4c422d501ee 100644 --- a/build_files/build_environment/cmake/zlib.cmake +++ b/build_files/build_environment/cmake/zlib.cmake @@ -25,9 +25,25 @@ ExternalProject_Add(external_zlib INSTALL_DIR ${LIBDIR}/zlib ) -if(BUILD_MODE STREQUAL Debug) - ExternalProject_Add_Step(external_zlib after_install - COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${LIBDIR}/zlib/lib/${ZLIB_LIBRARY} +if (WIN32) + if(BUILD_MODE STREQUAL Release) + ExternalProject_Add_Step(external_zlib after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st${LIBEXT} + COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/zlib/include/ ${HARVEST_TARGET}/zlib/include/ + DEPENDEES install + ) + endif() + if(BUILD_MODE STREQUAL Debug) + ExternalProject_Add_Step(external_zlib after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st_d${LIBEXT} DEPENDEES install - ) -endif() + ) + endif() +else() + if(BUILD_MODE STREQUAL Debug) + ExternalProject_Add_Step(external_zlib after_install + COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${LIBDIR}/zlib/lib/${ZLIB_LIBRARY} + DEPENDEES install + ) + endif() +endif()
\ No newline at end of file diff --git a/build_files/build_environment/patches/blosc.diff b/build_files/build_environment/patches/blosc.diff index 3bd6ef28144..2c473d3b632 100644 --- a/build_files/build_environment/patches/blosc.diff +++ b/build_files/build_environment/patches/blosc.diff @@ -10,24 +10,22 @@ diff -Naur src/blosc/CMakeLists.txt external_blosc/blosc/CMakeLists.txt endif(NOT Threads_FOUND) else(WIN32) find_package(Threads REQUIRED) -diff -Naur src/blosc/blosc.c external_blosc/blosc/blosc.c ---- src/blosc/blosc.c 2016-02-03 10:26:28 -0700 -+++ external_blosc/blosc/blosc.c 2017-03-03 09:01:50 -0700 -@@ -49,12 +49,12 @@ +diff -Naur external_blosc.orig/blosc/blosc.c external_blosc/blosc/blosc.c +--- external_blosc.orig/blosc/blosc.c 2018-07-30 04:56:38 -0600 ++++ external_blosc/blosc/blosc.c 2018-08-11 15:27:26 -0600 +@@ -56,14 +56,7 @@ #include <inttypes.h> #endif /* _WIN32 */ - --#if defined(_WIN32) && !defined(__GNUC__) + +-/* Include the win32/pthread.h library for all the Windows builds. See #224. */ +-#if defined(_WIN32) - #include "win32/pthread.h" - #include "win32/pthread.c" -#else -+//#if defined(_WIN32) && !defined(__GNUC__) -+// #include "win32/pthread.h" -+ //#include "win32/pthread.c" -+//#else - #include <pthread.h> +- #include <pthread.h> -#endif -+//#endif - - /* If C11 is supported, use it's built-in aligned allocation. */ - #if __STDC_VERSION__ >= 201112L +- ++#include <pthread.h> + + /* Some useful units */ + #define KB 1024 diff --git a/source/blender/blenkernel/intern/particle_child.c b/source/blender/blenkernel/intern/particle_child.c index 7cfad93224d..f21b3a74fea 100644 --- a/source/blender/blenkernel/intern/particle_child.c +++ b/source/blender/blenkernel/intern/particle_child.c @@ -699,6 +699,10 @@ static void do_twist(const ParticleChildModifierContext *modifier_ctx, ParticleTexture *ptex = modifier_ctx->ptex; ParticleSettings *part = sim->psys->part; /* Early output checks. */ + if (modifier_ctx->parent_keys == NULL) { + /* Cannot get axis of rotation... */ + return; + } if (part->childtype != PART_CHILD_PARTICLES) { /* Interpolated children behave weird with twist. */ return; |