Commit: 39303569702ccfb3fda7a1a216c609847935bb36 Author: Kévin Dietrich Date: Thu Dec 10 12:56:11 2015 +0100 Branches: openvdb https://developer.blender.org/rB39303569702ccfb3fda7a1a216c609847935bb36
Merge branch 'master' into openvdb =================================================================== =================================================================== diff --cc build_files/cmake/config/blender_full.cmake index ef5503f,ad8a681..b191099 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@@ -43,8 -43,6 +43,7 @@@ set(WITH_OPENAL ON CACHE set(WITH_OPENCOLLADA ON CACHE BOOL "" FORCE) set(WITH_OPENCOLORIO ON CACHE BOOL "" FORCE) set(WITH_OPENMP ON CACHE BOOL "" FORCE) - set(WITH_OPENNL ON CACHE BOOL "" FORCE) +set(WITH_OPENVDB ON CACHE BOOL "" FORCE) set(WITH_PYTHON_INSTALL ON CACHE BOOL "" FORCE) set(WITH_RAYOPTIMIZATION ON CACHE BOOL "" FORCE) set(WITH_SDL ON CACHE BOOL "" FORCE) diff --cc build_files/cmake/config/blender_lite.cmake index 51a52df,99e90ca..a479506 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@@ -47,8 -47,6 +47,7 @@@ set(WITH_OPENCOLLADA OFF CACHE set(WITH_OPENCOLORIO OFF CACHE BOOL "" FORCE) set(WITH_OPENIMAGEIO OFF CACHE BOOL "" FORCE) set(WITH_OPENMP OFF CACHE BOOL "" FORCE) - set(WITH_OPENNL OFF CACHE BOOL "" FORCE) +set(WITH_OPENVDB OFF CACHE BOOL "" FORCE) set(WITH_RAYOPTIMIZATION OFF CACHE BOOL "" FORCE) set(WITH_SDL OFF CACHE BOOL "" FORCE) set(WITH_X11_XINPUT OFF CACHE BOOL "" FORCE) _______________________________________________ Bf-blender-cvs mailing list [email protected] http://lists.blender.org/mailman/listinfo/bf-blender-cvs
