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

[Kévin Dietrich]

Commit: 024d59ca31129aeb1ba815c1cb59ce1882e03080
Author: Kévin Dietrich
Date:   Sun Aug 2 17:16:41 2015 +0200
Branches: openvdb
https://developer.blender.org/rB024d59ca31129aeb1ba815c1cb59ce1882e03080

Merge branch 'master' into openvdb

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



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

diff --cc CMakeLists.txt
index 6f2a5db,198f6a3..799c68d
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -230,10 -230,9 +230,12 @@@ option(WITH_COMPOSITOR_WERROR  "Treat w
  mark_as_advanced(WITH_COMPOSITOR_WERROR)
  
  option(WITH_OPENSUBDIV    "Enable OpenSubdiv for surface subdivision" OFF)
+ 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" ON)
 +option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enble if OpenVDB was built with blosc support" OFF)
 +
  # GHOST Windowing Library Options
  option(WITH_GHOST_DEBUG   "Enable debugging output for the GHOST library" OFF)
  mark_as_advanced(WITH_GHOST_DEBUG)
diff --cc source/blender/blenkernel/CMakeLists.txt
index 1b023fd,5a3fb49..cfddce8
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@@ -505,16 -505,18 +505,26 @@@ if(WITH_OPENSUBDIV
  		../../../intern/opensubdiv
  		${OPENSUBDIV_INCLUDE_DIRS}
  	)
+ 	if(WITH_SUBSURF_WERROR)
+ 		if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+ 			set_source_files_properties(intern/CCGSubSurf.c
+ 			                            intern/CCGSubSurf_legacy.c
+ 			                            intern/CCGSubSurf_opensubdiv.c
+ 			                            intern/CCGSubSurf_opensubdiv_converter.c
+ 			                            intern/CCGSubSurf_util.c
+ 			                            PROPERTIES COMPILE_FLAGS -Werror)
+ 		endif()
+ 	endif()
  endif()
  
 +if(WITH_OPENVDB)
 +	add_definitions(-DWITH_OPENVDB)
 +	add_definitions(-DOPENVDB_USE_BLOSC)
 +	list(APPEND INC
 +		 ../../../intern/openvdb
 +	)
 +endif()
 +
  ## Warnings as errors, this is too strict!
  #if(MSVC)
  #	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")