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

[Kévin Dietrich]

Commit: 2b17f0d4af21980b0ae80b5a7ce85986b000622f
Author: Kévin Dietrich
Date:   Sat Jan 30 23:44:31 2016 +0100
Branches: openvdb
https://developer.blender.org/rB2b17f0d4af21980b0ae80b5a7ce85986b000622f

Merge branch 'master' into openvdb

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



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

diff --cc CMakeLists.txt
index 6ce6bb3,20215fb..b1d0278
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -233,15 -233,11 +233,11 @@@ option(WITH_OPENCOLORIO   "Enable OpenC
  
  # Compositor
  option(WITH_COMPOSITOR         "Enable the tile based nodal compositor" ON)
- option(WITH_COMPOSITOR_WERROR  "Treat warnings as errors in compositor code" OFF)
- mark_as_advanced(WITH_COMPOSITOR_WERROR)
  
  option(WITH_OPENSUBDIV    "Enable OpenSubdiv for surface subdivision" _init_OPENSUBDIV)
- option(WITH_SUBSURF_WERROR  "Treat warnings as errors in subsurf code" OFF)
- mark_as_advanced(WITH_COMPOSITOR_WERROR)
  
 -option(WITH_OPENVDB       "Enable features relying on OpenVDB" OFF)
 -option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" OFF)
 +option(WITH_OPENVDB       "Enable features relying on OpenVDB" ON)
 +option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" ON)
  
  # GHOST Windowing Library Options
  option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)