[Bf-blender-cvs] [f5a0a3b] openvdb: Merge branch 'master' into openvdb

[Kévin Dietrich]

Commit: f5a0a3b66f55c4870da39685825596714f20f448
Author: Kévin Dietrich
Date:   Sun Nov 1 13:40:36 2015 +0100
Branches: openvdb
https://developer.blender.org/rBf5a0a3b66f55c4870da39685825596714f20f448

Merge branch 'master' into openvdb

===================================================================



===================================================================

diff --cc build_files/cmake/config/blender_lite.cmake
index 9d3bbcc,9e7b4dc..51a52df
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@@ -48,8 -48,6 +48,7 @@@ set(WITH_OPENCOLORIO         OFF CACHE 
  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_PYTHON_INSTALL      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)