Fix compilation

Declare UV/Normal/Color buffers as deprecated. We will prefer
unified interleaved formats if we need to.

vertex format stays separate because it is needed for passes
like shadow map or edge pass or uv drawing.

.gitignore

@@ -21,6 +21,7 @@ Desktop.ini
 
 # commonly used paths in blender
 /blender.bin
+/user-config.py
 /BUILD_NOTES.txt
 
 # local patches
@@ -33,3 +34,8 @@ Desktop.ini
 /doc/python_api/sphinx-in/
 /doc/python_api/sphinx-out/
 /doc/python_api/rst/bmesh.ops.rst
+/doc/python_api/rst/in_menu.png
+/doc/python_api/rst/menu_id.png
+/doc/python_api/rst/op_prop.png
+/doc/python_api/rst/run_script.png
+/doc/python_api/rst/spacebar.png

.gitmodules

@@ -2,19 +2,15 @@
 	path = release/scripts/addons
 	url = ../blender-addons.git
 	ignore = all
-	branch = blender-v2.79-release
 [submodule "release/scripts/addons_contrib"]
 	path = release/scripts/addons_contrib
 	url = ../blender-addons-contrib.git
 	ignore = all
-	branch = master
 [submodule "release/datafiles/locale"]
 	path = release/datafiles/locale
 	url = ../blender-translations.git
 	ignore = all
-	branch = blender-v2.79-release
 [submodule "source/tools"]
 	path = source/tools
 	url = ../blender-dev-tools.git
 	ignore = all
-	branch = blender-v2.79-release

CMakeLists.txt

@@ -32,7 +32,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 	if(NOT DEFINED WITH_IN_SOURCE_BUILD)
 		message(FATAL_ERROR
 			"CMake generation for blender is not allowed within the source directory!"
-			"\n Remove \"${CMAKE_SOURCE_DIR}/CMakeCache.txt\" and try again from another folder, e.g.:"
+			"\n Remove the CMakeCache.txt file and try again from another folder, e.g.:"
 			"\n "
 			"\n rm CMakeCache.txt"
 			"\n cd .."
@@ -58,9 +58,7 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules")
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/platform")
 
 # avoid having empty buildtype
-if(NOT DEFINED CMAKE_BUILD_TYPE_INIT)
-	set(CMAKE_BUILD_TYPE_INIT "Release")
-endif()
+set(CMAKE_BUILD_TYPE_INIT "Release")
 
 # quiet output for Makefiles, 'make -s' helps too
 # set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
@@ -157,7 +155,6 @@ option_defaults_init(
 	_init_BUILDINFO
 	_init_CODEC_FFMPEG
 	_init_CYCLES_OSL
-	_init_CYCLES_OPENSUBDIV
 	_init_IMAGE_OPENEXR
 	_init_INPUT_NDOF
 	_init_JACK
@@ -175,7 +172,6 @@ if(UNIX AND NOT APPLE)
 	# disable less important dependencies by default
 	set(_init_CODEC_FFMPEG                   OFF)
 	set(_init_CYCLES_OSL                     OFF)
-	set(_init_CYCLES_OPENSUBDIV              OFF)
 	set(_init_IMAGE_OPENEXR                  OFF)
 	set(_init_JACK                           OFF)
 	set(_init_OPENCOLLADA                    OFF)
@@ -194,7 +190,7 @@ endif()
 #-----------------------------------------------------------------------------
 # Options
 
-# First platform specific non-cached vars
+# First platform spesific non-cached vars
 if(UNIX AND NOT APPLE)
 	set(WITH_X11 ON)
 endif()
@@ -231,7 +227,7 @@ mark_as_advanced(BUILDINFO_OVERRIDE_TIME)
 
 option(WITH_IK_ITASC      "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
 option(WITH_IK_SOLVER     "Enable Legacy IK solver (only disable for development)" ON)
-option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke, ocean sim, and audio effects)" ${_init_FFTW3})
+option(WITH_FFTW3         "Enable FFTW3 support (Used for smoke and audio effects)" ${_init_FFTW3})
 option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported due to missing features in upstream!)" )
 mark_as_advanced(WITH_SYSTEM_BULLET)
@@ -285,7 +281,6 @@ endif()
 if(WITH_X11)
 	option(WITH_X11_XINPUT    "Enable X11 Xinput (tablet support and unicode input)"  ON)
 	option(WITH_X11_XF86VMODE "Enable X11 video mode switching"                       ON)
-	option(WITH_X11_XFIXES    "Enable X11 XWayland cursor warping workaround"         ON)
 	option(WITH_X11_ALPHA     "Enable X11 transparent background"                     ON)
 endif()
 
@@ -336,7 +331,7 @@ option(WITH_ALEMBIC             "Enable Alembic Support" OFF)
 option(WITH_ALEMBIC_HDF5        "Enable Legacy Alembic Support (not officially supported)" OFF)
 
 if(APPLE)
-	option(WITH_CODEC_QUICKTIME     "Enable Quicktime Support" OFF)
+	option(WITH_CODEC_QUICKTIME     "Enable Quicktime Support" ON)
 endif()
 
 # 3D format support
@@ -346,9 +341,9 @@ option(WITH_OPENCOLLADA   "Enable OpenCollada Support (http://www.opencollada.or
 # Sound output
 option(WITH_SDL           "Enable SDL for sound and joystick support" ${_init_SDL})
 option(WITH_OPENAL        "Enable OpenAL Support (http://www.openal.org)" ON)
-option(WITH_JACK          "Enable JACK Support (http://www.jackaudio.org)" ${_init_JACK})
+option(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" ${_init_JACK})
 if(UNIX AND NOT APPLE)
-	option(WITH_JACK_DYNLOAD  "Enable runtime dynamic JACK libraries loading" OFF)
+	option(WITH_JACK_DYNLOAD  "Enable runtime dynamic Jack libraries loading" OFF)
 endif()
 if(UNIX AND NOT APPLE)
 	option(WITH_SDL_DYNLOAD  "Enable runtime dynamic SDL libraries loading" OFF)
@@ -366,12 +361,6 @@ option(WITH_LIBMV         "Enable Libmv structure from motion library" ON)
 option(WITH_LIBMV_SCHUR_SPECIALIZATIONS "Enable fixed-size schur specializations." OFF)
 mark_as_advanced(WITH_LIBMV_SCHUR_SPECIALIZATIONS)
 
-# Logging/unbit test libraries.
-option(WITH_SYSTEM_GFLAGS   "Use system-wide Gflags instead of a bundled one" OFF)
-option(WITH_SYSTEM_GLOG     "Use system-wide Glog instead of a bundled one" OFF)
-mark_as_advanced(WITH_SYSTEM_GFLAGS)
-mark_as_advanced(WITH_SYSTEM_GLOG)
-
 # Freestyle
 option(WITH_FREESTYLE     "Enable Freestyle (advanced edges rendering)" ON)
 
@@ -411,9 +400,9 @@ option(WITH_CYCLES					"Enable Cycles Render Engine" ON)
 option(WITH_CYCLES_STANDALONE		"Build Cycles standalone application" OFF)
 option(WITH_CYCLES_STANDALONE_GUI	"Build Cycles standalone with GUI" OFF)
 option(WITH_CYCLES_OSL				"Build Cycles with OSL support" ${_init_CYCLES_OSL})
-option(WITH_CYCLES_OPENSUBDIV		"Build Cycles with OpenSubdiv support" ${_init_CYCLES_OPENSUBDIV})
+option(WITH_CYCLES_OPENSUBDIV		"Build Cycles with OpenSubdiv support" ON)
 option(WITH_CYCLES_CUDA_BINARIES	"Build Cycles CUDA binaries" OFF)
-set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 CACHE STRING "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_20 sm_21 sm_30 sm_35 sm_37 sm_50 sm_52 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
 option(WITH_CYCLES_LOGGING	"Build Cycles with logging support" ON)
@@ -454,7 +443,6 @@ option(WITH_BOOST					"Enable features depending on boost" ON)
 
 # Unit testsing
 option(WITH_GTESTS "Enable GTest unit testing" OFF)
-option(WITH_OPENGL_TESTS "Enable OpenGL related unit testing (Experimental)" OFF)
 
 
 # Documentation
@@ -518,30 +506,22 @@ mark_as_advanced(WITH_C11)
 option(WITH_CXX11 "Build with C++11 standard enabled, for development use only!" ${_cxx11_init})
 mark_as_advanced(WITH_CXX11)
 
-# Compiler toolchain
-if(CMAKE_COMPILER_IS_GNUCC)
-	option(WITH_LINKER_GOLD "Use ld.gold linker which is usually faster than ld.bfd" ON)
-	mark_as_advanced(WITH_LINKER_GOLD)
-endif()
-
 # Dependency graph
 option(WITH_LEGACY_DEPSGRAPH "Build Blender with legacy dependency graph" ON)
 mark_as_advanced(WITH_LEGACY_DEPSGRAPH)
 
-if(WIN32)
-	# Use hardcoded paths or find_package to find externals
-	option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF)
-	mark_as_advanced(WITH_WINDOWS_FIND_MODULES)
+# Use hardcoded paths or find_package to find externals
+option(WITH_WINDOWS_FIND_MODULES "Use find_package to locate libraries" OFF)
+mark_as_advanced(WITH_WINDOWS_FIND_MODULES)
 
-	option(WITH_WINDOWS_CODESIGN "Use signtool to sign the final binary." OFF)
-	mark_as_advanced(WITH_WINDOWS_CODESIGN)
+option(WITH_WINDOWS_CODESIGN "Use signtool to sign the final binary." OFF)
+mark_as_advanced(WITH_WINDOWS_CODESIGN)
 
-	set(WINDOWS_CODESIGN_PFX CACHE FILEPATH  "Path to pfx file to use for codesigning.")
-	mark_as_advanced(WINDOWS_CODESIGN_PFX)
+set(WINDOWS_CODESIGN_PFX CACHE FILEPATH  "Path to pfx file to use for codesigning.")
+mark_as_advanced(WINDOWS_CODESIGN_PFX)
 
-	set(WINDOWS_CODESIGN_PFX_PASSWORD CACHE STRING  "password for pfx file used for codesigning.")
-	mark_as_advanced(WINDOWS_CODESIGN_PFX_PASSWORD)
-endif()
+set(WINDOWS_CODESIGN_PFX_PASSWORD CACHE STRING  "password for pfx file used for codesigning.")
+mark_as_advanced(WINDOWS_CODESIGN_PFX_PASSWORD)
 
 # avoid using again
 option_defaults_clear()
@@ -569,7 +549,95 @@ endif()
 # Apple
 
 if(APPLE)
-	include(platform_apple_xcode)
+	# require newer cmake on osx because of version handling,
+	# older cmake cannot handle 2 digit subversion!
+	cmake_minimum_required(VERSION 3.0.0)
+
+	if(NOT CMAKE_OSX_ARCHITECTURES)
+		set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
+			"Choose the architecture you want to build Blender for: i386, x86_64 or ppc"
+			FORCE)
+	endif()
+
+	if(NOT DEFINED OSX_SYSTEM)
+		execute_process(
+		        COMMAND xcodebuild -version -sdk macosx SDKVersion
+		        OUTPUT_VARIABLE OSX_SYSTEM
+		        OUTPUT_STRIP_TRAILING_WHITESPACE)
+	endif()
+
+	# workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not
+	# take xcode-select path into account but would always look  into /Applications/Xcode.app
+	# while dev versions are named Xcode<version>-DP<preview_number>
+	execute_process(
+	        COMMAND xcode-select --print-path
+	        OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE)
+	string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) # truncate to bundlepath in any case
+	
+	if(${CMAKE_GENERATOR} MATCHES "Xcode")
+	
+		# earlier xcode has no bundled developer dir, no sense in getting xcode path from
+		if(${XCODE_VERSION} VERSION_GREATER 4.2) 
+			# reduce to XCode name without dp extension
+			string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME) 
+			if(${DP_NAME} MATCHES Xcode5)
+				set(XCODE_VERSION 5)
+			endif()
+		endif()
+
+		##### cmake incompatibility with xcode  4.3 and higher #####
+		if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var
+			message(FATAL_ERROR "Xcode 4.3 and higher must be used with cmake 2.8-8 or higher")
+		endif()
+		### end cmake incompatibility with xcode 4.3 and higher ###
+		
+		if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4 AND ${XCODE_VERSION} VERSION_LESS 4.3)
+			# Xcode 4 defaults to the Apple LLVM Compiler.
+			# Override the default compiler selection because Blender only compiles with gcc up to xcode 4.2
+			set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
+			message(STATUS "Setting compiler to: " ${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION})
+		endif()
+	else() # unix makefile generator does not fill XCODE_VERSION var, so we get it with a command
+		execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE XCODE_VERS_BUILD_NR)
+		string(SUBSTRING "${XCODE_VERS_BUILD_NR}" 6 3 XCODE_VERSION) # truncate away build-nr
+		unset(XCODE_VERS_BUILD_NR)
+	endif()
+
+	message(STATUS "Detected OS X ${OSX_SYSTEM} and Xcode ${XCODE_VERSION} at ${XCODE_BUNDLE}")
+
+	if(${XCODE_VERSION} VERSION_LESS 4.3)
+		# use guaranteed existing sdk
+		set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE)
+	else()
+		# note: xcode-select path could be ambigous,
+		# cause /Applications/Xcode.app/Contents/Developer or /Applications/Xcode.app would be allowed
+		# so i use a selfcomposed bundlepath here  
+		set(OSX_SYSROOT_PREFIX ${XCODE_BUNDLE}/Contents/Developer/Platforms/MacOSX.platform)
+		message(STATUS "OSX_SYSROOT_PREFIX: " ${OSX_SYSROOT_PREFIX})
+		set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
+		set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
+		if(${CMAKE_GENERATOR} MATCHES "Xcode")
+			# to silence sdk not found warning, just overrides CMAKE_OSX_SYSROOT
+			set(CMAKE_XCODE_ATTRIBUTE_SDKROOT macosx${OSX_SYSTEM})
+		endif()
+	endif()
+
+	if(OSX_SYSTEM MATCHES 10.9)
+		# make sure syslibs and headers are looked up in sdk ( expecially for 10.9 openGL atm. )
+		set(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT})
+	endif()
+
+	if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
+		# 10.6 is our min. target, if you use higher sdk, weak linking happens
+		set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6" CACHE STRING "" FORCE)
+	endif()
+	
+	if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
+		# force CMAKE_OSX_DEPLOYMENT_TARGET for makefiles, will not work else ( cmake bug ? )
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+		add_definitions("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+	endif()
 endif()
 
 
@@ -629,7 +697,7 @@ if(NOT WITH_BOOST)
 	macro(set_and_warn
 		_setting _val)
 		if(${${_setting}})
-			message(STATUS "'WITH_BOOST' is disabled: forcing 'set(${_setting} ${_val})'")
+			message(STATUS "'WITH_BOOST' is disabled: forceing 'set(${_setting} ${_val})'")
 		endif()
 		set(${_setting} ${_val})
 	endmacro()
@@ -649,7 +717,7 @@ elseif(WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_AUDASPACE OR WITH_INTERNATIONAL O
 	# Keep enabled
 else()
 	# New dependency graph needs either Boost or C++11 for function bindings.
-	if(NOT WITH_CXX11)
+	if(NOT USE_CXX11)
 		# Enabled but we don't need it
 		set(WITH_BOOST OFF)
 	endif()
@@ -687,7 +755,6 @@ if(WITH_GHOST_SDL OR WITH_HEADLESS)
 	set(WITH_X11           OFF)
 	set(WITH_X11_XINPUT    OFF)
 	set(WITH_X11_XF86VMODE OFF)
-	set(WITH_X11_XFIXES    OFF)
 	set(WITH_X11_ALPHA     OFF)
 	set(WITH_GHOST_XDND    OFF)
 	set(WITH_INPUT_IME     OFF)
@@ -740,10 +807,6 @@ if(WITH_AUDASPACE)
 	endif()
 endif()
 
-if(APPLE)
-	apple_check_quicktime()
-endif()
-
 #-----------------------------------------------------------------------------
 # Check for valid directories
 # ... a partial checkout may cause this.
@@ -778,7 +841,7 @@ endif()
 # linux only, not cached
 set(WITH_BINRELOC OFF)
 
-# MACOSX only, set to avoid uninitialized
+# MAXOSX only, set to avoid uninitialized
 set(EXETYPE "")
 
 # C/C++ flags
@@ -832,18 +895,10 @@ if(WITH_X11)
 		endif()
 	endif()
 
-	if(WITH_X11_XFIXES)
-		if(X11_Xfixes_LIB)
-			list(APPEND PLATFORM_LINKLIBS ${X11_Xfixes_LIB})
-		else()
-			set(WITH_X11_XFIXES OFF)
-		endif()
-	endif()
-
 	if(WITH_X11_ALPHA)
 		find_library(X11_Xrender_LIB Xrender  ${X11_LIB_SEARCH_PATH})
 		mark_as_advanced(X11_Xrender_LIB)
-		if(X11_Xrender_LIB)
+		if (X11_Xrender_LIB)
 			list(APPEND PLATFORM_LINKLIBS ${X11_Xrender_LIB})
 		else()
 			set(WITH_X11_ALPHA OFF)
@@ -897,6 +952,11 @@ if(WITH_CYCLES)
 			)
 		endif()
 	endif()
+
+	if(WITH_CYCLES_OPENSUBDIV AND NOT WITH_OPENSUBDIV)
+		message(STATUS "WITH_CYCLES_OPENSUBDIV requires WITH_OPENSUBDIV to be ON, turning OFF")
+		set(WITH_CYCLES_OPENSUBDIV OFF)
+	endif()
 endif()
 
 if(WITH_INTERNATIONAL)
@@ -917,7 +977,7 @@ if(SUPPORT_SSE_BUILD)
 	add_definitions(-D__SSE__ -D__MMX__)
 endif()
 if(SUPPORT_SSE2_BUILD)
-	set(PLATFORM_CFLAGS " ${PLATFORM_CFLAGS} ${COMPILER_SSE2_FLAG}")
+	set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}")
 	add_definitions(-D__SSE2__)
 	if(NOT SUPPORT_SSE_BUILD) # dont double up
 		add_definitions(-D__MMX__)
@@ -929,16 +989,16 @@ endif()
 if(MSVC)
 	# for some reason this fails on msvc
 	add_definitions(-D__LITTLE_ENDIAN__)
-
-# OSX-Note: as we do cross-compiling with specific set architecture,
-# endianess-detection and auto-setting is counterproductive
+	
+# OSX-Note: as we do crosscompiling with specific set architecture,
+# endianess-detection and autosetting is counterproductive
 # so we just set endianess according CMAKE_OSX_ARCHITECTURES
 
 elseif(CMAKE_OSX_ARCHITECTURES MATCHES i386 OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
 	add_definitions(-D__LITTLE_ENDIAN__)
-elseif(CMAKE_OSX_ARCHITECTURES MATCHES ppc OR CMAKE_OSX_ARCHITECTURES MATCHES ppc64)
+elseif(CMAKE_OSX_ARCHITECTURES MATCHES ppc OR CMAKE_OSX_ARCHITECTURES MATCHES ppc64)		
 	add_definitions(-D__BIG_ENDIAN__)
-
+	
 else()
 	include(TestBigEndian)
 	test_big_endian(_SYSTEM_BIG_ENDIAN)
@@ -1233,42 +1293,15 @@ endif()
 # Configure GLog/GFlags
 
 if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
-	if(WITH_SYSTEM_GFLAGS)
-		find_package(Gflags)
-		if(NOT GFLAGS_FOUND)
-			message(FATAL_ERROR "System wide Gflags is requested but was not found")
-		endif()
-		# FindGflags does not define this, and we are not even sure what to use here.
-		set(GFLAGS_DEFINES)
-	else()
-		set(GFLAGS_DEFINES
-			-DGFLAGS_DLL_DEFINE_FLAG=
-			-DGFLAGS_DLL_DECLARE_FLAG=
-			-DGFLAGS_DLL_DECL=
-		)
-		set(GFLAGS_NAMESPACE "gflags")
-		set(GFLAGS_LIBRARIES extern_gflags)
-		set(GFLAGS_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/extern/gflags/src")
-	endif()
+	set(GLOG_DEFINES
+		-DGOOGLE_GLOG_DLL_DECL=
+	)
 
-	if(WITH_SYSTEM_GLOG)
-		find_package(Glog)
-		if(NOT GLOG_FOUND)
-			message(FATAL_ERROR "System wide Glog is requested but was not found")
-		endif()
-		# FindGlog does not define this, and we are not even sure what to use here.
-		set(GLOG_DEFINES)
-	else()
-		set(GLOG_DEFINES
-			-DGOOGLE_GLOG_DLL_DECL=
-		)
-		set(GLOG_LIBRARIES extern_glog)
-		if(WIN32)
-			set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/glog/src/windows)
-		else()
-			set(GLOG_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/glog/src)
-		endif()
-	endif()
+	set(GFLAGS_DEFINES
+		-DGFLAGS_DLL_DEFINE_FLAG=
+		-DGFLAGS_DLL_DECLARE_FLAG=
+		-DGFLAGS_DLL_DECL=
+	)
 endif()
 
 #-----------------------------------------------------------------------------
@@ -1392,20 +1425,10 @@ if(CMAKE_COMPILER_IS_GNUCC)
 		ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_MISSING_DECLARATIONS -Wmissing-declarations)
 	endif()
 
-	# Use 'ATTR_FALLTHROUGH' macro to suppress.
-	if(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "7.0"))
-		ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_IMPLICIT_FALLTHROUGH -Wimplicit-fallthrough=5)
-		ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_IMPLICIT_FALLTHROUGH -Wimplicit-fallthrough=5)
-	endif()
-
 	# flags to undo strict flags
 	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_DEPRECATED_DECLARATIONS -Wno-deprecated-declarations)
 	ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_UNUSED_PARAMETER        -Wno-unused-parameter)
 
-	if(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "7.0"))
-		ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_IMPLICIT_FALLTHROUGH    -Wno-implicit-fallthrough)
-	endif()
-
 	if(NOT APPLE)
 		ADD_CHECK_C_COMPILER_FLAG(CC_REMOVE_STRICT_FLAGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
 	endif()
@@ -1529,7 +1552,7 @@ if(WITH_CXX11)
 	if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
 		# TODO(sergey): Do we want c++11 or gnu-c++11 here?
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-	elseif(MSVC)
+	elseif(MSVC12)
 		# Nothing special is needed, C++11 features are available by default.
 	else()
 		message(FATAL_ERROR "Compiler ${CMAKE_C_COMPILER_ID} is not supported for C++11 build yet")
@@ -1560,7 +1583,7 @@ endif()
 set(CMAKE_C_FLAGS "${C_WARNINGS} ${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS}")
 set(CMAKE_CXX_FLAGS "${CXX_WARNINGS} ${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS}")
 
-# defined above, platform specific but shared names
+# defined above, platform spesific but shared names
 mark_as_advanced(
 	CYCLES_OSL
 	OSL_LIB_EXEC
@@ -1706,7 +1729,6 @@ if(FIRST_RUN)
 	info_cfg_option(WITH_INSTALL_PORTABLE)
 	info_cfg_option(WITH_X11_ALPHA)
 	info_cfg_option(WITH_X11_XF86VMODE)
-	info_cfg_option(WITH_X11_XFIXES)
 	info_cfg_option(WITH_X11_XINPUT)
 	info_cfg_option(WITH_MEM_JEMALLOC)
 	info_cfg_option(WITH_MEM_VALGRIND)

GNUmakefile

@@ -1,4 +1,4 @@
-# -*- mode: gnumakefile; tab-width: 4; indent-tabs-mode: t; -*-
+# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
 # vim: tabstop=4
 #
 # ##### BEGIN GPL LICENSE BLOCK #####
@@ -104,7 +104,7 @@ endif
 CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \
                      -H"$(BLENDER_DIR)" \
                      -B"$(BUILD_DIR)" \
-                     -DCMAKE_BUILD_TYPE_INIT:STRING=$(BUILD_TYPE)
+                     -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE)
 
 
 # -----------------------------------------------------------------------------
@@ -113,7 +113,7 @@ CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \
 # X11 spesific
 ifdef DISPLAY
 	CMAKE_CONFIG_TOOL = cmake-gui
-else
+else 
 	CMAKE_CONFIG_TOOL = ccmake
 endif
 
@@ -127,7 +127,7 @@ all: .FORCE
 #	# if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
 #	# 	$(CMAKE_CONFIG); \
 #	# fi
-
+	
 #	# do this always incase of failed initial build, could be smarter here...
 	@$(CMAKE_CONFIG)
 

build_files/build_environment/install_deps.sh

@@ -25,8 +25,7 @@
 ARGS=$( \
 getopt \
 -o s:i:t:h \
---long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,use-cxx11,\
-with-all,with-opencollada,with-jack,\
+--long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,with-all,with-opencollada,\
 ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\
 force-all,force-python,force-numpy,force-boost,\
 force-ocio,force-openexr,force-oiio,force-llvm,force-osl,force-osd,force-openvdb,\
@@ -104,11 +103,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --no-confirm
         Disable any interaction with user (suitable for automated run).
 
-    --use-cxx11
-        Build all libraries in cpp11 'mode' (will be mandatory soon in blender2.8 branch).
-        NOTE: If your compiler is gcc-6.0 or above, you probably *want* to enable this option (since it's default
-              standard starting from this version).
-
     --with-all
         By default, a number of optional and not-so-often needed libraries are not installed.
         This option will try to install them, at the cost of potential conflicts (depending on
@@ -118,9 +112,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --with-opencollada
         Build and install the OpenCOLLADA libraries.
 
-    --with-jack
-        Install the jack libraries.
-
     --ver-ocio=<ver>
         Force version of OCIO library.
 
@@ -290,9 +281,8 @@ SUDO="sudo"
 
 NO_BUILD=false
 NO_CONFIRM=false
-USE_CXX11=false
 
-PYTHON_VERSION="3.5.3"
+PYTHON_VERSION="3.5.1"
 PYTHON_VERSION_MIN="3.5"
 PYTHON_FORCE_BUILD=false
 PYTHON_FORCE_REBUILD=false
@@ -325,8 +315,8 @@ OPENEXR_FORCE_REBUILD=false
 OPENEXR_SKIP=false
 _with_built_openexr=false
 
-OIIO_VERSION="1.7.15"
-OIIO_VERSION_MIN="1.7.15"
+OIIO_VERSION="1.6.9"
+OIIO_VERSION_MIN="1.6.0"
 OIIO_VERSION_MAX="1.9.0"  # UNKNOWN currently # Not supported by current OSL...
 OIIO_FORCE_BUILD=false
 OIIO_FORCE_REBUILD=false
@@ -340,14 +330,14 @@ LLVM_FORCE_REBUILD=false
 LLVM_SKIP=false
 
 # OSL needs to be compiled for now!
-OSL_VERSION="1.7.5"
+OSL_VERSION="1.7.3"
 OSL_VERSION_MIN=$OSL_VERSION
 OSL_FORCE_BUILD=false
 OSL_FORCE_REBUILD=false
 OSL_SKIP=false
 
 # OpenSubdiv needs to be compiled for now
-OSD_VERSION="3.1.1"
+OSD_VERSION="3.0.5"
 OSD_VERSION_MIN=$OSD_VERSION
 OSD_FORCE_BUILD=false
 OSD_FORCE_REBUILD=false
@@ -363,18 +353,19 @@ OPENVDB_FORCE_REBUILD=false
 OPENVDB_SKIP=false
 
 # Alembic needs to be compiled for now
-ALEMBIC_VERSION="1.7.1"
+ALEMBIC_VERSION="1.6.0"
 ALEMBIC_VERSION_MIN=$ALEMBIC_VERSION
 ALEMBIC_FORCE_BUILD=false
 ALEMBIC_FORCE_REBUILD=false
 ALEMBIC_SKIP=false
 
-OPENCOLLADA_VERSION="1.6.51"
+# Version??
+OPENCOLLADA_VERSION="1.3"
 OPENCOLLADA_FORCE_BUILD=false
 OPENCOLLADA_FORCE_REBUILD=false
 OPENCOLLADA_SKIP=false
 
-FFMPEG_VERSION="3.2.1"
+FFMPEG_VERSION="2.8.4"
 FFMPEG_VERSION_MIN="2.8.4"
 FFMPEG_FORCE_BUILD=false
 FFMPEG_FORCE_REBUILD=false
@@ -501,18 +492,12 @@ while true; do
     --no-confirm)
       NO_CONFIRM=true; shift; continue
     ;;
-    --use-cxx11)
-      USE_CXX11=true; shift; continue
-    ;;
     --with-all)
       WITH_ALL=true; shift; continue
     ;;
     --with-opencollada)
       WITH_OPENCOLLADA=true; shift; continue
     ;;
-    --with-jack)
-      WITH_JACK=true; shift; continue;
-    ;;
     --ver-ocio)
       OCIO_VERSION="$2"
       OCIO_VERSION_MIN=$OCIO_VERSION
@@ -716,26 +701,8 @@ done
 if [ "$WITH_ALL" = true -a "$OPENCOLLADA_SKIP" = false ]; then
   WITH_OPENCOLLADA=true
 fi
-if [ "$WITH_ALL" = true ]; then
-  WITH_JACK=true
-fi
 
 
-WARNING "****WARNING****"
-PRINT "If you are experiencing issues building Blender, _*TRY A FRESH, CLEAN BUILD FIRST*_!"
-PRINT "The same goes for install_deps itself, if you encounter issues, please first erase everything in $SRC and $INST"
-PRINT "(provided obviously you did not add anything yourself in those dirs!), and run install_deps.sh again!"
-PRINT "Often, changes in the libs built by this script, or in your distro package, cannot be handled simply, so..."
-PRINT ""
-PRINT "You may also try to use the '--build-foo' options to bypass your distribution's packages"
-PRINT "for some troublesome/buggy libraries..."
-PRINT ""
-PRINT ""
-PRINT "Ran with:"
-PRINT "    install_deps.sh $COMMANDLINE"
-PRINT ""
-PRINT ""
-
 
 # This has to be done here, because user might force some versions...
 PYTHON_SOURCE=( "https://www.python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tgz" )
@@ -745,10 +712,7 @@ _boost_version_nodots=`echo "$BOOST_VERSION" | sed -r 's/\./_/g'`
 BOOST_SOURCE=( "http://sourceforge.net/projects/boost/files/boost/$BOOST_VERSION/boost_$_boost_version_nodots.tar.bz2/download" )
 BOOST_BUILD_MODULES="--with-system --with-filesystem --with-thread --with-regex --with-locale --with-date_time --with-wave --with-iostreams --with-python --with-program_options"
 
-OCIO_USE_REPO=true
 OCIO_SOURCE=( "https://github.com/imageworks/OpenColorIO/tarball/v$OCIO_VERSION" )
-OCIO_SOURCE_REPO=( "https://github.com/imageworks/OpenColorIO.git" )
-OCIO_SOURCE_REPO_UID="6de971097c7f552300f669ed69ca0b6cf5a70843"
 
 OPENEXR_USE_REPO=false
 OPENEXR_SOURCE=( "http://download.savannah.nongnu.org/releases/openexr/openexr-$OPENEXR_VERSION.tar.gz" )
@@ -761,8 +725,8 @@ OIIO_SOURCE=( "https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION
 OIIO_SOURCE_REPO=( "https://github.com/OpenImageIO/oiio.git" )
 OIIO_SOURCE_REPO_UID="c9e67275a0b248ead96152f6d2221cc0c0f278a4"
 
-LLVM_SOURCE=( "http://releases.llvm.org/$LLVM_VERSION/llvm-$LLVM_VERSION.src.tar.gz" )
-LLVM_CLANG_SOURCE=( "http://releases.llvm.org/$LLVM_VERSION/clang-$LLVM_VERSION.src.tar.gz" "http://llvm.org/releases/$LLVM_VERSION/cfe-$LLVM_VERSION.src.tar.gz" )
+LLVM_SOURCE=( "http://llvm.org/releases/$LLVM_VERSION/llvm-$LLVM_VERSION.src.tar.gz" )
+LLVM_CLANG_SOURCE=( "http://llvm.org/releases/$LLVM_VERSION/clang-$LLVM_VERSION.src.tar.gz" "http://llvm.org/releases/$LLVM_VERSION/cfe-$LLVM_VERSION.src.tar.gz" )
 
 OSL_USE_REPO=false
 OSL_SOURCE=( "https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz" )
@@ -797,25 +761,12 @@ ALEMBIC_SOURCE=( "https://github.com/alembic/alembic/archive/${ALEMBIC_VERSION}.
 # ALEMBIC_SOURCE_REPO_BRANCH="master"
 
 OPENCOLLADA_SOURCE=( "https://github.com/KhronosGroup/OpenCOLLADA.git" )
-OPENCOLLADA_REPO_UID="0c2cdc17c22cf42050e4d42154bed2176363549c"
+OPENCOLLADA_REPO_UID="3335ac164e68b2512a40914b14c74db260e6ff7d"
 OPENCOLLADA_REPO_BRANCH="master"
 
 FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
 
-CXXFLAGS_BACK=$CXXFLAGS
-if [ "$USE_CXX11" = true ]; then
-  WARNING "You are trying to use c++11, this *should* go smoothely with any very recent distribution
-However, if you are experiencing linking errors (also when building Blender itself), please try the following:
-    * Re-run this script with '--build-all --force-all' options.
-    * Ensure your gcc version is at the very least 4.8, if possible you should really rather use gcc-5.1 or above.
 
-Please note that until the transition to C++11-built libraries if completed in your distribution, situation will
-remain fuzzy and incompatibilities may happen..."
-  PRINT ""
-  PRINT ""
-  CXXFLAGS="$CXXFLAGS -std=c++11"
-  export CXXFLAGS
-fi
 
 #### Show Dependencies ####
 
@@ -828,7 +779,7 @@ Those libraries should be available as packages in all recent distributions (opt
     * libjpeg, libpng, libtiff, [libopenjpeg], [libopenal].
     * libx11, libxcursor, libxi, libxrandr, libxinerama (and other libx... as needed).
     * libsqlite3, libbz2, libssl, libfftw3, libxml2, libtinyxml, yasm, libyaml-cpp.
-    * libsdl1.2, libglew, [libglewmx].\""
+    * libsdl1.2, libglew, libglewmx.\""
 
 DEPS_SPECIFIC_INFO="\"BUILDABLE DEPENDENCIES:
 
@@ -1002,7 +953,7 @@ prepare_opt() {
 
 # Check whether the current package needs to be recompiled, based on a dummy file containing a magic number in its name...
 magic_compile_check() {
-  if [ -f $INST/.$1-magiccheck-$2-$USE_CXX11 ]; then
+  if [ -f $INST/.$1-magiccheck-$2 ]; then
     return 0
   else
     return 1
@@ -1011,7 +962,7 @@ magic_compile_check() {
 
 magic_compile_set() {
   rm -f $INST/.$1-magiccheck-*
-  touch $INST/.$1-magiccheck-$2-$USE_CXX11
+  touch $INST/.$1-magiccheck-$2
 }
 
 # Note: should clean nicely in $INST, but not in $SRC, when we switch to a new version of a lib...
@@ -1262,11 +1213,7 @@ compile_Boost() {
 #### Build OCIO ####
 _init_ocio() {
   _src=$SRC/OpenColorIO-$OCIO_VERSION
-  if [ "$OCIO_USE_REPO" = true ]; then
-    _git=true
-  else
-    _git=false
-  fi
+  _git=false
   _inst=$INST/ocio-$OCIO_VERSION
   _inst_shortcut=$INST/ocio
 }
@@ -1283,7 +1230,7 @@ compile_OCIO() {
   fi
 
   # To be changed each time we make edits that would modify the compiled result!
-  ocio_magic=2
+  ocio_magic=1
   _init_ocio
 
   # Clean install if needed!
@@ -1300,27 +1247,14 @@ compile_OCIO() {
     if [ ! -d $_src ]; then
       INFO "Downloading OpenColorIO-$OCIO_VERSION"
       mkdir -p $SRC
+      download OCIO_SOURCE[@] $_src.tar.gz
 
-      if [ "$OCIO_USE_REPO" = true ]; then
-        git clone ${OCIO_SOURCE_REPO[0]} $_src
-      else
-        download OCIO_SOURCE[@] $_src.tar.gz
-        INFO "Unpacking OpenColorIO-$OCIO_VERSION"
-        tar -C $SRC --transform "s,(.*/?)imageworks-OpenColorIO[^/]*(.*),\1OpenColorIO-$OCIO_VERSION\2,x" \
-            -xf $_src.tar.gz
-      fi
-
+      INFO "Unpacking OpenColorIO-$OCIO_VERSION"
+      tar -C $SRC --transform "s,(.*/?)imageworks-OpenColorIO[^/]*(.*),\1OpenColorIO-$OCIO_VERSION\2,x" \
+          -xf $_src.tar.gz
     fi
 
     cd $_src
-
-    if [ "$OCIO_USE_REPO" = true ]; then
-      # XXX For now, always update from latest repo...
-      git pull origin master
-      git checkout $OCIO_SOURCE_REPO_UID
-      git reset --hard
-    fi
-
     # Always refresh the whole build!
     if [ -d build ]; then
       rm -rf build
@@ -1526,6 +1460,7 @@ compile_OPENEXR() {
     if [ "$OPENEXR_USE_REPO" = true ]; then
       # XXX For now, always update from latest repo...
       git pull origin master
+      # Stick to same rev as windows' libs...
       git checkout $OPENEXR_SOURCE_REPO_UID
       git reset --hard
       oiio_src_path="../OpenEXR"
@@ -1603,7 +1538,7 @@ compile_OIIO() {
   fi
 
   # To be changed each time we make edits that would modify the compiled result!
-  oiio_magic=17
+  oiio_magic=16
   _init_oiio
 
   # Clean install if needed!
@@ -1667,9 +1602,6 @@ compile_OIIO() {
       INFO "ILMBASE_HOME=$INST/openexr"
     fi
 
-    # ptex is only needed when nicholas bishop is ready
-    cmake_d="$cmake_d -D USE_PTEX=OFF"
-
     # Optional tests and cmd tools
     cmake_d="$cmake_d -D USE_QT=OFF"
     cmake_d="$cmake_d -D USE_PYTHON=OFF"
@@ -1690,10 +1622,6 @@ compile_OIIO() {
 #    fi
     cmake_d="$cmake_d -D USE_OCIO=OFF"
 
-    if [ "$USE_CXX11" = true ]; then
-      cmake_d="$cmake_d -D OIIO_BUILD_CPP11=ON"
-    fi
-
     if file /bin/cp | grep -q '32-bit'; then
       cflags="-fPIC -m32 -march=i686"
     else
@@ -1905,9 +1833,6 @@ compile_OSL() {
     cmake_d="$cmake_d -D OSL_BUILD_PLUGINS=OFF"
     cmake_d="$cmake_d -D OSL_BUILD_TESTS=OFF"
     cmake_d="$cmake_d -D USE_SIMD=sse2"
-    if [ "$USE_CXX11" = true ]; then
-        cmake_d="$cmake_d -D OSL_BUILD_CPP11=1"
-    fi
 
     #~ cmake_d="$cmake_d -D ILMBASE_VERSION=$ILMBASE_VERSION"
 
@@ -2266,6 +2191,9 @@ compile_ALEMBIC() {
     return
   fi
 
+  compile_HDF5
+  PRINT ""
+
   # To be changed each time we make edits that would modify the compiled result!
   alembic_magic=2
   _init_alembic
@@ -2293,16 +2221,8 @@ compile_ALEMBIC() {
 
     cmake_d="-D CMAKE_INSTALL_PREFIX=$_inst"
 
-    # Without Boost or TR1, Alembic requires C++11.
-    if [ "$USE_CXX11" != true ]; then
-      cmake_d="$cmake_d -D ALEMBIC_LIB_USES_BOOST=ON"
-      cmake_d="$cmake_d -D ALEMBIC_LIB_USES_TR1=OFF"
-    fi
-
     if [ -d $INST/boost ]; then
-      if [ -d $INST/boost ]; then
-        cmake_d="$cmake_d -D BOOST_ROOT=$INST/boost"
-      fi
+      cmake_d="$cmake_d -D BOOST_ROOT=$INST/boost"
       cmake_d="$cmake_d -D USE_STATIC_BOOST=ON"
     else
       cmake_d="$cmake_d -D USE_STATIC_BOOST=OFF"
@@ -2320,6 +2240,8 @@ compile_ALEMBIC() {
       cmake_d="$cmake_d -D USE_STATIC_HDF5=OFF"
       cmake_d="$cmake_d -D ALEMBIC_ILMBASE_LINK_STATIC=OFF"
       cmake_d="$cmake_d -D ALEMBIC_SHARED_LIBS=OFF"
+      cmake_d="$cmake_d -D ALEMBIC_LIB_USES_BOOST=ON"
+      cmake_d="$cmake_d -D ALEMBIC_LIB_USES_TR1=OFF"
       INFO "ILMBASE_ROOT=$INST/openexr"
     fi
 
@@ -2513,7 +2435,7 @@ compile_FFmpeg() {
         --enable-avfilter --disable-vdpau \
         --disable-bzlib --disable-libgsm --disable-libspeex \
         --enable-pthreads --enable-zlib --enable-stripping --enable-runtime-cpudetect \
-        --disable-vaapi --disable-nonfree --enable-gpl \
+        --disable-vaapi --disable-libfaac --disable-nonfree --enable-gpl \
         --disable-postproc --disable-librtmp --disable-libopencore-amrnb \
         --disable-libopencore-amrwb --disable-libdc1394 --disable-version3 --disable-outdev=sdl \
         --disable-libxcb \
@@ -2631,6 +2553,7 @@ install_DEB() {
   fi
 
   # These libs should always be available in debian/ubuntu official repository...
+  OPENJPEG_DEV="libopenjpeg-dev"
   VORBIS_DEV="libvorbis-dev"
   OGG_DEV="libogg-dev"
   THEORA_DEV="libtheora-dev"
@@ -2638,24 +2561,15 @@ install_DEB() {
   _packages="gawk cmake cmake-curses-gui build-essential libjpeg-dev libpng-dev libtiff-dev \
              git libfreetype6-dev libx11-dev flex bison libtbb-dev libxxf86vm-dev \
              libxcursor-dev libxi-dev wget libsqlite3-dev libxrandr-dev libxinerama-dev \
-             libbz2-dev libncurses5-dev libssl-dev liblzma-dev libreadline-dev \
-             libopenal-dev libglew-dev yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV \
+             libbz2-dev libncurses5-dev libssl-dev liblzma-dev libreadline-dev $OPENJPEG_DEV \
+             libopenal-dev libglew-dev libglewmx-dev yasm $THEORA_DEV $VORBIS_DEV $OGG_DEV \
              libsdl1.2-dev libfftw3-dev patch bzip2 libxml2-dev libtinyxml-dev libjemalloc-dev"
-             # libglewmx-dev  (broken in deb testing currently...)
 
+  OPENJPEG_USE=true
   VORBIS_USE=true
   OGG_USE=true
   THEORA_USE=true
 
-  PRINT ""
-  # New Ubuntu crap (17.04 and more) have no openjpeg lib!
-  OPENJPEG_DEV="libopenjpeg-dev"
-  check_package_DEB $OPENJPEG_DEV
-  if [ $? -eq 0 ]; then
-    _packages="$_packages $OPENJPEG_DEV"
-    OPENJPEG_USE=true
-  fi
-
   PRINT ""
   # Some not-so-old distro (ubuntu 12.4) do not have it, do not fail in this case, just warn.
   YAMLCPP_DEV="libyaml-cpp-dev"
@@ -2668,7 +2582,7 @@ install_DEB() {
     PRINT ""
   fi
 
-  if [ "$WITH_JACK" = true ]; then
+  if [ "$WITH_ALL" = true ]; then
     _packages="$_packages libspnav-dev"
     # Only install jack if jack2 is not already installed!
     JACK="libjack-dev"
@@ -2817,7 +2731,7 @@ install_DEB() {
 
       boost_version=$(echo `get_package_version_DEB libboost-dev` | sed -r 's/^([0-9]+\.[0-9]+).*/\1/')
 
-      install_packages_DEB libboost-{filesystem,iostreams,locale,regex,system,thread,wave,program-options}$boost_version-dev
+      install_packages_DEB libboost-{filesystem,iostreams,locale,regex,system,thread,wave}$boost_version-dev
       clean_Boost
     else
       compile_Boost
@@ -3205,7 +3119,7 @@ install_RPM() {
   if [ "$RPM" = "FEDORA" -o "$RPM" = "RHEL" ]; then
     _packages="$_packages freetype-devel tbb-devel"
 
-    if [ "$WITH_JACK" = true ]; then
+    if [ "$WITH_ALL" = true ]; then
       _packages="$_packages jack-audio-connection-kit-devel"
     fi
 
@@ -3679,11 +3593,7 @@ install_ARCH() {
   THEORA_USE=true
 
   if [ "$WITH_ALL" = true ]; then
-    _packages="$_packages libspnav"
-  fi
-
-  if [ "$WITH_JACK" = true ]; then
-    _packages="$_packages jack"
+    _packages="$_packages jack libspnav"
   fi
 
   PRINT ""
@@ -4087,6 +3997,9 @@ install_OTHER() {
   fi
 
   if [ "$_do_compile_llvm" = true ]; then
+    install_packages_DEB libffi-dev
+    # LLVM can't find the debian ffi header dir
+    _FFI_INCLUDE_DIR=`dpkg -L libffi-dev | grep -e ".*/ffi.h" | sed -r 's/(.*)\/ffi.h/\1/'`
     PRINT ""
     compile_LLVM
     have_llvm=true
@@ -4105,6 +4018,7 @@ install_OTHER() {
 
   if [ "$_do_compile_osl" = true ]; then
     if [ "$have_llvm" = true ]; then
+      install_packages_DEB flex bison libtbb-dev
       PRINT ""
       compile_OSL
     else
@@ -4123,6 +4037,7 @@ install_OTHER() {
   fi
 
   if [ "$_do_compile_osd" = true ]; then
+    install_packages_DEB flex bison libtbb-dev
     PRINT ""
     compile_OSD
   fi
@@ -4139,6 +4054,10 @@ install_OTHER() {
     fi
 
     if [ "$_do_compile_collada" = true ]; then
+      install_packages_DEB libpcre3-dev
+      # Find path to libxml shared lib...
+      _XML2_LIB=`dpkg -L libxml2-dev | grep -e ".*/libxml2.so"`
+      # No package
       PRINT ""
       compile_OpenCOLLADA
     fi
@@ -4223,6 +4142,16 @@ print_info_ffmpeglink() {
 }
 
 print_info() {
+  PRINT ""
+  PRINT ""
+  WARNING "****WARNING****"
+  PRINT "If you are experiencing issues building Blender, _*TRY A FRESH, CLEAN BUILD FIRST*_!"
+  PRINT "The same goes for install_deps itself, if you encounter issues, please first erase everything in $SRC and $INST"
+  PRINT "(provided obviously you did not add anything yourself in those dirs!), and run install_deps.sh again!"
+  PRINT "Often, changes in the libs built by this script, or in your distro package, cannot be handled simply, so..."
+  PRINT ""
+  PRINT "You may also try to use the '--build-foo' options to bypass your distribution's packages"
+  PRINT "for some troublesome/buggy libraries..."
   PRINT ""
   PRINT ""
   PRINT "Ran with:"
@@ -4235,12 +4164,6 @@ print_info() {
   _buildargs="$_buildargs -U *OPENCOLORIO* -U *OPENEXR* -U *OPENIMAGEIO* -U *LLVM* -U *CYCLES*"
   _buildargs="$_buildargs -U *OPENSUBDIV* -U *OPENVDB* -U *COLLADA* -U *FFMPEG* -U *ALEMBIC*"
 
-  if [ "$USE_CXX11" = true ]; then
-    _1="-D WITH_CXX11=ON"
-    PRINT "  $_1"
-    _buildargs="$_buildargs $_1"
-  fi
-
   _1="-D WITH_CODEC_SNDFILE=ON"
   PRINT "  $_1"
   _buildargs="$_buildargs $_1"
@@ -4296,7 +4219,7 @@ print_info() {
     PRINT "  $_3"
     _buildargs="$_buildargs $_1 $_2 $_3"
     if [ -d $INST/osl ]; then
-      _1="-D OSL_ROOT_DIR=$INST/osl"
+      _1="-D CYCLES_OSL=$INST/osl"
       PRINT "  $_1"
       _buildargs="$_buildargs $_1"
     fi
@@ -4345,14 +4268,6 @@ print_info() {
     _buildargs="$_buildargs $_1"
   fi
 
-  if [ "$WITH_JACK" = true ]; then
-    _1="-D WITH_JACK=ON"
-    _2="-D WITH_JACK_DYNLOAD=ON"
-    PRINT "  $_1"
-    PRINT "  $_2"
-    _buildargs="$_buildargs $_1 $_2"
-  fi
-
   if [ "$ALEMBIC_SKIP" = false ]; then
     _1="-D WITH_ALEMBIC=ON"
     PRINT "  $_1"
@@ -4412,6 +4327,3 @@ PRINT ""
 # Switch back to user language.
 LANG=LANG_BACK
 export LANG
-
-CXXFLAGS=$CXXFLAGS_BACK
-export CXXFLAGS

build_files/buildbot/config/blender_linux.cmake

@@ -70,7 +70,7 @@ set(FFMPEG_LIBRARIES
 )
 
 # SndFile libraries
-set(SNDFILE_LIBRARY          "/usr/lib${MULTILIB}/libsndfile.a;/usr/lib${MULTILIB}/libFLAC.a" CACHE STRING "" FORCE)
+set(SNDFILE_LIBRARY          "/usr/lib/libsndfile.a;/usr/lib/libFLAC.a" CACHE STRING "" FORCE)
 
 # OpenAL libraries
 set(OPENAL_ROOT_DIR           "/opt/lib/openal" CACHE STRING "" FORCE)
@@ -94,10 +94,6 @@ set(OPENCOLORIO_OPENCOLORIO_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libOpenColorIO.
 set(OPENCOLORIO_TINYXML_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libtinyxml.a"         CACHE STRING "" FORCE)
 set(OPENCOLORIO_YAML-CPP_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libyaml-cpp.a"       CACHE STRING "" FORCE)
 
-# Freetype
-set(FREETYPE_INCLUDE_DIRS "/usr/include/freetype2"       CACHE STRING "" FORCE)
-set(FREETYPE_LIBRARY "/usr/lib${MULTILIB}/libfreetype.a" CACHE STRING "" FORCE)
-
 # OpenImageIO
 if(GLIBC EQUAL "2.19")
 	set(OPENIMAGEIO_LIBRARY
@@ -106,7 +102,6 @@ if(GLIBC EQUAL "2.19")
 		/usr/lib${MULTILIB}/libwebp.a
 		/usr/lib${MULTILIB}/liblzma.a
 		/usr/lib${MULTILIB}/libjbig.a
-		${FREETYPE_LIBRARY}
 		CACHE STRING "" FORCE
 	)
 endif()

build_files/buildbot/config/blender_linux_player.cmake

@@ -1,4 +1,4 @@
-# This is applied as an override on top of blender_linux.config
+# This is applied as an ovveride on top of blender_linux.config
 # Disables all the areas which are not needed for the player.
 set(WITH_COMPOSITOR          OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)

build_files/buildbot/master.cfg

@@ -4,10 +4,10 @@
 # <pep8 compliant>
 
 # List of the branches being built automatically overnight
-NIGHT_SCHEDULE_BRANCHES = [None, "blender2.8"]
+NIGHT_SCHEDULE_BRANCHES = [None]
 
 # List of the branches available for force build
-FORCE_SCHEDULE_BRANCHES = ["master", "blender2.8", "experimental-build"]
+FORCE_SCHEDULE_BRANCHES = ["master", "gooseberry", "experimental-build"]
 
 """
 Stock Twisted directory lister doesn't provide any information about last file
@@ -94,7 +94,6 @@ all_repositories = {
     r'git://git.blender.org/blender-translations.git': 'blender-translations',
     r'git://git.blender.org/blender-addons.git': 'blender-addons',
     r'git://git.blender.org/blender-addons-contrib.git': 'blender-addons-contrib',
-    r'git://git.blender.org/blender-dev-tools.git': 'blender-dev-tools',
     r'https://svn.blender.org/svnroot/bf-blender/': 'lib svn',
 }
 
@@ -127,16 +126,8 @@ def schedule_force_build(name):
                 project=forcesched.FixedParameter(name="project", default="", hide=True)),
             # For now, hide other codebases.
             forcesched.CodebaseParameter(hide=True, codebase="blender-translations"),
-            forcesched.CodebaseParameter(
-                codebase="blender-addons",
-                branch=forcesched.ChoiceStringParameter(
-                    name="branch", choices=["master", "blender2.8"], default="master"),
-                repository=forcesched.FixedParameter(name="repository", default="", hide=True),
-                project=forcesched.FixedParameter(name="project", default="", hide=True),
-                revision=forcesched.FixedParameter(name="revision", default="", hide=True),
-            ),
+            forcesched.CodebaseParameter(hide=True, codebase="blender-addons"),
             forcesched.CodebaseParameter(hide=True, codebase="blender-addons-contrib"),
-            forcesched.CodebaseParameter(hide=True, codebase="blender-dev-tools"),
             forcesched.CodebaseParameter(hide=True, codebase="lib svn")],
         properties=[]))
 
@@ -146,17 +137,12 @@ def schedule_build(name, hour, minute=0):
         scheduler_name = "nightly " + name
         if current_branch:
             scheduler_name += ' ' + current_branch
-        # Use special addons submodule branch when building blender2.8 branch.
-        addons_branch = "master"
-        if current_branch == "blender2.8":
-            addons_branch = "blender2.8"
         c['schedulers'].append(timed.Nightly(name=scheduler_name,
             codebases={
                 "blender": {"repository": ""},
                 "blender-translations": {"repository": "", "branch": "master"},
-                "blender-addons": {"repository": "", "branch": addons_branch},
+                "blender-addons": {"repository": "", "branch": "master"},
                 "blender-addons-contrib": {"repository": "", "branch": "master"},
-                "blender-dev-tools": {"repository": "", "branch": "master"},
                 "lib svn": {"repository": "", "branch": "trunk"}},
             branch=current_branch,
             builderNames=[name],
@@ -236,7 +222,8 @@ def git_step(branch=''):
 
 
 def git_submodules_update():
-    command = ['git', 'submodule', 'update', '--remote']
+    command = ['git', 'submodule', 'foreach', '--recursive',
+               'git', 'pull', 'origin', 'master']
     return ShellCommand(name='Submodules Update',
                         command=command,
                         description='updating',
@@ -245,10 +232,7 @@ def git_submodules_update():
 
 
 def lib_svn_step(dir):
-    name = "lib svn"
-    if dir == "darwin":
-        name = "C++11 lib svn"
-    return SVN(name=name,
+    return SVN(name='lib svn',
                baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir,
                codebase='lib svn',
                mode='update',
@@ -277,14 +261,10 @@ def generic_builder(id, libdir='', branch='', rsync=False):
     f = BuildFactory()
     if libdir != '':
         f.addStep(lib_svn_step(libdir))
-        # Special trick to make sure we always have all the libs.
-        if libdir.startswith("darwin"):
-            f.addStep(lib_svn_step("darwin"))
 
     for submodule in ('blender-translations',
                       'blender-addons',
-                      'blender-addons-contrib',
-                      'blender-dev-tools'):
+                      'blender-addons-contrib'):
         f.addStep(git_submodule_step(submodule))
 
     f.addStep(git_step(branch))
@@ -302,7 +282,7 @@ def generic_builder(id, libdir='', branch='', rsync=False):
         f.addStep(FileUpload(name='upload',
                              slavesrc='buildbot_upload.zip',
                              masterdest=filename,
-                             maxsize=180 * 1024 * 1024,
+                             maxsize=150 * 1024 * 1024,
                              workdir='install'))
     f.addStep(MasterShellCommand(name='unpack',
                                  command=['python2.7', unpack_script, filename],
@@ -313,14 +293,13 @@ def generic_builder(id, libdir='', branch='', rsync=False):
 # Builders
 
 add_builder(c, 'mac_x86_64_10_6_cmake', 'darwin-9.x.universal', generic_builder, hour=5)
-# add_builder(c, 'linux_glibc211_i686_cmake', '', generic_builder, hour=1)
-# add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2)
+add_builder(c, 'linux_glibc211_i686_cmake', '', generic_builder, hour=1)
+add_builder(c, 'linux_glibc211_x86_64_cmake', '', generic_builder, hour=2)
 add_builder(c, 'linux_glibc219_i686_cmake', '', generic_builder, hour=3)
 add_builder(c, 'linux_glibc219_x86_64_cmake', '', generic_builder, hour=4)
 add_builder(c, 'win32_cmake_vc2013', 'windows_vc12', generic_builder, hour=3)
 add_builder(c, 'win64_cmake_vc2013', 'win64_vc12', generic_builder, hour=4)
-add_builder(c, 'win32_cmake_vc2015', 'windows_vc14', generic_builder, hour=5)
-add_builder(c, 'win64_cmake_vc2015', 'win64_vc14', generic_builder, hour=6)
+add_builder(c, 'win64_cmake_vc2015', 'win64_vc14', generic_builder, hour=5)
 
 # STATUS TARGETS
 #

build_files/buildbot/master_unpack.py

@@ -49,7 +49,7 @@ def get_platform(filename):
     tokens = filename.split("-")
     platforms = ('osx', 'mac', 'bsd',
                  'win', 'linux', 'source',
-                 'irix', 'solaris')
+                 'irix', 'solaris', 'mingw')
     platform_tokens = []
     found = False
 
@@ -67,9 +67,6 @@ def get_platform(filename):
 
 
 def get_branch(filename):
-    if filename.startswith("blender-2.8"):
-        return "blender2.8"
-
     tokens = filename.split("-")
     branch = ""
 

build_files/buildbot/slave_compile.py

@@ -72,12 +72,8 @@ if 'cmake' in builder:
         # Set up OSX architecture
         if builder.endswith('x86_64_10_6_cmake'):
             cmake_extra_options.append('-DCMAKE_OSX_ARCHITECTURES:STRING=x86_64')
-        cmake_extra_options.append('-DWITH_CODEC_QUICKTIME=OFF')
-        cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.6')
-        cmake_extra_options.append('-DCUDA_HOST_COMPILER=/usr/local/cuda-hack/clang')
-        cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/nvcc')
-
-
+        cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-hack/bin/nvcc')
+        cmake_extra_options.append('-DCUDA_NVCC8_EXECUTABLE=/usr/local/cuda8-hack/bin/nvcc')
 
     elif builder.startswith('win'):
         if builder.endswith('_vc2015'):
@@ -94,6 +90,8 @@ if 'cmake' in builder:
             elif builder.startswith('win32'):
                 bits = 32
                 cmake_options.extend(['-G', 'Visual Studio 12 2013'])
+        cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE:FILEPATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v7.5/bin/nvcc.exe')
+        cmake_extra_options.append('-DCUDA_NVCC8_EXECUTABLE:FILEPATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v8.0/bin/nvcc.exe')
 
     elif builder.startswith('linux'):
         tokens = builder.split("_")
@@ -112,8 +110,9 @@ if 'cmake' in builder:
             chroot_name = 'buildbot_' + deb_name + '_i686'
             cuda_chroot_name = 'buildbot_' + deb_name + '_x86_64'
             targets = ['player', 'blender', 'cuda']
-        cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7",
-                                    "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"])
+
+        cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE=/usr/local/cuda-7.5/bin/nvcc')
+        cmake_extra_options.append('-DCUDA_NVCC8_EXECUTABLE=/usr/local/cuda-8.0/bin/nvcc')
 
     cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file))
 
@@ -180,11 +179,13 @@ if 'cmake' in builder:
             os.remove('CMakeCache.txt')
         retcode = subprocess.call(target_chroot_prefix + ['cmake', blender_dir] + target_cmake_options)
         if retcode != 0:
-            print('Configuration FAILED!')
+            print('Condifuration FAILED!')
             sys.exit(retcode)
 
-        if 'win32' in builder or 'win64' in builder:
-            command = ['cmake', '--build', '.', '--target', target_name, '--config', 'Release']
+        if 'win32' in builder:
+            command = ['msbuild', 'INSTALL.vcxproj', '/Property:PlatformToolset=v120_xp', '/p:Configuration=Release']
+        elif 'win64' in builder:
+            command = ['msbuild', 'INSTALL.vcxproj', '/p:Configuration=Release']
         else:
             command = target_chroot_prefix + ['make', '-s', '-j2', target_name]
 

build_files/buildbot/slave_pack.py

@@ -111,8 +111,7 @@ if builder.find('cmake') != -1:
         if builder.endswith('vc2015'):
             platform += "-vc14"
         builderified_name = 'blender-{}-{}-{}'.format(blender_full_version, git_hash, platform)
-        # NOTE: Blender 2.8 is already respected by blender_full_version.
-        if branch != '' and branch != 'blender2.8':
+        if branch != '':
             builderified_name = branch + "-" + builderified_name
 
         os.rename(result_file, "{}.zip".format(builderified_name))
@@ -178,8 +177,7 @@ if builder.find('cmake') != -1:
                                                       blender_hash,
                                                       blender_glibc,
                                                       blender_arch)
-        # NOTE: Blender 2.8 is already respected by blender_full_version.
-        if branch != '' and branch != 'blender2.8':
+        if branch != '':
             package_name = branch + "-" + package_name
 
         upload_filename = package_name + ".tar.bz2"

build_files/cmake/Modules/FindGflags.cmake

@@ -1,603 +0,0 @@
-# Ceres Solver - A fast non-linear least squares minimizer
-# Copyright 2015 Google Inc. All rights reserved.
-# http://ceres-solver.org/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of Google Inc. nor the names of its contributors may be
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: alexs.mac@gmail.com (Alex Stewart)
-#
-
-# FindGflags.cmake - Find Google gflags logging library.
-#
-# This module will attempt to find gflags, either via an exported CMake
-# configuration (generated by gflags >= 2.1 which are built with CMake), or
-# by performing a standard search for all gflags components.  The order of
-# precedence for these two methods of finding gflags is controlled by:
-# GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION.
-#
-# This module defines the following variables:
-#
-# GFLAGS_FOUND: TRUE iff gflags is found.
-# GFLAGS_INCLUDE_DIRS: Include directories for gflags.
-# GFLAGS_LIBRARIES: Libraries required to link gflags.
-# GFLAGS_NAMESPACE: The namespace in which gflags is defined.  In versions of
-#                   gflags < 2.1, this was google, for versions >= 2.1 it is
-#                   by default gflags, although can be configured when building
-#                   gflags to be something else (i.e. google for legacy
-#                   compatibility).
-#
-# The following variables control the behaviour of this module when an exported
-# gflags CMake configuration is not found.
-#
-# GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION: TRUE/FALSE, iff TRUE then
-#                           then prefer using an exported CMake configuration
-#                           generated by gflags >= 2.1 over searching for the
-#                           gflags components manually.  Otherwise (FALSE)
-#                           ignore any exported gflags CMake configurations and
-#                           always perform a manual search for the components.
-#                           Default: TRUE iff user does not define this variable
-#                           before we are called, and does NOT specify either
-#                           GFLAGS_INCLUDE_DIR_HINTS or GFLAGS_LIBRARY_DIR_HINTS
-#                           otherwise FALSE.
-# GFLAGS_INCLUDE_DIR_HINTS: List of additional directories in which to
-#                           search for gflags includes, e.g: /timbuktu/include.
-# GFLAGS_LIBRARY_DIR_HINTS: List of additional directories in which to
-#                           search for gflags libraries, e.g: /timbuktu/lib.
-# GFLAGS_ROOT_DIR,          The base directory to search for Gflags.
-#                           This can also be an environment variable.
-#
-# The following variables are also defined by this module, but in line with
-# CMake recommended FindPackage() module style should NOT be referenced directly
-# by callers (use the plural variables detailed above instead).  These variables
-# do however affect the behaviour of the module via FIND_[PATH/LIBRARY]() which
-# are NOT re-called (i.e. search for library is not repeated) if these variables
-# are set with valid values _in the CMake cache_. This means that if these
-# variables are set directly in the cache, either by the user in the CMake GUI,
-# or by the user passing -DVAR=VALUE directives to CMake when called (which
-# explicitly defines a cache variable), then they will be used verbatim,
-# bypassing the HINTS variables and other hard-coded search locations.
-#
-# GFLAGS_INCLUDE_DIR: Include directory for gflags, not including the
-#                     include directory of any dependencies.
-# GFLAGS_LIBRARY: gflags library, not including the libraries of any
-#                 dependencies.
-
-# If GFLAGS_ROOT_DIR was defined in the environment, use it.
-if(NOT GFLAGS_ROOT_DIR AND NOT $ENV{GFLAGS_ROOT_DIR} STREQUAL "")
-  set(GFLAGS_ROOT_DIR $ENV{GFLAGS_ROOT_DIR})
-endif()
-
-if(DEFINED GFLAGS_ROOT_DIR)
-  set(GFLAGS_ROOT_DIR_INCLUDE "${GFLAGS_ROOT_DIR}/include")
-  set(GFLAGS_ROOT_DIR_LIB "${GFLAGS_ROOT_DIR}/lib")
-endif()
-
-# Reset CALLERS_CMAKE_FIND_LIBRARY_PREFIXES to its value when FindGflags was
-# invoked, necessary for MSVC.
-macro(GFLAGS_RESET_FIND_LIBRARY_PREFIX)
-  if(MSVC)
-    set(CMAKE_FIND_LIBRARY_PREFIXES "${CALLERS_CMAKE_FIND_LIBRARY_PREFIXES}")
-  endif()
-endmacro()
-
-# Called if we failed to find gflags or any of it's required dependencies,
-# unsets all public (designed to be used externally) variables and reports
-# error message at priority depending upon [REQUIRED/QUIET/<NONE>] argument.
-macro(GFLAGS_REPORT_NOT_FOUND REASON_MSG)
-  unset(GFLAGS_FOUND)
-  unset(GFLAGS_INCLUDE_DIRS)
-  unset(GFLAGS_LIBRARIES)
-  # Do not use unset, as we want to keep GFLAGS_NAMESPACE in the cache,
-  # but simply clear its value.
-  set(GFLAGS_NAMESPACE "" CACHE STRING
-    "gflags namespace (google or gflags)" FORCE)
-
-  # Make results of search visible in the CMake GUI if gflags has not
-  # been found so that user does not have to toggle to advanced view.
-  mark_as_advanced(CLEAR GFLAGS_INCLUDE_DIR
-                         GFLAGS_LIBRARY
-                         GFLAGS_NAMESPACE)
-
-  gflags_reset_find_library_prefix()
-
-  # Note <package>_FIND_[REQUIRED/QUIETLY] variables defined by FindPackage()
-  # use the camelcase library name, not uppercase.
-  if(Gflags_FIND_QUIETLY)
-    message(STATUS "Failed to find gflags - " ${REASON_MSG} ${ARGN})
-  elseif(Gflags_FIND_REQUIRED)
-    message(FATAL_ERROR "Failed to find gflags - " ${REASON_MSG} ${ARGN})
-  else()
-    # Neither QUIETLY nor REQUIRED, use no priority which emits a message
-    # but continues configuration and allows generation.
-    message("-- Failed to find gflags - " ${REASON_MSG} ${ARGN})
-  endif()
-  return()
-endmacro()
-
-# Verify that all variable names passed as arguments are defined (can be empty
-# but must be defined) or raise a fatal error.
-macro(GFLAGS_CHECK_VARS_DEFINED)
-  foreach(CHECK_VAR ${ARGN})
-    if(NOT DEFINED ${CHECK_VAR})
-      message(FATAL_ERROR "Ceres Bug: ${CHECK_VAR} is not defined.")
-    endif()
-  endforeach()
-endmacro()
-
-# Use check_cxx_source_compiles() to compile trivial test programs to determine
-# the gflags namespace.  This works on all OSs except Windows.  If using Visual
-# Studio, it fails because msbuild forces check_cxx_source_compiles() to use
-# CMAKE_BUILD_TYPE=Debug for the test project, which usually breaks detection
-# because MSVC requires that the test project use the same build type as gflags,
-# which would normally be built in Release.
-#
-# Defines: GFLAGS_NAMESPACE in the caller's scope with the detected namespace,
-#          which is blank (empty string, will test FALSE is CMake conditionals)
-#          if detection failed.
-function(GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_TRY_COMPILE)
-  # Verify that all required variables are defined.
-  gflags_check_vars_defined(
-    GFLAGS_INCLUDE_DIR GFLAGS_LIBRARY)
-  # Ensure that GFLAGS_NAMESPACE is always unset on completion unless
-  # we explicitly set if after having the correct namespace.
-  set(GFLAGS_NAMESPACE "" PARENT_SCOPE)
-
-  include(CheckCXXSourceCompiles)
-  # Setup include path & link library for gflags for CHECK_CXX_SOURCE_COMPILES.
-  set(CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR})
-  set(CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARY} ${GFLAGS_LINK_LIBRARIES})
-  # First try the (older) google namespace.  Note that the output variable
-  # MUST be unique to the build type as otherwise the test is not repeated as
-  # it is assumed to have already been performed.
-  check_cxx_source_compiles(
-    "#include <gflags/gflags.h>
-     int main(int argc, char * argv[]) {
-       google::ParseCommandLineFlags(&argc, &argv, true);
-       return 0;
-     }"
-     GFLAGS_IN_GOOGLE_NAMESPACE)
-  if(GFLAGS_IN_GOOGLE_NAMESPACE)
-    set(GFLAGS_NAMESPACE google PARENT_SCOPE)
-    return()
-  endif()
-
-  # Try (newer) gflags namespace instead.  Note that the output variable
-  # MUST be unique to the build type as otherwise the test is not repeated as
-  # it is assumed to have already been performed.
-  set(CMAKE_REQUIRED_INCLUDES ${GFLAGS_INCLUDE_DIR})
-  set(CMAKE_REQUIRED_LIBRARIES ${GFLAGS_LIBRARY} ${GFLAGS_LINK_LIBRARIES})
-  check_cxx_source_compiles(
-    "#include <gflags/gflags.h>
-     int main(int argc, char * argv[]) {
-        gflags::ParseCommandLineFlags(&argc, &argv, true);
-        return 0;
-     }"
-     GFLAGS_IN_GFLAGS_NAMESPACE)
-  if(GFLAGS_IN_GFLAGS_NAMESPACE)
-    set(GFLAGS_NAMESPACE gflags PARENT_SCOPE)
-    return()
-  endif()
-endfunction()
-
-# Use regex on the gflags headers to attempt to determine the gflags namespace.
-# Checks both gflags.h (contained namespace on versions < 2.1.2) and
-# gflags_declare.h, which contains the namespace on versions >= 2.1.2.
-# In general, this method should only be used when
-# GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_TRY_COMPILE() cannot be used, or has
-# failed.
-#
-# Defines: GFLAGS_NAMESPACE in the caller's scope with the detected namespace,
-#          which is blank (empty string, will test FALSE is CMake conditionals)
-#          if detection failed.
-function(GFLAGS_CHECK_GFLAGS_NAMESPACE_USING_REGEX)
-  # Verify that all required variables are defined.
-  gflags_check_vars_defined(GFLAGS_INCLUDE_DIR)
-  # Ensure that GFLAGS_NAMESPACE is always undefined on completion unless
-  # we explicitly set if after having the correct namespace.
-  set(GFLAGS_NAMESPACE "" PARENT_SCOPE)
-
-  # Scan gflags.h to identify what namespace gflags was built with.  On
-  # versions of gflags < 2.1.2, gflags.h was configured with the namespace
-  # directly, on >= 2.1.2, gflags.h uses the GFLAGS_NAMESPACE #define which
-  # is defined in gflags_declare.h, we try each location in turn.
-  set(GFLAGS_HEADER_FILE ${GFLAGS_INCLUDE_DIR}/gflags/gflags.h)
-  if(NOT EXISTS ${GFLAGS_HEADER_FILE})
-    gflags_report_not_found(
-      "Could not find file: ${GFLAGS_HEADER_FILE} "
-      "containing namespace information in gflags install located at: "
-      "${GFLAGS_INCLUDE_DIR}.")
-  endif()
-  file(READ ${GFLAGS_HEADER_FILE} GFLAGS_HEADER_FILE_CONTENTS)
-
-  string(REGEX MATCH "namespace [A-Za-z]+"
-    GFLAGS_NAMESPACE "${GFLAGS_HEADER_FILE_CONTENTS}")
-  string(REGEX REPLACE "namespace ([A-Za-z]+)" "\\1"
-    GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}")
-
-  if(NOT GFLAGS_NAMESPACE)
-    gflags_report_not_found(
-      "Failed to extract gflags namespace from header file: "
-      "${GFLAGS_HEADER_FILE}.")
-  endif()
-
-  if(GFLAGS_NAMESPACE STREQUAL "google" OR
-     GFLAGS_NAMESPACE STREQUAL "gflags")
-    # Found valid gflags namespace from gflags.h.
-    set(GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}" PARENT_SCOPE)
-    return()
-  endif()
-
-  # Failed to find gflags namespace from gflags.h, gflags is likely a new
-  # version, check gflags_declare.h, which in newer versions (>= 2.1.2) contains
-  # the GFLAGS_NAMESPACE #define, which is then referenced in gflags.h.
-  set(GFLAGS_DECLARE_FILE ${GFLAGS_INCLUDE_DIR}/gflags/gflags_declare.h)
-  if(NOT EXISTS ${GFLAGS_DECLARE_FILE})
-    gflags_report_not_found(
-      "Could not find file: ${GFLAGS_DECLARE_FILE} "
-      "containing namespace information in gflags install located at: "
-      "${GFLAGS_INCLUDE_DIR}.")
-  endif()
-  file(READ ${GFLAGS_DECLARE_FILE} GFLAGS_DECLARE_FILE_CONTENTS)
-
-  string(REGEX MATCH "#define GFLAGS_NAMESPACE [A-Za-z]+"
-    GFLAGS_NAMESPACE "${GFLAGS_DECLARE_FILE_CONTENTS}")
-  string(REGEX REPLACE "#define GFLAGS_NAMESPACE ([A-Za-z]+)" "\\1"
-    GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}")
-
-  if(NOT GFLAGS_NAMESPACE)
-    gflags_report_not_found(
-      "Failed to extract gflags namespace from declare file: "
-      "${GFLAGS_DECLARE_FILE}.")
-  endif()
-
-  if(GFLAGS_NAMESPACE STREQUAL "google" OR
-     GFLAGS_NAMESPACE STREQUAL "gflags")
-    # Found valid gflags namespace from gflags.h.
-    set(GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}" PARENT_SCOPE)
-    return()
-  endif()
-endfunction()
-
-# -----------------------------------------------------------------
-# By default, if the user has expressed no preference for using an exported
-# gflags CMake configuration over performing a search for the installed
-# components, and has not specified any hints for the search locations, then
-# prefer a gflags exported configuration if available.
-if(NOT DEFINED GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION
-   AND NOT GFLAGS_INCLUDE_DIR_HINTS
-   AND NOT GFLAGS_LIBRARY_DIR_HINTS)
-  message(STATUS "No preference for use of exported gflags CMake configuration "
-    "set, and no hints for include/library directories provided. "
-    "Defaulting to preferring an installed/exported gflags CMake configuration "
-    "if available.")
-  set(GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION TRUE)
-endif()
-
-if(GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION)
-  # Try to find an exported CMake configuration for gflags, as generated by
-  # gflags versions >= 2.1.
-  #
-  # We search twice, s/t we can invert the ordering of precedence used by
-  # find_package() for exported package build directories, and installed
-  # packages (found via CMAKE_SYSTEM_PREFIX_PATH), listed as items 6) and 7)
-  # respectively in [1].
-  #
-  # By default, exported build directories are (in theory) detected first, and
-  # this is usually the case on Windows.  However, on OS X & Linux, the install
-  # path (/usr/local) is typically present in the PATH environment variable
-  # which is checked in item 4) in [1] (i.e. before both of the above, unless
-  # NO_SYSTEM_ENVIRONMENT_PATH is passed).  As such on those OSs installed
-  # packages are usually detected in preference to exported package build
-  # directories.
-  #
-  # To ensure a more consistent response across all OSs, and as users usually
-  # want to prefer an installed version of a package over a locally built one
-  # where both exist (esp. as the exported build directory might be removed
-  # after installation), we first search with NO_CMAKE_PACKAGE_REGISTRY which
-  # means any build directories exported by the user are ignored, and thus
-  # installed directories are preferred.  If this fails to find the package
-  # we then research again, but without NO_CMAKE_PACKAGE_REGISTRY, so any
-  # exported build directories will now be detected.
-  #
-  # To prevent confusion on Windows, we also pass NO_CMAKE_BUILDS_PATH (which
-  # is item 5) in [1]), to not preferentially use projects that were built
-  # recently with the CMake GUI to ensure that we always prefer an installed
-  # version if available.
-  #
-  # [1] http://www.cmake.org/cmake/help/v2.8.11/cmake.html#command:find_package
-  find_package(gflags QUIET
-                      NO_MODULE
-                      NO_CMAKE_PACKAGE_REGISTRY
-                      NO_CMAKE_BUILDS_PATH)
-  if(gflags_FOUND)
-    message(STATUS "Found installed version of gflags: ${gflags_DIR}")
-  else()
-    # Failed to find an installed version of gflags, repeat search allowing
-    # exported build directories.
-    message(STATUS "Failed to find installed gflags CMake configuration, "
-      "searching for gflags build directories exported with CMake.")
-    # Again pass NO_CMAKE_BUILDS_PATH, as we know that gflags is exported and
-    # do not want to treat projects built with the CMake GUI preferentially.
-    find_package(gflags QUIET
-                        NO_MODULE
-                        NO_CMAKE_BUILDS_PATH)
-    if(gflags_FOUND)
-      message(STATUS "Found exported gflags build directory: ${gflags_DIR}")
-    endif()
-  endif()
-
-  set(FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION ${gflags_FOUND})
-
-  # gflags v2.1 - 2.1.2 shipped with a bug in their gflags-config.cmake [1]
-  # whereby gflags_LIBRARIES = "gflags", but there was no imported target
-  # called "gflags", they were called: gflags[_nothreads]-[static/shared].
-  # As this causes linker errors when gflags is not installed in a location
-  # on the current library paths, detect if this problem is present and
-  # fix it.
-  #
-  # [1] https://github.com/gflags/gflags/issues/110
-  if(gflags_FOUND)
-    # NOTE: This is not written as additional conditions in the outer
-    #       if(gflags_FOUND) as the NOT TARGET "${gflags_LIBRARIES}"
-    #       condition causes problems if gflags is not found.
-    if(${gflags_VERSION} VERSION_LESS 2.1.3 AND
-        NOT TARGET "${gflags_LIBRARIES}")
-      message(STATUS "Detected broken gflags install in: ${gflags_DIR}, "
-        "version: ${gflags_VERSION} <= 2.1.2 which defines gflags_LIBRARIES = "
-        "${gflags_LIBRARIES} which is not an imported CMake target, see: "
-        "https://github.com/gflags/gflags/issues/110.  Attempting to fix by "
-        "detecting correct gflags target.")
-      # Ordering here expresses preference for detection, specifically we do not
-      # want to use the _nothreads variants if the full library is available.
-      list(APPEND CHECK_GFLAGS_IMPORTED_TARGET_NAMES
-        gflags-shared gflags-static
-        gflags_nothreads-shared gflags_nothreads-static)
-      foreach(CHECK_GFLAGS_TARGET ${CHECK_GFLAGS_IMPORTED_TARGET_NAMES})
-        if(TARGET ${CHECK_GFLAGS_TARGET})
-          message(STATUS "Found valid gflags target: ${CHECK_GFLAGS_TARGET}, "
-            "updating gflags_LIBRARIES.")
-          set(gflags_LIBRARIES ${CHECK_GFLAGS_TARGET})
-          break()
-        endif()
-      endforeach()
-      if(NOT TARGET ${gflags_LIBRARIES})
-        message(STATUS "Failed to fix detected broken gflags install in: "
-          "${gflags_DIR}, version: ${gflags_VERSION} <= 2.1.2, none of the "
-          "imported targets for gflags: ${CHECK_GFLAGS_IMPORTED_TARGET_NAMES} "
-          "are defined.  Will continue with a manual search for gflags "
-          "components.  We recommend you build/install a version of gflags > "
-          "2.1.2 (or master).")
-        set(FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION FALSE)
-      endif()
-    endif()
-  endif()
-
-  if(FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION)
-    message(STATUS "Detected gflags version: ${gflags_VERSION}")
-    set(GFLAGS_FOUND ${gflags_FOUND})
-    set(GFLAGS_INCLUDE_DIR ${gflags_INCLUDE_DIR})
-    set(GFLAGS_LIBRARY ${gflags_LIBRARIES})
-
-    # gflags does not export the namespace in their CMake configuration, so
-    # use our function to determine what it should be, as it can be either
-    # gflags or google dependent upon version & configuration.
-    #
-    # NOTE: We use the regex method to determine the namespace here, as
-    #       check_cxx_source_compiles() will not use imported targets, which
-    #       is what gflags will be in this case.
-    gflags_check_gflags_namespace_using_regex()
-
-    if(NOT GFLAGS_NAMESPACE)
-      gflags_report_not_found(
-        "Failed to determine gflags namespace using regex for gflags "
-        "version: ${gflags_VERSION} exported here: ${gflags_DIR} using CMake.")
-    endif()
-  else()
-    message(STATUS "Failed to find an installed/exported CMake configuration "
-      "for gflags, will perform search for installed gflags components.")
-  endif()
-endif()
-
-if(NOT GFLAGS_FOUND)
-  # Either failed to find an exported gflags CMake configuration, or user
-  # told us not to use one.  Perform a manual search for all gflags components.
-
-  # Handle possible presence of lib prefix for libraries on MSVC, see
-  # also GFLAGS_RESET_FIND_LIBRARY_PREFIX().
-  if(MSVC)
-    # Preserve the caller's original values for CMAKE_FIND_LIBRARY_PREFIXES
-    # s/t we can set it back before returning.
-    set(CALLERS_CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES}")
-    # The empty string in this list is important, it represents the case when
-    # the libraries have no prefix (shared libraries / DLLs).
-    set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "" "${CMAKE_FIND_LIBRARY_PREFIXES}")
-  endif()
-
-  # Search user-installed locations first, so that we prefer user installs
-  # to system installs where both exist.
-  list(APPEND GFLAGS_CHECK_INCLUDE_DIRS
-    ${GFLAGS_ROOT_DIR_INCLUDE}
-    /usr/local/include
-    /usr/local/homebrew/include # Mac OS X
-    /opt/local/var/macports/software # Mac OS X.
-    /opt/local/include
-    /usr/include
-    /sw/include # Fink
-    /opt/csw/include # Blastwave
-    /opt/lib/gflags/include)
-
-  list(APPEND GFLAGS_CHECK_PATH_SUFFIXES
-    gflags/include # Windows (for C:/Program Files prefix).
-    gflags/Include) # Windows (for C:/Program Files prefix).
-
-  list(APPEND GFLAGS_CHECK_LIBRARY_DIRS
-    ${GFLAGS_ROOT_DIR_LIB}
-    /usr/local/lib
-    /usr/local/homebrew/lib # Mac OS X.
-    /opt/local/lib
-    /usr/lib
-    /sw/lib # Fink
-    /opt/csw/lib # Blastwave
-    /opt/lib/gflags/lib)
-  list(APPEND GFLAGS_CHECK_LIBRARY_SUFFIXES
-    gflags/lib # Windows (for C:/Program Files prefix).
-    gflags/Lib) # Windows (for C:/Program Files prefix).
-
-  # Search supplied hint directories first if supplied.
-  find_path(GFLAGS_INCLUDE_DIR
-    NAMES gflags/gflags.h
-    PATHS ${GFLAGS_INCLUDE_DIR_HINTS}
-    ${GFLAGS_CHECK_INCLUDE_DIRS}
-    PATH_SUFFIXES ${GFLAGS_CHECK_PATH_SUFFIXES})
-  if(NOT GFLAGS_INCLUDE_DIR OR
-      NOT EXISTS ${GFLAGS_INCLUDE_DIR})
-    gflags_report_not_found(
-      "Could not find gflags include directory, set GFLAGS_INCLUDE_DIR "
-      "to directory containing gflags/gflags.h")
-  endif(NOT GFLAGS_INCLUDE_DIR OR
-    NOT EXISTS ${GFLAGS_INCLUDE_DIR})
-
-  find_library(GFLAGS_LIBRARY NAMES gflags
-    PATHS ${GFLAGS_LIBRARY_DIR_HINTS}
-    ${GFLAGS_CHECK_LIBRARY_DIRS}
-    PATH_SUFFIXES ${GFLAGS_CHECK_LIBRARY_SUFFIXES})
-  if(NOT GFLAGS_LIBRARY OR
-      NOT EXISTS ${GFLAGS_LIBRARY})
-    gflags_report_not_found(
-      "Could not find gflags library, set GFLAGS_LIBRARY "
-      "to full path to libgflags.")
-  endif(NOT GFLAGS_LIBRARY OR
-    NOT EXISTS ${GFLAGS_LIBRARY})
-
-  # gflags typically requires a threading library (which is OS dependent), note
-  # that this defines the CMAKE_THREAD_LIBS_INIT variable.  If we are able to
-  # detect threads, we assume that gflags requires it.
-  find_package(Threads QUIET)
-  set(GFLAGS_LINK_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
-  # On Windows (including MinGW), the Shlwapi library is used by gflags if
-  # available.
-  if(WIN32)
-    include(CheckIncludeFileCXX)
-    check_include_file_cxx("shlwapi.h" HAVE_SHLWAPI)
-    if(HAVE_SHLWAPI)
-      list(APPEND GFLAGS_LINK_LIBRARIES shlwapi.lib)
-    endif()
-  endif()
-
-  # Mark internally as found, then verify. GFLAGS_REPORT_NOT_FOUND() unsets
-  # if called.
-  set(GFLAGS_FOUND TRUE)
-
-  # Identify what namespace gflags was built with.
-  if(GFLAGS_INCLUDE_DIR AND NOT GFLAGS_NAMESPACE)
-    # To handle Windows peculiarities / CMake bugs on MSVC we try two approaches
-    # to detect the gflags namespace:
-    #
-    # 1) Try to use check_cxx_source_compiles() to compile a trivial program
-    #    with the two choices for the gflags namespace.
-    #
-    # 2) [In the event 1) fails] Use regex on the gflags headers to try to
-    #    determine the gflags namespace.  Whilst this is less robust than 1),
-    #    it does avoid any interaction with msbuild.
-    gflags_check_gflags_namespace_using_try_compile()
-
-    if(NOT GFLAGS_NAMESPACE)
-      # Failed to determine gflags namespace using check_cxx_source_compiles()
-      # method, try and obtain it using regex on the gflags headers instead.
-      message(STATUS "Failed to find gflags namespace using using "
-        "check_cxx_source_compiles(), trying namespace regex instead, "
-        "this is expected on Windows.")
-      gflags_check_gflags_namespace_using_regex()
-
-      if(NOT GFLAGS_NAMESPACE)
-        gflags_report_not_found(
-          "Failed to determine gflags namespace either by "
-          "check_cxx_source_compiles(), or namespace regex.")
-      endif()
-    endif()
-  endif()
-
-  # Make the GFLAGS_NAMESPACE a cache variable s/t the user can view it, and could
-  # overwrite it in the CMake GUI.
-  set(GFLAGS_NAMESPACE "${GFLAGS_NAMESPACE}" CACHE STRING
-    "gflags namespace (google or gflags)" FORCE)
-
-  # gflags does not seem to provide any record of the version in its
-  # source tree, thus cannot extract version.
-
-  # Catch case when caller has set GFLAGS_NAMESPACE in the cache / GUI
-  # with an invalid value.
-  if(GFLAGS_NAMESPACE AND
-      NOT GFLAGS_NAMESPACE STREQUAL "google" AND
-      NOT GFLAGS_NAMESPACE STREQUAL "gflags")
-    gflags_report_not_found(
-      "Caller defined GFLAGS_NAMESPACE:"
-      " ${GFLAGS_NAMESPACE} is not valid, not google or gflags.")
-  endif()
-  # Catch case when caller has set GFLAGS_INCLUDE_DIR in the cache / GUI and
-  # thus FIND_[PATH/LIBRARY] are not called, but specified locations are
-  # invalid, otherwise we would report the library as found.
-  if(GFLAGS_INCLUDE_DIR AND
-      NOT EXISTS ${GFLAGS_INCLUDE_DIR}/gflags/gflags.h)
-    gflags_report_not_found(
-      "Caller defined GFLAGS_INCLUDE_DIR:"
-      " ${GFLAGS_INCLUDE_DIR} does not contain gflags/gflags.h header.")
-  endif(GFLAGS_INCLUDE_DIR AND
-    NOT EXISTS ${GFLAGS_INCLUDE_DIR}/gflags/gflags.h)
-  # TODO: This regex for gflags library is pretty primitive, we use lowercase
-  #       for comparison to handle Windows using CamelCase library names, could
-  #       this check be better?
-  string(TOLOWER "${GFLAGS_LIBRARY}" LOWERCASE_GFLAGS_LIBRARY)
-  if(GFLAGS_LIBRARY AND
-      NOT "${LOWERCASE_GFLAGS_LIBRARY}" MATCHES ".*gflags[^/]*")
-    gflags_report_not_found(
-      "Caller defined GFLAGS_LIBRARY: "
-      "${GFLAGS_LIBRARY} does not match gflags.")
-  endif(GFLAGS_LIBRARY AND
-    NOT "${LOWERCASE_GFLAGS_LIBRARY}" MATCHES ".*gflags[^/]*")
-
-  gflags_reset_find_library_prefix()
-
-endif()
-
-# Set standard CMake FindPackage variables if found.
-if(GFLAGS_FOUND)
-  set(GFLAGS_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIR})
-  set(GFLAGS_LIBRARIES ${GFLAGS_LIBRARY} ${GFLAGS_LINK_LIBRARIES})
-endif()
-
-# Handle REQUIRED / QUIET optional arguments.
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GFLAGS DEFAULT_MSG
-  GFLAGS_INCLUDE_DIRS GFLAGS_LIBRARIES GFLAGS_NAMESPACE)
-
-# Only mark internal variables as advanced if we found gflags, otherwise
-# leave them visible in the standard GUI for the user to set manually.
-if(GFLAGS_FOUND)
-  mark_as_advanced(FORCE GFLAGS_INCLUDE_DIR
-    GFLAGS_LIBRARY
-    GFLAGS_NAMESPACE
-    gflags_DIR) # Autogenerated by find_package(gflags)
-endif()

build_files/cmake/Modules/FindGlog.cmake

@@ -1,226 +0,0 @@
-# Ceres Solver - A fast non-linear least squares minimizer
-# Copyright 2015 Google Inc. All rights reserved.
-# http://ceres-solver.org/
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# * Redistributions of source code must retain the above copyright notice,
-#   this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-# * Neither the name of Google Inc. nor the names of its contributors may be
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# Author: alexs.mac@gmail.com (Alex Stewart)
-#
-
-# FindGlog.cmake - Find Google glog logging library.
-#
-# This module defines the following variables:
-#
-# GLOG_FOUND: TRUE iff glog is found.
-# GLOG_INCLUDE_DIRS: Include directories for glog.
-# GLOG_LIBRARIES: Libraries required to link glog.
-#
-# The following variables control the behaviour of this module:
-#
-# GLOG_INCLUDE_DIR_HINTS: List of additional directories in which to
-#                         search for glog includes, e.g: /timbuktu/include.
-# GLOG_LIBRARY_DIR_HINTS: List of additional directories in which to
-#                         search for glog libraries, e.g: /timbuktu/lib.
-# GFLOG_ROOT_DIR,         The base directory to search for Glog.
-#                         This can also be an environment variable.
-#
-# The following variables are also defined by this module, but in line with
-# CMake recommended FindPackage() module style should NOT be referenced directly
-# by callers (use the plural variables detailed above instead).  These variables
-# do however affect the behaviour of the module via FIND_[PATH/LIBRARY]() which
-# are NOT re-called (i.e. search for library is not repeated) if these variables
-# are set with valid values _in the CMake cache_. This means that if these
-# variables are set directly in the cache, either by the user in the CMake GUI,
-# or by the user passing -DVAR=VALUE directives to CMake when called (which
-# explicitly defines a cache variable), then they will be used verbatim,
-# bypassing the HINTS variables and other hard-coded search locations.
-#
-# GLOG_INCLUDE_DIR: Include directory for glog, not including the
-#                   include directory of any dependencies.
-# GLOG_LIBRARY: glog library, not including the libraries of any
-#               dependencies.
-
-# If GLOG_ROOT_DIR was defined in the environment, use it.
-if(NOT GLOG_ROOT_DIR AND NOT $ENV{GLOG_ROOT_DIR} STREQUAL "")
-  set(GLOG_ROOT_DIR $ENV{GLOG_ROOT_DIR})
-endif()
-
-if(DEFINED GLOG_ROOT_DIR)
-  set(GLOG_ROOT_DIR_INCLUDE "${GLOG_ROOT_DIR}/include")
-  set(GLOG_ROOT_DIR_LIB "${GLOG_ROOT_DIR}/lib")
-endif()
-
-# Reset CALLERS_CMAKE_FIND_LIBRARY_PREFIXES to its value when
-# FindGlog was invoked.
-macro(GLOG_RESET_FIND_LIBRARY_PREFIX)
-  if(MSVC)
-    set(CMAKE_FIND_LIBRARY_PREFIXES "${CALLERS_CMAKE_FIND_LIBRARY_PREFIXES}")
-  endif()
-endmacro()
-
-# Called if we failed to find glog or any of it's required dependencies,
-# unsets all public (designed to be used externally) variables and reports
-# error message at priority depending upon [REQUIRED/QUIET/<NONE>] argument.
-macro(GLOG_REPORT_NOT_FOUND REASON_MSG)
-  unset(GLOG_FOUND)
-  unset(GLOG_INCLUDE_DIRS)
-  unset(GLOG_LIBRARIES)
-  # Make results of search visible in the CMake GUI if glog has not
-  # been found so that user does not have to toggle to advanced view.
-  mark_as_advanced(CLEAR GLOG_INCLUDE_DIR
-                         GLOG_LIBRARY)
-
-  glog_reset_find_library_prefix()
-
-  # Note <package>_FIND_[REQUIRED/QUIETLY] variables defined by FindPackage()
-  # use the camelcase library name, not uppercase.
-  if(Glog_FIND_QUIETLY)
-    message(STATUS "Failed to find glog - " ${REASON_MSG} ${ARGN})
-  elseif(Glog_FIND_REQUIRED)
-    message(FATAL_ERROR "Failed to find glog - " ${REASON_MSG} ${ARGN})
-  else()
-    # Neither QUIETLY nor REQUIRED, use no priority which emits a message
-    # but continues configuration and allows generation.
-    message("-- Failed to find glog - " ${REASON_MSG} ${ARGN})
-  endif()
-  return()
-endmacro()
-
-# Handle possible presence of lib prefix for libraries on MSVC, see
-# also GLOG_RESET_FIND_LIBRARY_PREFIX().
-if(MSVC)
-  # Preserve the caller's original values for CMAKE_FIND_LIBRARY_PREFIXES
-  # s/t we can set it back before returning.
-  set(CALLERS_CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES}")
-  # The empty string in this list is important, it represents the case when
-  # the libraries have no prefix (shared libraries / DLLs).
-  set(CMAKE_FIND_LIBRARY_PREFIXES "lib" "" "${CMAKE_FIND_LIBRARY_PREFIXES}")
-endif()
-
-# Search user-installed locations first, so that we prefer user installs
-# to system installs where both exist.
-list(APPEND GLOG_CHECK_INCLUDE_DIRS
-  ${GLOG_ROOT_DIR_INCLUDE}
-  /usr/local/include
-  /usr/local/homebrew/include # Mac OS X
-  /opt/local/var/macports/software # Mac OS X.
-  /opt/local/include
-  /usr/include
-  /sw/include # Fink
-  /opt/csw/include # Blastwave
-  /opt/lib/glog/include)
-# Windows (for C:/Program Files prefix).
-list(APPEND GLOG_CHECK_PATH_SUFFIXES
-  glog/include
-  glog/Include
-  Glog/include
-  Glog/Include)
-
-list(APPEND GLOG_CHECK_LIBRARY_DIRS
-  ${GLOG_ROOT_DIR_LIB}
-  /usr/local/lib
-  /usr/local/homebrew/lib # Mac OS X.
-  /opt/local/lib
-  /usr/lib
-  /sw/lib # Fink
-  /opt/csw/lib # Blastwave
-  /opt/lib/gflags/lib)
-# Windows (for C:/Program Files prefix).
-list(APPEND GLOG_CHECK_LIBRARY_SUFFIXES
-  glog/lib
-  glog/Lib
-  Glog/lib
-  Glog/Lib)
-
-# Search supplied hint directories first if supplied.
-find_path(GLOG_INCLUDE_DIR
-  NAMES glog/logging.h
-  PATHS ${GLOG_INCLUDE_DIR_HINTS}
-  ${GLOG_CHECK_INCLUDE_DIRS}
-  PATH_SUFFIXES ${GLOG_CHECK_PATH_SUFFIXES})
-if(NOT GLOG_INCLUDE_DIR OR
-   NOT EXISTS ${GLOG_INCLUDE_DIR})
-  glog_report_not_found(
-    "Could not find glog include directory, set GLOG_INCLUDE_DIR "
-    "to directory containing glog/logging.h")
-endif()
-
-find_library(GLOG_LIBRARY NAMES glog
-  PATHS ${GLOG_LIBRARY_DIR_HINTS}
-  ${GLOG_CHECK_LIBRARY_DIRS}
-  PATH_SUFFIXES ${GLOG_CHECK_LIBRARY_SUFFIXES})
-if(NOT GLOG_LIBRARY OR
-   NOT EXISTS ${GLOG_LIBRARY})
-  glog_report_not_found(
-    "Could not find glog library, set GLOG_LIBRARY "
-    "to full path to libglog.")
-endif()
-
-# Mark internally as found, then verify. GLOG_REPORT_NOT_FOUND() unsets
-# if called.
-set(GLOG_FOUND TRUE)
-
-# Glog does not seem to provide any record of the version in its
-# source tree, thus cannot extract version.
-
-# Catch case when caller has set GLOG_INCLUDE_DIR in the cache / GUI and
-# thus FIND_[PATH/LIBRARY] are not called, but specified locations are
-# invalid, otherwise we would report the library as found.
-if(GLOG_INCLUDE_DIR AND
-   NOT EXISTS ${GLOG_INCLUDE_DIR}/glog/logging.h)
-  glog_report_not_found(
-    "Caller defined GLOG_INCLUDE_DIR:"
-    " ${GLOG_INCLUDE_DIR} does not contain glog/logging.h header.")
-endif()
-# TODO: This regex for glog library is pretty primitive, we use lowercase
-#       for comparison to handle Windows using CamelCase library names, could
-#       this check be better?
-string(TOLOWER "${GLOG_LIBRARY}" LOWERCASE_GLOG_LIBRARY)
-if(GLOG_LIBRARY AND
-   NOT "${LOWERCASE_GLOG_LIBRARY}" MATCHES ".*glog[^/]*")
-  glog_report_not_found(
-    "Caller defined GLOG_LIBRARY: "
-    "${GLOG_LIBRARY} does not match glog.")
-endif()
-
-# Set standard CMake FindPackage variables if found.
-if(GLOG_FOUND)
-  set(GLOG_INCLUDE_DIRS ${GLOG_INCLUDE_DIR})
-  set(GLOG_LIBRARIES ${GLOG_LIBRARY})
-endif()
-
-glog_reset_find_library_prefix()
-
-# Handle REQUIRED / QUIET optional arguments.
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(GLOG DEFAULT_MSG
-  GLOG_INCLUDE_DIRS GLOG_LIBRARIES)
-
-# Only mark internal variables as advanced if we found glog, otherwise
-# leave them visible in the standard GUI for the user to set manually.
-if(GLOG_FOUND)
-  mark_as_advanced(FORCE GLOG_INCLUDE_DIR
-                         GLOG_LIBRARY)
-endif()

build_files/cmake/Modules/FindJack.cmake

@@ -1,15 +1,15 @@
-# - Find JACK library
-# Find the native JACK includes and library
+# - Find Jack library
+# Find the native Jack includes and library
 # This module defines
 #  JACK_INCLUDE_DIRS, where to find jack.h, Set when
 #                        JACK_INCLUDE_DIR is found.
-#  JACK_LIBRARIES, libraries to link against to use JACK.
-#  JACK_ROOT_DIR, The base directory to search for JACK.
+#  JACK_LIBRARIES, libraries to link against to use Jack.
+#  JACK_ROOT_DIR, The base directory to search for Jack.
 #                    This can also be an environment variable.
-#  JACK_FOUND, If false, do not try to use JACK.
+#  JACK_FOUND, If false, do not try to use Jack.
 #
 # also defined, but not for general use are
-#  JACK_LIBRARY, where to find the JACK library.
+#  JACK_LIBRARY, where to find the Jack library.
 
 #=============================================================================
 # Copyright 2011 Blender Foundation.

build_files/cmake/Modules/FindOpenCOLLADA.cmake

@@ -83,7 +83,6 @@ FOREACH(COMPONENT ${_opencollada_FIND_INCLUDES})
       # but this is less trouble, just looks strange.
       include/opencollada/${COMPONENT}
       include/${COMPONENT}/include
-      include/${COMPONENT}
     HINTS
       ${_opencollada_SEARCH_DIRS}
     )

build_files/cmake/Modules/FindOpenImageIO.cmake

@@ -60,7 +60,7 @@ FIND_FILE(OPENIMAGEIO_IDIFF
   NAMES
     idiff
   HINTS
-    ${_openimageio_SEARCH_DIRS}
+    ${OPENIMAGEIO_ROOT_DIR}
   PATH_SUFFIXES
     bin
 )
@@ -76,8 +76,6 @@ IF(OPENIMAGEIO_FOUND)
   SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
   IF(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp)
     SET(OPENIMAGEIO_PUGIXML_FOUND TRUE)
-  ELSE()
-    SET(OPENIMAGEIO_PUGIXML_FOUND FALSE)
   ENDIF()
 ELSE()
   SET(OPENIMAGEIO_PUGIXML_FOUND FALSE)

build_files/cmake/Modules/GTestTesting.cmake

@@ -20,8 +20,8 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST)
 		set(TEST_INC
 			${_current_include_directories}
 			${CMAKE_SOURCE_DIR}/tests/gtests
-			${GLOG_INCLUDE_DIRS}
-			${GFLAGS_INCLUDE_DIRS}
+			${CMAKE_SOURCE_DIR}/extern/glog/src
+			${CMAKE_SOURCE_DIR}/extern/gflags/src
 			${CMAKE_SOURCE_DIR}/extern/gtest/include
 			${CMAKE_SOURCE_DIR}/extern/gmock/include
 		)
@@ -37,18 +37,15 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST)
 		                      extern_gmock
 		                      # needed for glog
 		                      ${PTHREADS_LIBRARIES}
-		                      ${GLOG_LIBRARIES}
-		                      ${GFLAGS_LIBRARIES})
-		if(WITH_OPENMP_STATIC)
-			target_link_libraries(${NAME}_test ${OpenMP_LIBRARIES})
-		endif()
+		                      extern_glog
+		                      extern_gflags)
 		set_target_properties(${NAME}_test PROPERTIES
 		                      RUNTIME_OUTPUT_DIRECTORY         "${TESTS_OUTPUT_DIR}"
 		                      RUNTIME_OUTPUT_DIRECTORY_RELEASE "${TESTS_OUTPUT_DIR}"
 		                      RUNTIME_OUTPUT_DIRECTORY_DEBUG   "${TESTS_OUTPUT_DIR}"
 		                      INCLUDE_DIRECTORIES              "${TEST_INC}")
 		if(${DO_ADD_TEST})
-			add_test(NAME ${NAME}_test COMMAND ${TESTS_OUTPUT_DIR}/${NAME}_test WORKING_DIRECTORY $<TARGET_FILE_DIR:blender>)
+			add_test(${NAME}_test ${TESTS_OUTPUT_DIR}/${NAME}_test)
 		endif()
 	endif()
 endmacro()

build_files/cmake/buildinfo.cmake

@@ -27,12 +27,13 @@ if(EXISTS ${SOURCE_DIR}/.git)
 		                OUTPUT_VARIABLE MY_WC_HASH
 		                OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-		execute_process(COMMAND git branch --list master blender-v* --contains ${MY_WC_HASH}
+		execute_process(COMMAND git branch --list master --contains ${MY_WC_HASH}
 		                WORKING_DIRECTORY ${SOURCE_DIR}
 		                OUTPUT_VARIABLE _git_contains_check
 		                OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-		if(NOT _git_contains_check STREQUAL "")
+		STRING(REGEX REPLACE "^[ \t]+" "" _git_contains_check "${_git_contains_check}")
+		if(_git_contains_check STREQUAL "master")
 			set(MY_WC_BRANCH "master")
 		else()
 			execute_process(COMMAND git show-ref --tags -d
@@ -47,22 +48,6 @@ if(EXISTS ${SOURCE_DIR}/.git)
 
 			if(_git_tag_hashes MATCHES "${_git_head_hash}")
 				set(MY_WC_BRANCH "master")
-			else()
-				execute_process(COMMAND git branch --contains ${MY_WC_HASH}
-				                WORKING_DIRECTORY ${SOURCE_DIR}
-				                OUTPUT_VARIABLE _git_contains_branches
-				                OUTPUT_STRIP_TRAILING_WHITESPACE)
-				string(REGEX REPLACE "^\\*[ \t]+" "" _git_contains_branches "${_git_contains_branches}")
-				string(REGEX REPLACE "[\r\n]+" ";" _git_contains_branches "${_git_contains_branches}")
-				string(REGEX REPLACE ";[ \t]+" ";" _git_contains_branches "${_git_contains_branches}")
-				foreach(_branch ${_git_contains_branches})
-					if(NOT "${_branch}" MATCHES "\\(HEAD.*")
-						set(MY_WC_BRANCH "${_branch}")
-						break()
-					endif()
-				endforeach()
-				unset(_branch)
-				unset(_git_contains_branches)
 			endif()
 
 			unset(_git_tag_hashes)

build_files/cmake/cmake_consistency_check.py

@@ -61,8 +61,10 @@ def replace_line(f, i, text, keep_indent=True):
 
 def source_list(path, filename_check=None):
     for dirpath, dirnames, filenames in os.walk(path):
+
         # skip '.git'
-        dirnames[:] = [d for d in dirnames if not d.startswith(".")]
+        if dirpath.startswith("."):
+            continue
 
         for filename in filenames:
             if filename_check is None or filename_check(filename):

build_files/cmake/cmake_netbeans_project.py

@@ -84,7 +84,7 @@ def create_nb_project_main():
         make_exe = cmake_cache_var("CMAKE_MAKE_PROGRAM")
         make_exe_basename = os.path.basename(make_exe)
 
-        # --------------- NB specific
+        # --------------- NB spesific
         defines = [("%s=%s" % cdef) if cdef[1] else cdef[0] for cdef in defines]
         defines += [cdef.replace("#define", "").strip() for cdef in cmake_compiler_defines()]
 

build_files/cmake/config/blender_full.cmake

@@ -12,7 +12,6 @@ set(WITH_CODEC_FFMPEG        ON  CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES              ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_OPENSUBDIV   ON  CACHE BOOL "" FORCE)
 set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
 set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
@@ -63,12 +62,16 @@ if(UNIX AND NOT APPLE)
 	set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 elseif(WIN32)
 	set(WITH_JACK                OFF CACHE BOOL "" FORCE)
-	set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
+	if(NOT CMAKE_COMPILER_IS_GNUCC)
+		set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
+	else()
+		# MinGW exceptions
+		set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
+		set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
+		set(WITH_CYCLES_OSL          OFF CACHE BOOL "" FORCE)
+	endif()
 elseif(APPLE)
 	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
-	set(WITH_CODEC_QUICKTIME     OFF CACHE BOOL "" FORCE)
+	set(WITH_CODEC_QUICKTIME     ON  CACHE BOOL "" FORCE)
 	set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
-
-#	include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
-#	apple_check_quicktime()
 endif()

build_files/cmake/config/blender_lite.cmake

@@ -16,7 +16,6 @@ set(WITH_CODEC_FFMPEG        OFF CACHE BOOL "" FORCE)
 set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES_OSL          OFF CACHE BOOL "" FORCE)
-set(WITH_CYCLES_OPENSUBDIV   OFF CACHE BOOL "" FORCE)
 set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
 set(WITH_LIBMV               OFF CACHE BOOL "" FORCE)
 set(WITH_LLVM                OFF CACHE BOOL "" FORCE)
@@ -49,7 +48,6 @@ set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
 set(WITH_OPENCOLORIO         OFF CACHE BOOL "" FORCE)
 set(WITH_OPENIMAGEIO         OFF CACHE BOOL "" FORCE)
 set(WITH_OPENMP              OFF CACHE BOOL "" FORCE)
-set(WITH_OPENSUBDIV          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)

build_files/cmake/config/blender_release.cmake

@@ -1,75 +0,0 @@
-# Turn everything ON thats expected for an official release builds.
-#
-# Example usage:
-#   cmake -C../blender/build_files/cmake/config/blender_release.cmake  ../blender
-#
-
-set(WITH_ALEMBIC             ON  CACHE BOOL "" FORCE)
-set(WITH_BUILDINFO           ON  CACHE BOOL "" FORCE)
-set(WITH_BULLET              ON  CACHE BOOL "" FORCE)
-set(WITH_CODEC_AVI           ON  CACHE BOOL "" FORCE)
-set(WITH_CODEC_FFMPEG        ON  CACHE BOOL "" FORCE)
-set(WITH_CODEC_SNDFILE       ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES              ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_OSL          ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_OPENSUBDIV   ON  CACHE BOOL "" FORCE)
-set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
-set(WITH_LIBMV               ON  CACHE BOOL "" FORCE)
-set(WITH_LIBMV_SCHUR_SPECIALIZATIONS ON CACHE BOOL "" FORCE)
-set(WITH_GAMEENGINE          ON  CACHE BOOL "" FORCE)
-set(WITH_COMPOSITOR          ON  CACHE BOOL "" FORCE)
-set(WITH_FREESTYLE           ON  CACHE BOOL "" FORCE)
-set(WITH_GHOST_XDND          ON  CACHE BOOL "" FORCE)
-set(WITH_IK_SOLVER           ON  CACHE BOOL "" FORCE)
-set(WITH_IK_ITASC            ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_CINEON        ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_DDS           ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_FRAMESERVER   ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_HDR           ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_OPENEXR       ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_OPENJPEG      ON  CACHE BOOL "" FORCE)
-set(WITH_IMAGE_TIFF          ON  CACHE BOOL "" FORCE)
-set(WITH_INPUT_NDOF          ON  CACHE BOOL "" FORCE)
-set(WITH_INTERNATIONAL       ON  CACHE BOOL "" FORCE)
-set(WITH_JACK                ON  CACHE BOOL "" FORCE)
-set(WITH_LZMA                ON  CACHE BOOL "" FORCE)
-set(WITH_LZO                 ON  CACHE BOOL "" FORCE)
-set(WITH_MOD_BOOLEAN         ON  CACHE BOOL "" FORCE)
-set(WITH_MOD_FLUID           ON  CACHE BOOL "" FORCE)
-set(WITH_MOD_REMESH          ON  CACHE BOOL "" FORCE)
-set(WITH_MOD_SMOKE           ON  CACHE BOOL "" FORCE)
-set(WITH_MOD_OCEANSIM        ON  CACHE BOOL "" FORCE)
-set(WITH_AUDASPACE           ON  CACHE BOOL "" FORCE)
-set(WITH_OPENAL              ON  CACHE BOOL "" FORCE)
-set(WITH_OPENCOLLADA         ON  CACHE BOOL "" FORCE)
-set(WITH_OPENCOLORIO         ON  CACHE BOOL "" FORCE)
-set(WITH_OPENMP              ON  CACHE BOOL "" FORCE)
-set(WITH_OPENVDB             ON  CACHE BOOL "" FORCE)
-set(WITH_OPENVDB_BLOSC       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)
-set(WITH_X11_XINPUT          ON  CACHE BOOL "" FORCE)
-set(WITH_X11_XF86VMODE       ON  CACHE BOOL "" FORCE)
-
-set(WITH_PLAYER              ON  CACHE BOOL "" FORCE)
-set(WITH_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_CUDA_BINARIES ON  CACHE BOOL "" FORCE)
-set(CYCLES_CUDA_BINARIES_ARCH sm_20;sm_21;sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61 CACHE STRING "" FORCE)
-
-# platform dependent options
-if(UNIX AND NOT APPLE)
-	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
-	set(WITH_DOC_MANPAGE         ON  CACHE BOOL "" FORCE)
-	set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
-elseif(WIN32)
-	set(WITH_JACK                OFF CACHE BOOL "" FORCE)
-	set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
-elseif(APPLE)
-	set(WITH_JACK                ON  CACHE BOOL "" FORCE)
-	set(WITH_CODEC_QUICKTIME     OFF CACHE BOOL "" FORCE)
-	set(WITH_OPENSUBDIV          OFF CACHE BOOL "" FORCE)
-
-#	include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake")
-#	apple_check_quicktime()
-endif()

build_files/cmake/macros.cmake

@@ -415,8 +415,15 @@ function(setup_liblinks
 	if(WITH_OPENCOLORIO)
 		target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES})
 	endif()
-	if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
+	if(WITH_OPENSUBDIV)
+		if(WIN32 AND NOT UNIX)
+			file_list_suffix(OPENSUBDIV_LIBRARIES_DEBUG "${OPENSUBDIV_LIBRARIES}" "_d")
+			target_link_libraries_debug(${target} "${OPENSUBDIV_LIBRARIES_DEBUG}")
+			target_link_libraries_optimized(${target} "${OPENSUBDIV_LIBRARIES}")
+			unset(OPENSUBDIV_LIBRARIES_DEBUG)
+		else()
 			target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES})
+		endif()
 	endif()
 	if(WITH_OPENVDB)
 		target_link_libraries(${target} ${OPENVDB_LIBRARIES} ${TBB_LIBRARIES})
@@ -491,12 +498,6 @@ function(setup_liblinks
 			target_link_libraries(${target} ${NDOF_LIBRARIES})
 		endif()
 	endif()
-	if(WITH_SYSTEM_GLOG)
-		target_link_libraries(${target} ${GLOG_LIBRARIES})
-	endif()
-	if(WITH_SYSTEM_GFLAGS)
-		target_link_libraries(${target} ${GFLAGS_LIBRARIES})
-	endif()
 
 	# We put CLEW and CUEW here because OPENSUBDIV_LIBRARIES dpeends on them..
 	if(WITH_CYCLES OR WITH_COMPOSITOR OR WITH_OPENSUBDIV)
@@ -517,8 +518,7 @@ function(setup_liblinks
 	target_link_libraries(${target}
 			${BLENDER_GL_LIBRARIES})
 
-	#target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
-	target_link_libraries(${target} ${PLATFORM_LINKLIBS})
+	target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
 endfunction()
 
 
@@ -601,7 +601,6 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_freestyle
 		bf_ikplugin
 		bf_modifiers
-		bf_alembic
 		bf_bmesh
 		bf_gpu
 		bf_blenloader
@@ -620,6 +619,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		bf_imbuf_openimageio
 		bf_imbuf_dds
 		bf_collada
+		bf_alembic
 		bf_intern_elbeem
 		bf_intern_memutil
 		bf_intern_guardedalloc
@@ -664,19 +664,13 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		extern_rangetree
 		extern_wcwidth
 		bf_intern_libmv
+		extern_glog
+		extern_gflags
 		extern_sdlew
 
 		bf_intern_glew_mx
 	)
 
-	if(NOT WITH_SYSTEM_GLOG)
-		list(APPEND BLENDER_SORTED_LIBS extern_glog)
-	endif()
-
-	if(NOT WITH_SYSTEM_GFLAGS)
-		list(APPEND BLENDER_SORTED_LIBS extern_gflags)
-	endif()
-
 	if(WITH_COMPOSITOR)
 		# added for opencl compositor
 		list_insert_before(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_compositor")
@@ -751,7 +745,7 @@ function(SETUP_BLENDER_SORTED_LIBS)
 		list(APPEND BLENDER_SORTED_LIBS bf_intern_gpudirect)
 	endif()
 
-	if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
+	if(WITH_OPENSUBDIV)
 		list(APPEND BLENDER_SORTED_LIBS bf_intern_opensubdiv)
 	endif()
 
@@ -1247,6 +1241,17 @@ endfunction()
 # hacks to override initial project settings
 # these macros must be called directly before/after project(Blender)
 macro(blender_project_hack_pre)
+	# ----------------
+	# MINGW HACK START
+	# ignore system set flag, use our own
+	# must be before project(...)
+	# if the user wants to add their own its ok after first run.
+	if(DEFINED CMAKE_C_STANDARD_LIBRARIES)
+		set(_reset_standard_libraries OFF)
+	else()
+		set(_reset_standard_libraries ON)
+	endif()
+
 	# ------------------
 	# GCC -O3 HACK START
 	# needed because O3 can cause problems but
@@ -1265,6 +1270,25 @@ endmacro()
 
 
 macro(blender_project_hack_post)
+	# --------------
+	# MINGW HACK END
+	if(_reset_standard_libraries)
+		# Must come after projecINCt(...)
+		#
+		# MINGW workaround for -ladvapi32 being included which surprisingly causes
+		# string formatting of floats, eg: printf("%.*f", 3, value). to crash blender
+		# with a meaningless stack trace. by overriding this flag we ensure we only
+		# have libs we define.
+		set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
+		set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
+		mark_as_advanced(
+			CMAKE_C_STANDARD_LIBRARIES
+			CMAKE_CXX_STANDARD_LIBRARIES
+		)
+	endif()
+	unset(_reset_standard_libraries)
+
+
 	# ----------------
 	# GCC -O3 HACK END
 	if(_reset_standard_cflags_rel)
@@ -1556,24 +1580,24 @@ macro(openmp_delayload
 endmacro()
 
 MACRO(WINDOWS_SIGN_TARGET target)
-	if(WITH_WINDOWS_CODESIGN)
-		if(!SIGNTOOL_EXE)
+	if (WITH_WINDOWS_CODESIGN)
+		if (!SIGNTOOL_EXE)
 			error("Codesigning is enabled, but signtool is not found")
 		else()
-			if(WINDOWS_CODESIGN_PFX_PASSWORD)
+			if (WINDOWS_CODESIGN_PFX_PASSWORD)
 				set(CODESIGNPASSWORD /p ${WINDOWS_CODESIGN_PFX_PASSWORD})
 			else()
-				if($ENV{PFXPASSWORD})
+				if ($ENV{PFXPASSWORD})
 					set(CODESIGNPASSWORD /p $ENV{PFXPASSWORD})
 				else()
-					message(FATAL_ERROR "WITH_WINDOWS_CODESIGN is on but WINDOWS_CODESIGN_PFX_PASSWORD not set, and environment variable PFXPASSWORD not found, unable to sign code.")
+					message( FATAL_ERROR "WITH_WINDOWS_CODESIGN is on but WINDOWS_CODESIGN_PFX_PASSWORD not set, and environment variable PFXPASSWORD not found, unable to sign code.")
 				endif()
 			endif()
 			add_custom_command(TARGET ${target}
-				POST_BUILD
-				COMMAND ${SIGNTOOL_EXE} sign /f ${WINDOWS_CODESIGN_PFX} ${CODESIGNPASSWORD} $<TARGET_FILE:${target}>
-				VERBATIM
-			)
+						POST_BUILD
+						COMMAND ${SIGNTOOL_EXE} sign /f ${WINDOWS_CODESIGN_PFX} ${CODESIGNPASSWORD} $<TARGET_FILE:${target}>
+						VERBATIM
+				)
 		endif()
 	endif()
-ENDMACRO()
+ENDMACRO()

build_files/cmake/packaging.cmake

@@ -1,7 +1,5 @@
-string(TIMESTAMP CURRENT_YEAR "%Y")
-
-set(PROJECT_DESCRIPTION  "Blender is the free and open source 3D creation suite software.")
-set(PROJECT_COPYRIGHT    "Copyright (C) 2001-${CURRENT_YEAR} Blender Foundation")
+set(PROJECT_DESCRIPTION  "Blender is a very fast and versatile 3D modeller/renderer.")
+set(PROJECT_COPYRIGHT    "Copyright (C) 2001-2012 Blender Foundation")
 set(PROJECT_CONTACT      "foundation@blender.org")
 set(PROJECT_VENDOR       "Blender Foundation")
 
@@ -40,8 +38,8 @@ unset(MY_WC_HASH)
 # Force Package Name
 execute_process(COMMAND date "+%Y%m%d" OUTPUT_VARIABLE CPACK_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
 string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
-if(MSVC)
-	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+if (MSVC)
+	if ("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
 		set(PACKAGE_ARCH windows64)
 	else()
 		set(PACKAGE_ARCH windows32)
@@ -50,7 +48,7 @@ else(MSVC)
 	set(PACKAGE_ARCH ${CMAKE_SYSTEM_PROCESSOR})
 endif()
 
-if(CPACK_OVERRIDE_PACKAGENAME)
+if (CPACK_OVERRIDE_PACKAGENAME)
 	set(CPACK_PACKAGE_FILE_NAME ${CPACK_OVERRIDE_PACKAGENAME}-${PACKAGE_ARCH})
 else()
 	set(CPACK_PACKAGE_FILE_NAME ${PROJECT_NAME_LOWER}-${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}-git${CPACK_DATE}.${BUILD_REV}-${PACKAGE_ARCH})
@@ -99,8 +97,6 @@ if(WIN32)
 endif()
 
 set(CPACK_PACKAGE_EXECUTABLES "blender" "blender")
-set(CPACK_CREATE_DESKTOP_LINKS "blender" "blender")
-
 include(CPack)
 
 # Target for build_archive.py script, to automatically pass along
@@ -137,3 +133,4 @@ unset(MINOR_VERSION)
 unset(PATCH_VERSION)
 
 unset(BUILD_REV)
+

build_files/cmake/platform/platform_apple.cmake

@@ -23,16 +23,8 @@
 
 # Libraries configuration for Apple.
 
-macro(find_package_wrapper)
-# do nothing, just satisfy the macro
-endmacro()
-
 if(NOT DEFINED LIBDIR)
-	if(WITH_CXX11)
-		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin)
-	else()
-		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal)
-	endif()
+	set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal)
 else()
 	message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
 endif()
@@ -56,17 +48,17 @@ if(WITH_ALEMBIC)
 	set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
 	set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
 	set(ALEMBIC_LIBRARIES Alembic)
-	set(ALEMBIC_FOUND ON)
 endif()
 
-if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
+if(WITH_OPENSUBDIV)
 	set(OPENSUBDIV ${LIBDIR}/opensubdiv)
 	set(OPENSUBDIV_LIBPATH ${OPENSUBDIV}/lib)
-	find_library(OSD_LIB_CPU NAMES osdCPU PATHS ${OPENSUBDIV_LIBPATH})
-	find_library(OSD_LIB_GPU NAMES osdGPU PATHS ${OPENSUBDIV_LIBPATH})
+	find_library(OSL_LIB_UTIL NAMES osdutil PATHS ${OPENSUBDIV_LIBPATH})
+	find_library(OSL_LIB_CPU NAMES osdCPU PATHS ${OPENSUBDIV_LIBPATH})
+	find_library(OSL_LIB_GPU NAMES osdGPU PATHS ${OPENSUBDIV_LIBPATH})
 	set(OPENSUBDIV_INCLUDE_DIR ${OPENSUBDIV}/include)
 	set(OPENSUBDIV_INCLUDE_DIRS ${OPENSUBDIV_INCLUDE_DIR})
-	list(APPEND OPENSUBDIV_LIBRARIES ${OSD_LIB_CPU} ${OSD_LIB_GPU})
+	list(APPEND OPENSUBDIV_LIBRARIES ${OSL_LIB_UTIL} ${OSL_LIB_CPU} ${OSL_LIB_GPU})
 endif()
 
 if(WITH_JACK)
@@ -83,7 +75,7 @@ if(WITH_CODEC_SNDFILE)
 	set(SNDFILE ${LIBDIR}/sndfile)
 	set(SNDFILE_INCLUDE_DIRS ${SNDFILE}/include)
 	set(SNDFILE_LIBRARIES sndfile FLAC ogg vorbis vorbisenc)
-	set(SNDFILE_LIBPATH ${SNDFILE}/lib ${LIBDIR}/ffmpeg/lib)  # TODO, deprecate
+	set(SNDFILE_LIBPATH ${SNDFILE}/lib ${FFMPEG}/lib)  # TODO, deprecate
 endif()
 
 if(WITH_PYTHON)
@@ -141,17 +133,7 @@ if(WITH_IMAGE_OPENEXR)
 	set(OPENEXR ${LIBDIR}/openexr)
 	set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
 	set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR)
-	if(WITH_CXX11)
-		set(OPENEXR_POSTFIX -2_2)
-	else()
-		set(OPENEXR_POSTFIX)
-	endif()
-	set(OPENEXR_LIBRARIES
-		Iex${OPENEXR_POSTFIX}
-		Half
-		IlmImf${OPENEXR_POSTFIX}
-		Imath${OPENEXR_POSTFIX}
-		IlmThread${OPENEXR_POSTFIX})
+	set(OPENEXR_LIBRARIES Iex Half IlmImf Imath IlmThread)
 	set(OPENEXR_LIBPATH ${OPENEXR}/lib)
 endif()
 
@@ -162,22 +144,9 @@ if(WITH_CODEC_FFMPEG)
 		avcodec avdevice avformat avutil
 		mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg
 	)
-	if(WITH_CXX11)
-		set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} schroedinger orc vpx webp swresample)
-	endif()
 	set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 endif()
 
-if(WITH_OPENJPEG OR WITH_CODEC_FFMPEG)
-	# use openjpeg from libdir that is linked into ffmpeg
-	if(WITH_CXX11)
-		set(OPENJPEG ${LIBDIR}/openjpeg)
-		set(WITH_SYSTEM_OPENJPEG ON)
-		set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include)
-		set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjpeg.a)
-	endif()
-endif()
-
 find_library(SYSTEMSTUBS_LIBRARY
 	NAMES
 	SystemStubs
@@ -255,11 +224,7 @@ if(WITH_SDL)
 	set(SDL_INCLUDE_DIR ${SDL}/include)
 	set(SDL_LIBRARY SDL2)
 	set(SDL_LIBPATH ${SDL}/lib)
-	if(WITH_CXX11)
-		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -framework ForceFeedback")
-	else()
-		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -lazy_framework ForceFeedback")
-	endif()
+	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -lazy_framework ForceFeedback")
 endif()
 
 set(PNG "${LIBDIR}/png")
@@ -280,27 +245,22 @@ endif()
 if(WITH_BOOST)
 	set(BOOST ${LIBDIR}/boost)
 	set(BOOST_INCLUDE_DIR ${BOOST}/include)
-	if(WITH_CXX11)
-		set(BOOST_POSTFIX)
-	else()
-		set(BOOST_POSTFIX -mt)
-	endif()
 	set(BOOST_LIBRARIES
-		boost_date_time${BOOST_POSTFIX}
-		boost_filesystem${BOOST_POSTFIX}
-		boost_regex${BOOST_POSTFIX}
-		boost_system${BOOST_POSTFIX}
-		boost_thread${BOOST_POSTFIX}
-		boost_wave${BOOST_POSTFIX}
+		boost_date_time-mt
+		boost_filesystem-mt
+		boost_regex-mt
+		boost_system-mt
+		boost_thread-mt
+		boost_wave-mt
 	)
 	if(WITH_INTERNATIONAL)
-		list(APPEND BOOST_LIBRARIES boost_locale${BOOST_POSTFIX})
+		list(APPEND BOOST_LIBRARIES boost_locale-mt)
 	endif()
 	if(WITH_CYCLES_NETWORK)
-		list(APPEND BOOST_LIBRARIES boost_serialization${BOOST_POSTFIX})
+		list(APPEND BOOST_LIBRARIES boost_serialization-mt)
 	endif()
 	if(WITH_OPENVDB)
-		list(APPEND BOOST_LIBRARIES boost_iostreams${BOOST_POSTFIX})
+		list(APPEND BOOST_LIBRARIES boost_iostreams-mt)
 	endif()
 	set(BOOST_LIBPATH ${BOOST}/lib)
 	set(BOOST_DEFINITIONS)
@@ -321,9 +281,6 @@ if(WITH_OPENIMAGEIO)
 		${OPENEXR_LIBRARIES}
 		${ZLIB_LIBRARIES}
 	)
-	if(WITH_CXX11)
-		set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${LIBDIR}/ffmpeg/lib/libwebp.a)
-	endif()
 	set(OPENIMAGEIO_LIBPATH
 		${OPENIMAGEIO}/lib
 		${JPEG_LIBPATH}

build_files/cmake/platform/platform_apple_xcode.cmake

@@ -1,135 +0,0 @@
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-# The Original Code is Copyright (C) 2016, Blender Foundation
-# All rights reserved.
-#
-# Contributor(s): Jacques Beaurain.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-# Xcode and system configuration for Apple.
-
-# require newer cmake on osx because of version handling,
-# older cmake cannot handle 2 digit subversion!
-cmake_minimum_required(VERSION 3.0.0)
-
-if(NOT CMAKE_OSX_ARCHITECTURES)
-	set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
-		"Choose the architecture you want to build Blender for: i386, x86_64 or ppc"
-		FORCE)
-endif()
-
-if(NOT DEFINED OSX_SYSTEM)
-	execute_process(
-			COMMAND xcodebuild -version -sdk macosx SDKVersion
-			OUTPUT_VARIABLE OSX_SYSTEM
-			OUTPUT_STRIP_TRAILING_WHITESPACE)
-endif()
-
-# workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not
-# take xcode-select path into account but would always look  into /Applications/Xcode.app
-# while dev versions are named Xcode<version>-DP<preview_number>
-execute_process(
-		COMMAND xcode-select --print-path
-		OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE)
-string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) # truncate to bundlepath in any case
-
-if(${CMAKE_GENERATOR} MATCHES "Xcode")
-
-	# earlier xcode has no bundled developer dir, no sense in getting xcode path from
-	if(${XCODE_VERSION} VERSION_GREATER 4.2) 
-		# reduce to XCode name without dp extension
-		string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME) 
-		if(${DP_NAME} MATCHES Xcode5)
-			set(XCODE_VERSION 5)
-		endif()
-	endif()
-
-	##### cmake incompatibility with xcode  4.3 and higher #####
-	if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var
-		message(FATAL_ERROR "Xcode 4.3 and higher must be used with cmake 2.8-8 or higher")
-	endif()
-	### end cmake incompatibility with xcode 4.3 and higher ###
-	
-	if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4 AND ${XCODE_VERSION} VERSION_LESS 4.3)
-		# Xcode 4 defaults to the Apple LLVM Compiler.
-		# Override the default compiler selection because Blender only compiles with gcc up to xcode 4.2
-		set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
-		message(STATUS "Setting compiler to: " ${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION})
-	endif()
-else() # unix makefile generator does not fill XCODE_VERSION var, so we get it with a command
-	execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE XCODE_VERS_BUILD_NR)
-	string(SUBSTRING "${XCODE_VERS_BUILD_NR}" 6 3 XCODE_VERSION) # truncate away build-nr
-	unset(XCODE_VERS_BUILD_NR)
-endif()
-
-message(STATUS "Detected OS X ${OSX_SYSTEM} and Xcode ${XCODE_VERSION} at ${XCODE_BUNDLE}")
-
-if(${XCODE_VERSION} VERSION_LESS 4.3)
-	# use guaranteed existing sdk
-	set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE)
-else()
-	# note: xcode-select path could be ambigous,
-	# cause /Applications/Xcode.app/Contents/Developer or /Applications/Xcode.app would be allowed
-	# so i use a selfcomposed bundlepath here  
-	set(OSX_SYSROOT_PREFIX ${XCODE_BUNDLE}/Contents/Developer/Platforms/MacOSX.platform)
-	message(STATUS "OSX_SYSROOT_PREFIX: " ${OSX_SYSROOT_PREFIX})
-	set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
-	set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
-	if(${CMAKE_GENERATOR} MATCHES "Xcode")
-		# to silence sdk not found warning, just overrides CMAKE_OSX_SYSROOT
-		set(CMAKE_XCODE_ATTRIBUTE_SDKROOT macosx${OSX_SYSTEM})
-	endif()
-endif()
-
-if(OSX_SYSTEM MATCHES 10.9)
-	# make sure syslibs and headers are looked up in sdk ( expecially for 10.9 openGL atm. )
-	set(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT})
-endif()
-
-if(WITH_CXX11)
-	# 10.9 is our min. target, if you use higher sdk, weak linking happens
-	if(CMAKE_OSX_DEPLOYMENT_TARGET)
-		if(${CMAKE_OSX_DEPLOYMENT_TARGET} VERSION_LESS 10.9)
-			message(STATUS "Setting deployment target to 10.9, lower versions are incompatible with WITH_CXX11")
-			set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "" FORCE)
-		endif()
-	else()
-		set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "" FORCE)
-	endif()
-else()
-	if(NOT CMAKE_OSX_DEPLOYMENT_TARGET)
-		# 10.6 is our min. target, if you use higher sdk, weak linking happens
-		set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6" CACHE STRING "" FORCE)
-	endif()
-endif()
-
-if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
-	# force CMAKE_OSX_DEPLOYMENT_TARGET for makefiles, will not work else ( cmake bug ? )
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
-	add_definitions("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}")
-endif()
-
-macro(apple_check_quicktime)
-	# QuickTime framework is no longer available in SDK 10.12+
-	if(WITH_CODEC_QUICKTIME AND ${OSX_SYSTEM} VERSION_GREATER 10.11)
-		set(WITH_CODEC_QUICKTIME OFF CACHE BOOL "" FORCE)
-		message(STATUS "QuickTime not supported by SDK ${OSX_SYSTEM}, disabling WITH_CODEC_QUICKTIME")
-	endif()
-endmacro()
-

build_files/cmake/platform/platform_unix.cmake

@@ -344,7 +344,7 @@ if(WITH_LLVM OR WITH_SDL_DYNLOAD)
 	)
 endif()
 
-if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
+if(WITH_OPENSUBDIV)
 	find_package_wrapper(OpenSubdiv)
 
 	set(OPENSUBDIV_LIBRARIES ${OPENSUBDIV_LIBRARIES})
@@ -352,7 +352,6 @@ if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
 
 	if(NOT OPENSUBDIV_FOUND)
 		set(WITH_OPENSUBDIV OFF)
-		set(WITH_CYCLES_OPENSUBDIV OFF)
 		message(STATUS "OpenSubdiv not found")
 	endif()
 endif()
@@ -384,18 +383,17 @@ add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
 if(CMAKE_COMPILER_IS_GNUCC)
 	set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
 
-	if(WITH_LINKER_GOLD)
-		execute_process(
-			COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version
-			ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
-		if("${LD_VERSION}" MATCHES "GNU gold")
-			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=gold")
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
-		else()
-			message(STATUS "GNU gold linker isn't available, using the default system linker.")
-		endif()
-		unset(LD_VERSION)
+	# use ld.gold linker if available, could make optional
+	execute_process(
+		COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version
+		ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+	if("${LD_VERSION}" MATCHES "GNU gold")
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=gold")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
+	else()
+		message(STATUS "GNU gold linker isn't available, using the default system linker.")
 	endif()
+	unset(LD_VERSION)
 
 # CLang is the same as GCC for now.
 elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")

build_files/cmake/platform/platform_win32.cmake

@@ -27,10 +27,12 @@ add_definitions(-DWIN32)
 
 if(MSVC)
 	include(platform_win32_msvc)
-else()
-	message(FATAL_ERROR "Compiler is unsupported")
+elseif(CMAKE_COMPILER_IS_GNUCC)
+	include(platform_win32_mingw)
 endif()
 
+# Things common to both mingw and MSVC  should go here
+
 set(WINTAB_INC ${LIBDIR}/wintab/include)
 
 if(WITH_OPENAL)

build_files/cmake/platform/platform_win32_mingw.cmake

@@ -0,0 +1,302 @@
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2016, Blender Foundation
+# All rights reserved.
+#
+# Contributor(s): Sergey Sharybin.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+# Libraries configuration for Windows when compiling with MinGW.
+
+# keep GCC specific stuff here
+include(CheckCSourceCompiles)
+# Setup 64bit and 64bit windows systems
+CHECK_C_SOURCE_COMPILES("
+	#ifndef __MINGW64__
+	#error
+	#endif
+	int main(void) { return 0; }
+	"
+	WITH_MINGW64
+)
+
+if(NOT DEFINED LIBDIR)
+	if(WITH_MINGW64)
+		message(STATUS "Compiling for 64 bit with MinGW-w64.")
+		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
+	else()
+		message(STATUS "Compiling for 32 bit with MinGW-w32.")
+		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw32)
+
+		if(WITH_RAYOPTIMIZATION)
+			message(WARNING "MinGW-w32 is known to be unstable with 'WITH_RAYOPTIMIZATION' option enabled.")
+		endif()
+	endif()
+else()
+	message(STATUS "Using pre-compiled LIBDIR: ${LIBDIR}")
+endif()
+if(NOT EXISTS "${LIBDIR}/")
+	message(FATAL_ERROR "Windows requires pre-compiled libs at: '${LIBDIR}'")
+endif()
+
+list(APPEND PLATFORM_LINKLIBS
+	-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32
+	-lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi -ldbghelp
+)
+
+if(WITH_INPUT_IME)
+	list(APPEND PLATFORM_LINKLIBS -limm32)
+endif()
+
+set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
+
+if(WITH_MINGW64)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+	list(APPEND PLATFORM_LINKLIBS -lpthread)
+
+	add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)
+endif()
+
+add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
+
+add_definitions(-DFREE_WINDOWS)
+
+set(PNG "${LIBDIR}/png")
+set(PNG_INCLUDE_DIRS "${PNG}/include")
+set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
+
+if(WITH_MINGW64)
+	set(JPEG_LIBRARIES jpeg)
+else()
+	set(JPEG_LIBRARIES libjpeg)
+endif()
+set(PNG_LIBRARIES png)
+
+set(ZLIB ${LIBDIR}/zlib)
+set(ZLIB_INCLUDE_DIRS ${ZLIB}/include)
+set(ZLIB_LIBPATH ${ZLIB}/lib)
+set(ZLIB_LIBRARIES z)
+
+set(JPEG "${LIBDIR}/jpeg")
+set(JPEG_INCLUDE_DIR "${JPEG}/include")
+set(JPEG_LIBPATH ${JPEG}/lib) # not cmake defined
+
+# comes with own pthread library
+if(NOT WITH_MINGW64)
+	set(PTHREADS ${LIBDIR}/pthreads)
+	#set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
+	set(PTHREADS_LIBPATH ${PTHREADS}/lib)
+	set(PTHREADS_LIBRARIES pthreadGC2)
+endif()
+
+set(FREETYPE ${LIBDIR}/freetype)
+set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
+set(FREETYPE_LIBPATH ${FREETYPE}/lib)
+set(FREETYPE_LIBRARY freetype)
+
+if(WITH_FFTW3)
+	set(FFTW3 ${LIBDIR}/fftw3)
+	set(FFTW3_LIBRARIES fftw3)
+	set(FFTW3_INCLUDE_DIRS ${FFTW3}/include)
+	set(FFTW3_LIBPATH ${FFTW3}/lib)
+endif()
+
+if(WITH_OPENCOLLADA)
+	set(OPENCOLLADA ${LIBDIR}/opencollada)
+	set(OPENCOLLADA_INCLUDE_DIRS
+		${OPENCOLLADA}/include/opencollada/COLLADAStreamWriter
+		${OPENCOLLADA}/include/opencollada/COLLADABaseUtils
+		${OPENCOLLADA}/include/opencollada/COLLADAFramework
+		${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
+		${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
+	)
+	set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib/opencollada)
+	set(OPENCOLLADA_LIBRARIES
+		OpenCOLLADAStreamWriter
+		OpenCOLLADASaxFrameworkLoader
+		OpenCOLLADAFramework
+		OpenCOLLADABaseUtils
+		GeneratedSaxParser
+		UTF MathMLSolver buffer ftoa xml
+	)
+	set(PCRE_LIBRARIES pcre)
+endif()
+
+if(WITH_CODEC_FFMPEG)
+	set(FFMPEG ${LIBDIR}/ffmpeg)
+	set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
+	if(WITH_MINGW64)
+		set(FFMPEG_LIBRARIES avcodec.dll avformat.dll avdevice.dll avutil.dll swscale.dll swresample.dll)
+	else()
+		set(FFMPEG_LIBRARIES avcodec-55 avformat-55 avdevice-55 avutil-52 swscale-2)
+	endif()
+	set(FFMPEG_LIBPATH ${FFMPEG}/lib)
+endif()
+
+if(WITH_IMAGE_OPENEXR)
+	set(OPENEXR ${LIBDIR}/openexr)
+	set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
+	set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
+	set(OPENEXR_LIBRARIES Half IlmImf Imath IlmThread Iex)
+	set(OPENEXR_LIBPATH ${OPENEXR}/lib)
+endif()
+
+if(WITH_IMAGE_TIFF)
+	set(TIFF ${LIBDIR}/tiff)
+	set(TIFF_LIBRARY tiff)
+	set(TIFF_INCLUDE_DIR ${TIFF}/include)
+	set(TIFF_LIBPATH ${TIFF}/lib)
+endif()
+
+if(WITH_JACK)
+	set(JACK ${LIBDIR}/jack)
+	set(JACK_INCLUDE_DIRS ${JACK}/include/jack ${JACK}/include)
+	set(JACK_LIBRARIES jack)
+	set(JACK_LIBPATH ${JACK}/lib)
+
+	# TODO, gives linking errors, force off
+	set(WITH_JACK OFF)
+endif()
+
+if(WITH_PYTHON)
+	# normally cached but not since we include them with blender
+	set(PYTHON_VERSION 3.5) #  CACHE STRING)
+	string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
+	set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}")  # CACHE PATH)
+	set(PYTHON_LIBRARY "${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}mw.lib")  # CACHE FILEPATH)
+	unset(_PYTHON_VERSION_NO_DOTS)
+
+	# uncached vars
+	set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
+	set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")
+endif()
+
+if(WITH_BOOST)
+	set(BOOST ${LIBDIR}/boost)
+	set(BOOST_INCLUDE_DIR ${BOOST}/include)
+	if(WITH_MINGW64)
+		set(BOOST_POSTFIX "mgw47-mt-s-1_49")
+		set(BOOST_DEBUG_POSTFIX "mgw47-mt-sd-1_49")
+	else()
+		set(BOOST_POSTFIX "mgw46-mt-s-1_49")
+		set(BOOST_DEBUG_POSTFIX "mgw46-mt-sd-1_49")
+	endif()
+	set(BOOST_LIBRARIES
+		optimized boost_date_time-${BOOST_POSTFIX} boost_filesystem-${BOOST_POSTFIX}
+		boost_regex-${BOOST_POSTFIX}
+		boost_system-${BOOST_POSTFIX} boost_thread-${BOOST_POSTFIX}
+		debug boost_date_time-${BOOST_DEBUG_POSTFIX} boost_filesystem-${BOOST_DEBUG_POSTFIX}
+		boost_regex-${BOOST_DEBUG_POSTFIX}
+		boost_system-${BOOST_DEBUG_POSTFIX} boost_thread-${BOOST_DEBUG_POSTFIX})
+	if(WITH_INTERNATIONAL)
+		set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
+			optimized boost_locale-${BOOST_POSTFIX}
+			debug boost_locale-${BOOST_DEBUG_POSTFIX}
+		)
+	endif()
+	if(WITH_CYCLES_OSL)
+		set(BOOST_LIBRARIES ${BOOST_LIBRARIES}
+			optimized boost_wave-${BOOST_POSTFIX}
+			debug boost_wave-${BOOST_DEBUG_POSTFIX}
+		)
+	endif()
+	set(BOOST_LIBPATH ${BOOST}/lib)
+	set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB -DBOOST_THREAD_USE_LIB ")
+endif()
+
+if(WITH_OPENIMAGEIO)
+	set(OPENIMAGEIO ${LIBDIR}/openimageio)
+	set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
+	set(OPENIMAGEIO_LIBRARIES OpenImageIO)
+	set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
+	set(OPENIMAGEIO_DEFINITIONS "")
+	set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
+endif()
+
+if(WITH_LLVM)
+	set(LLVM_ROOT_DIR ${LIBDIR}/llvm CACHE PATH	"Path to the LLVM installation")
+	set(LLVM_LIBPATH ${LLVM_ROOT_DIR}/lib)
+	# Explicitly set llvm lib order.
+	#---- WARNING ON GCC ORDER OF LIBS IS IMPORTANT, DO NOT CHANGE! ---------
+	set(LLVM_LIBRARY LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMAnalysis LLVMArchive
+		LLVMAsmParser LLVMAsmPrinter
+		LLVMBitReader LLVMBitWriter
+		LLVMDebugInfo LLVMExecutionEngine
+		LLVMInstCombine LLVMInstrumentation
+		LLVMInterpreter LLVMJIT
+		LLVMLinker LLVMMC
+		LLVMMCDisassembler LLVMMCJIT
+		LLVMMCParser LLVMObject
+		LLVMRuntimeDyld
+		LLVMSupport
+		LLVMTableGen LLVMTarget
+		LLVMTransformUtils LLVMVectorize
+		LLVMX86AsmParser LLVMX86AsmPrinter
+		LLVMX86CodeGen LLVMX86Desc
+		LLVMX86Disassembler LLVMX86Info
+		LLVMX86Utils LLVMipa
+		LLVMipo LLVMCore)
+	# imagehelp is needed by LLVM 3.1 on MinGW, check lib\Support\Windows\Signals.inc
+	list(APPEND PLATFORM_LINKLIBS -limagehlp)
+endif()
+
+if(WITH_OPENCOLORIO)
+	set(OPENCOLORIO ${LIBDIR}/opencolorio)
+	set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
+	set(OPENCOLORIO_LIBRARIES OpenColorIO)
+	set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
+	set(OPENCOLORIO_DEFINITIONS)
+endif()
+
+if(WITH_SDL)
+	set(SDL ${LIBDIR}/sdl)
+	set(SDL_INCLUDE_DIR ${SDL}/include)
+	set(SDL_LIBRARY SDL)
+	set(SDL_LIBPATH ${SDL}/lib)
+endif()
+
+if(WITH_OPENVDB)
+	set(OPENVDB ${LIBDIR}/openvdb)
+	set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include)
+	set(OPENVDB_LIBRARIES openvdb ${TBB_LIBRARIES})
+	set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
+	set(OPENVDB_DEFINITIONS)
+endif()
+
+if(WITH_ALEMBIC)
+	# TODO(sergey): For until someone drops by and compiles libraries for
+	# MinGW we allow users to compile their own Alembic library and use
+	# that via find_package(),
+	#
+	# Once precompiled libraries are there we'll use hardcoded locations.
+	find_package_wrapper(Alembic)
+	if(WITH_ALEMBIC_HDF5)
+		set(HDF5_ROOT_DIR ${LIBDIR}/hdf5)
+		find_package_wrapper(HDF5)
+	endif()
+	if(NOT ALEMBIC_FOUND OR (WITH_ALEMBIC_HDF5 AND NOT HDF5_FOUND))
+		set(WITH_ALEMBIC OFF)
+		set(WITH_ALEMBIC_HDF5 OFF)
+	endif()
+endif()
+
+set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152")
+
+## DISABLE - causes linking errors
+## for re-distribution, so users dont need mingw installed
+# set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-libgcc -static-libstdc++")

build_files/cmake/platform/platform_win32_msvc.cmake

@@ -33,34 +33,26 @@ endmacro()
 macro(windows_find_package package_name
 	)
 	if(WITH_WINDOWS_FIND_MODULES)
-		find_package(${package_name})
+		find_package( ${package_name})
 	endif(WITH_WINDOWS_FIND_MODULES)
 endmacro()
 
-macro(find_package_wrapper)
-	if(WITH_WINDOWS_FIND_MODULES)
-		find_package(${ARGV})
-	endif()
-endmacro()
-
 add_definitions(-DWIN32)
 # Minimum MSVC Version
-if(CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-	if(MSVC_VERSION EQUAL 1800)
-		set(_min_ver "18.0.31101")
-		if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
-			message(FATAL_ERROR
-				"Visual Studio 2013 (Update 4, ${_min_ver}) required, "
-				"found (${CMAKE_CXX_COMPILER_VERSION})")
-		endif()
+if(MSVC_VERSION EQUAL 1800)
+	set(_min_ver "18.0.31101")
+	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
+		message(FATAL_ERROR
+			"Visual Studio 2013 (Update 4, ${_min_ver}) required, "
+			"found (${CMAKE_CXX_COMPILER_VERSION})")
 	endif()
-	if(MSVC_VERSION EQUAL 1900)
-		set(_min_ver "19.0.24210")
-		if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
-			message(FATAL_ERROR
-				"Visual Studio 2015 (Update 3, ${_min_ver}) required, "
-				"found (${CMAKE_CXX_COMPILER_VERSION})")
-		endif()
+endif()
+if(MSVC_VERSION EQUAL 1900)
+	set(_min_ver "19.0.24210")
+	if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${_min_ver})
+		message(FATAL_ERROR
+			"Visual Studio 2015 (Update 3, ${_min_ver}) required, "
+			"found (${CMAKE_CXX_COMPILER_VERSION})")
 	endif()
 endif()
 unset(_min_ver)
@@ -116,8 +108,9 @@ set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /NODEFAULTLIB:msvcrt.lib /NODEFAUL
 set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /ignore:4049 /ignore:4217 /ignore:4221")
 set(CMAKE_STATIC_LINKER_FLAGS "${CMAKE_STATIC_LINKER_FLAGS} /ignore:4221")
 
+# MSVC only, Mingw doesnt need
 if(CMAKE_CL_64)
-	set(PLATFORM_LINKFLAGS "/MACHINE:X64 ${PLATFORM_LINKFLAGS}")
+	set(PLATFORM_LINKFLAGS "/MACHINE:X64 /OPT:NOREF ${PLATFORM_LINKFLAGS}")
 else()
 	set(PLATFORM_LINKFLAGS "/MACHINE:IX86 /LARGEADDRESSAWARE ${PLATFORM_LINKFLAGS}")
 endif()
@@ -134,10 +127,8 @@ if(NOT DEFINED LIBDIR)
 		message(STATUS "32 bit compiler detected.")
 		set(LIBDIR_BASE "windows")
 	endif()
-	if(MSVC_VERSION EQUAL 1910)
-		message(STATUS "Visual Studio 2017 detected.")
-		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
-	elseif(MSVC_VERSION EQUAL 1900)
+
+	if(MSVC_VERSION EQUAL 1900)
 		message(STATUS "Visual Studio 2015 detected.")
 		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
 	else()
@@ -243,14 +234,14 @@ if(WITH_CODEC_FFMPEG)
 	windows_find_package(FFMPEG)
 	if(NOT FFMPEG_FOUND)
 		warn_hardcoded_paths(ffmpeg)
-		set(FFMPEG_LIBRARY_VERSION 57)
-		set(FFMPEG_LIBRARY_VERSION_AVU 55)
+		set(FFMPEG_LIBRARY_VERSION 55)
+		set(FFMPEG_LIBRARY_VERSION_AVU 52)
 		set(FFMPEG_LIBRARIES
-			${LIBDIR}/ffmpeg/lib/avcodec.lib
-			${LIBDIR}/ffmpeg/lib/avformat.lib
-			${LIBDIR}/ffmpeg/lib/avdevice.lib
-			${LIBDIR}/ffmpeg/lib/avutil.lib
-			${LIBDIR}/ffmpeg/lib/swscale.lib
+			${LIBDIR}/ffmpeg/lib/avcodec-${FFMPEG_LIBRARY_VERSION}.lib
+			${LIBDIR}/ffmpeg/lib/avformat-${FFMPEG_LIBRARY_VERSION}.lib
+			${LIBDIR}/ffmpeg/lib/avdevice-${FFMPEG_LIBRARY_VERSION}.lib
+			${LIBDIR}/ffmpeg/lib/avutil-${FFMPEG_LIBRARY_VERSION_AVU}.lib
+			${LIBDIR}/ffmpeg/lib/swscale-2.lib
 			)
 	endif()
 endif()
@@ -385,7 +376,6 @@ if(WITH_OPENIMAGEIO)
 	set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
 	set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe")
 	add_definitions(-DOIIO_STATIC_BUILD)
-	add_definitions(-DOIIO_NO_SSE=1)
 endif()
 
 if(WITH_LLVM)
@@ -437,7 +427,6 @@ if(WITH_ALEMBIC)
 	set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
 	set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
 	set(ALEMBIC_LIBRARIES optimized alembic debug alembic_d)
-	set(ALEMBIC_FOUND 1)
 endif()
 
 if(WITH_MOD_CLOTH_ELTOPO)
@@ -451,29 +440,23 @@ if(WITH_MOD_CLOTH_ELTOPO)
 	)
 endif()
 
-if(WITH_OPENSUBDIV OR WITH_CYCLES_OPENSUBDIV)
+if(WITH_OPENSUBDIV)
 	set(OPENSUBDIV_INCLUDE_DIR ${LIBDIR}/opensubdiv/include)
 	set(OPENSUBDIV_LIBPATH ${LIBDIR}/opensubdiv/lib)
-	set(OPENSUBDIV_LIBRARIES
-		optimized ${OPENSUBDIV_LIBPATH}/osdCPU.lib
-		optimized ${OPENSUBDIV_LIBPATH}/osdGPU.lib
-		debug ${OPENSUBDIV_LIBPATH}/osdCPU_d.lib
-		debug ${OPENSUBDIV_LIBPATH}/osdGPU_d.lib
-	)
-	set(OPENSUBDIV_HAS_OPENMP TRUE)
-	set(OPENSUBDIV_HAS_TBB FALSE)
-	set(OPENSUBDIV_HAS_OPENCL TRUE)
-	set(OPENSUBDIV_HAS_CUDA FALSE)
-	set(OPENSUBDIV_HAS_GLSL_TRANSFORM_FEEDBACK TRUE)
-	set(OPENSUBDIV_HAS_GLSL_COMPUTE TRUE)
-	windows_find_package(OpenSubdiv)
+	set(OPENSUBDIV_LIBRARIES ${OPENSUBDIV_LIBPATH}/osdCPU.lib ${OPENSUBDIV_LIBPATH}/osdGPU.lib)
+	find_package(OpenSubdiv)
 endif()
 
 if(WITH_SDL)
 	set(SDL ${LIBDIR}/sdl)
 	set(SDL_INCLUDE_DIR ${SDL}/include)
 	set(SDL_LIBPATH ${SDL}/lib)
-	set(SDL_LIBRARY SDL2)
+	# MinGW TODO: Update MinGW to SDL2
+	if(NOT CMAKE_COMPILER_IS_GNUCC)
+		set(SDL_LIBRARY SDL2)
+	else()
+		set(SDL_LIBRARY SDL)
+	endif()
 endif()
 
 # Audio IO
@@ -489,14 +472,14 @@ endif()
 # used in many places so include globally, like OpenGL
 blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}")
 
-#find signtool
-set(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( )
+#find signtool  
+SET(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( ) 
 find_program(SIGNTOOL_EXE signtool
-	HINTS
-		"$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/bin/x86/"
-		"$ENV{ProgramFiles}/Windows Kits/10/bin/x86/"
-		"$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.1/bin/x86/"
-		"$ENV{ProgramFiles}/Windows Kits/8.1/bin/x86/"
-		"$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.0/bin/x86/"
-		"$ENV{ProgramFiles}/Windows Kits/8.0/bin/x86/"
+HINTS
+  "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/bin/x86/"
+  "$ENV{ProgramFiles}/Windows Kits/10/bin/x86/"
+  "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.1/bin/x86/"
+  "$ENV{ProgramFiles}/Windows Kits/8.1/bin/x86/"
+  "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/8.0/bin/x86/"
+  "$ENV{ProgramFiles}/Windows Kits/8.0/bin/x86/"
 )

build_files/cmake/project_info.py

@@ -84,8 +84,10 @@ def init(cmake_path):
 
 def source_list(path, filename_check=None):
     for dirpath, dirnames, filenames in os.walk(path):
-        # skip '.git'
-        dirnames[:] = [d for d in dirnames if not d.startswith(".")]
+
+        # skip '.svn'
+        if dirpath.startswith("."):
+            continue
 
         for filename in filenames:
             filepath = join(dirpath, filename)
@@ -143,7 +145,7 @@ def cmake_advanced_info():
     def create_eclipse_project():
         print("CMAKE_DIR %r" % CMAKE_DIR)
         if sys.platform == "win32":
-            raise Exception("Error: win32 is not supported")
+            cmd = 'cmake "%s" -G"Eclipse CDT4 - MinGW Makefiles"' % CMAKE_DIR
         else:
             if make_exe_basename.startswith(("make", "gmake")):
                 cmd = 'cmake "%s" -G"Eclipse CDT4 - Unix Makefiles"' % CMAKE_DIR

build_files/utils/build_tgz.sh

@@ -6,10 +6,10 @@
 BASE_DIR="$PWD"
 
 blender_srcdir=$(dirname -- $0)/../..
-blender_version=$(grep "BLENDER_VERSION\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender_version.h" | awk '{print $3}')
-blender_version_char=$(grep "BLENDER_VERSION_CHAR\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender_version.h" | awk '{print $3}')
-blender_version_cycle=$(grep "BLENDER_VERSION_CYCLE\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender_version.h" | awk '{print $3}')
-blender_subversion=$(grep "BLENDER_SUBVERSION\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender_version.h" | awk '{print $3}')
+blender_version=$(grep "BLENDER_VERSION\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender.h" | awk '{print $3}')
+blender_version_char=$(grep "BLENDER_VERSION_CHAR\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender.h" | awk '{print $3}')
+blender_version_cycle=$(grep "BLENDER_VERSION_CYCLE\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender.h" | awk '{print $3}')
+blender_subversion=$(grep "BLENDER_SUBVERSION\s" "$blender_srcdir/source/blender/blenkernel/BKE_blender.h" | awk '{print $3}')
 
 if [ "$blender_version_cycle" = "release" ] ; then
 	VERSION=$(expr $blender_version / 100).$(expr $blender_version % 100)$blender_version_char

doc/blender_file_format/mystery_of_the_blend.html

@@ -187,7 +187,7 @@ The next table describes the information in the file-header.
 </table>
 
 <p>
-<a href="https://en.wikipedia.org/wiki/Endianness">Endianness</a> addresses the way values are ordered in a sequence of bytes(see the <a href="#example-endianess">example</a> below):
+<a href="http://en.wikipedia.org/wiki/Endianness">Endianness</a> addresses the way values are ordered in a sequence of bytes(see the <a href="#example-endianess">example</a> below):
 </p>
 
 <ul>

doc/doxygen/Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME           = Blender
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "V2.79"
+PROJECT_NUMBER         = "V2.8x"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -699,7 +699,7 @@ LAYOUT_FILE            =
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
 # extension is automatically appended if omitted. This requires the bibtex tool
-# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
 # For LaTeX the style of the bibliography can be controlled using
 # LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
 # search path. See also \cite for info how to create references.
@@ -1145,7 +1145,7 @@ HTML_EXTRA_FILES       =
 # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
 # will adjust the colors in the style sheet and background images according to
 # this color. Hue is specified as an angle on a colorwheel, see
-# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
 # 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
 # purple, and 360 is red again.
 # Minimum value: 0, maximum value: 359, default value: 220.
@@ -1752,7 +1752,7 @@ LATEX_SOURCE_CODE      = NO
 
 # The LATEX_BIB_STYLE tag can be used to specify the style to use for the
 # bibliography, e.g. plainnat, or ieeetr. See
-# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
 # The default value is: plain.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 

doc/python_api/examples/bge.texture.py

@@ -1,11 +1,8 @@
 """
 Basic Video Playback
 ++++++++++++++++++++
-Example of how to replace a texture in game with a video.
-It needs to run everyframe.
-To avoid any confusion with the location of the file,
-we will use ``GameLogic.expandPath()`` to build an absolute file name,
-assuming the video file is in the same directory as the blend-file.
+Example of how to replace a texture in game with a video. It needs to run
+everyframe.
 """
 import bge
 from bge import texture
@@ -29,18 +26,8 @@ if not hasattr(logic, 'video'):
     logic.video.source = texture.VideoFFmpeg(movie)
     logic.video.source.scale = True
 
-    # Note that we can change the ``Texture`` source at any time.
-    # Suppose we want to switch between two movies during the game:
-    logic.mySources[0] = texture.VideoFFmpeg('movie1.avi')
-    logic.mySources[1] = texture.VideoFFmpeg('movie2.avi')
-
-    #And then assign (and reassign) the source during the game
-    logic.video.source = logic.mySources[movieSel]
-
     # quick off the movie, but it wont play in the background
     logic.video.source.play()
 
-
-# Video playback is not a background process: it happens only when we refresh the texture.
-# So you need to call this function every frame to ensure update of the texture.
+# you need to call this function every frame to ensure update of the texture.
 logic.video.refresh(True)

doc/python_api/examples/bpy.app.handlers.1.py

@@ -4,7 +4,7 @@ Persistent Handler Example
 
 By default handlers are freed when loading new files, in some cases you may
 wan't the handler stay running across multiple files (when the handler is
-part of an add-on for example).
+part of an addon for example).
 
 For this the :data:`bpy.app.handlers.persistent` decorator needs to be used.
 """

doc/python_api/examples/bpy.app.translations.py

@@ -5,7 +5,7 @@ Intro
 .. warning::
 
    Most of this object should only be useful if you actually manipulate i18n stuff from Python.
-   If you are a regular add-on, you should only bother about :const:`contexts` member,
+   If you are a regular addon, you should only bother about :const:`contexts` member,
    and the :func:`register`/:func:`unregister` functions! The :func:`pgettext` family of functions
    should only be used in rare, specific cases (like e.g. complex "composited" UI strings...).
 
@@ -21,73 +21,14 @@ Intro
 Then, call ``bpy.app.translations.register(__name__, your_dict)`` in your ``register()`` function, and
 ``bpy.app.translations.unregister(__name__)`` in your ``unregister()`` one.
 
-The ``Manage UI translations`` add-on has several functions to help you collect strings to translate, and
+The ``Manage UI translations`` addon has several functions to help you collect strings to translate, and
 generate the needed python code (the translation dictionary), as well as optional intermediary po files
 if you want some... See
-`How to Translate Blender <https://wiki.blender.org/index.php/Dev:Doc/Process/Translate_Blender>`_ and
-`Using i18n in Blender Code <https://wiki.blender.org/index.php/Dev:Source/Interface/Internationalization>`_
+`How to Translate Blender <http://wiki.blender.org/index.php/Dev:Doc/Process/Translate_Blender>`_ and
+`Using i18n in Blender Code <http://wiki.blender.org/index.php/Dev:Source/Interface/Internationalization>`_
 for more info.
 
 Module References
 -----------------
 
 """
-
-import bpy
-
-# This block can be automatically generated by UI translations addon, which also handles conversion with PO format.
-# See also https://wiki.blender.org/index.php/Dev:Doc/Process/Translate_Blender#Translating_non-official_addons
-# It can (should) also be put in a different, specific py file.
-
-# ##### BEGIN AUTOGENERATED I18N SECTION #####
-# NOTE: You can safely move around this auto-generated block (with the begin/end markers!),
-#       and edit the translations by hand.
-#       Just carefully respect the format of the tuple!
-
-# Tuple of tuples ((msgctxt, msgid), (sources, gen_comments), (lang, translation, (is_fuzzy, comments)), ...)
-translations_tuple = (
-    (("*", ""),
-     ((), ()),
-     ("fr_FR", "Project-Id-Version: Copy Settings 0.1.5 (r0)\nReport-Msgid-Bugs-To: \nPOT-Creation-Date: 2013-04-18 15:27:45.563524\nPO-Revision-Date: 2013-04-18 15:38+0100\nLast-Translator: Bastien Montagne <montagne29@wanadoo.fr>\nLanguage-Team: LANGUAGE <LL@li.org>\nLanguage: __POT__\nMIME-Version: 1.0\nContent-Type: text/plain; charset=UTF-8\nContent-Transfer-Encoding: 8bit\n",
-               (False,
-                ("Blender's translation file (po format).",
-                 "Copyright (C) 2013 The Blender Foundation.",
-                 "This file is distributed under the same license as the Blender package.",
-                 "FIRST AUTHOR <EMAIL@ADDRESS>, YEAR."))),
-    ),
-    (("Operator", "Render: Copy Settings"),
-     (("bpy.types.SCENE_OT_render_copy_settings",),
-      ()),
-     ("fr_FR", "Rendu : copier réglages",
-               (False, ())),
-    ),
-    (("*", "Copy render settings from current scene to others"),
-     (("bpy.types.SCENE_OT_render_copy_settings",),
-      ()),
-     ("fr_FR", "Copier les réglages de rendu depuis la scène courante vers d’autres",
-               (False, ())),
-    ),
-    # ... etc, all messages from your addon.
-)
-
-translations_dict = {}
-for msg in translations_tuple:
-    key = msg[0]
-    for lang, trans, (is_fuzzy, comments) in msg[2:]:
-        if trans and not is_fuzzy:
-            translations_dict.setdefault(lang, {})[key] = trans
-
-# ##### END AUTOGENERATED I18N SECTION #####
-
-# Define remaining addon (operators, UI...) here.
-
-def register():
-   # Usual operator/UI/etc. registration...
-
-    bpy.app.translations.register(__name__, translations_dict)
-
-
-def unregister():
-    bpy.app.translations.unregister(__name__)
-
-   # Usual operator/UI/etc. unregistration...

doc/python_api/examples/bpy.types.AddonPreferences.1.py

@@ -1,10 +1,10 @@
 bl_info = {
-    "name": "Example Add-on Preferences",
+    "name": "Example Addon Preferences",
     "author": "Your Name Here",
     "version": (1, 0),
     "blender": (2, 65, 0),
-    "location": "SpaceBar Search -> Add-on Preferences Example",
-    "description": "Example Add-on",
+    "location": "SpaceBar Search -> Addon Preferences Example",
+    "description": "Example Addon",
     "warning": "",
     "wiki_url": "",
     "tracker_url": "",
@@ -18,7 +18,7 @@ from bpy.props import StringProperty, IntProperty, BoolProperty
 
 
 class ExampleAddonPreferences(AddonPreferences):
-    # this must match the add-on name, use '__package__'
+    # this must match the addon name, use '__package__'
     # when defining this in a submodule of a python package.
     bl_idname = __name__
 
@@ -37,7 +37,7 @@ class ExampleAddonPreferences(AddonPreferences):
 
     def draw(self, context):
         layout = self.layout
-        layout.label(text="This is a preferences view for our add-on")
+        layout.label(text="This is a preferences view for our addon")
         layout.prop(self, "filepath")
         layout.prop(self, "number")
         layout.prop(self, "boolean")
@@ -46,7 +46,7 @@ class ExampleAddonPreferences(AddonPreferences):
 class OBJECT_OT_addon_prefs_example(Operator):
     """Display example preferences"""
     bl_idname = "object.addon_prefs_example"
-    bl_label = "Add-on Preferences Example"
+    bl_label = "Addon Preferences Example"
     bl_options = {'REGISTER', 'UNDO'}
 
     def execute(self, context):

doc/python_api/examples/bpy.types.Menu.2.py

@@ -2,9 +2,9 @@
 Extending Menus
 +++++++++++++++
 
-When creating menus for add-ons you can't reference menus
-in Blender's default scripts.
-Instead, the add-on can add menu items to existing menus.
+When creating menus for addons you can't reference menus in Blender's default
+scripts.
+Instead, the addon can add menu items to existing menus.
 
 The function menu_draw acts like :class:`Menu.draw`.
 """

doc/python_api/examples/bpy.types.Menu.4.py

@@ -1,81 +0,0 @@
-"""
-Extending the Button Context Menu
-+++++++++++++++++++++++++++++++++
-
-This example enables you to insert your own menu entry into the common
-right click menu that you get while hovering over a value field,
-color, string, etc.
-
-To make the example work, you have to first select an object
-then right click on an user interface element (maybe a color in the
-material properties) and choose *Execute Custom Action*.
-
-Executing the operator will then print all values.
-"""
-
-import bpy
-from bpy.types import Menu
-
-
-def dump(obj, text):
-    for attr in dir(obj):
-        print("%r.%s = %s" % (obj, attr, getattr(obj, attr)))
-
-
-class WM_OT_button_context_test(bpy.types.Operator):
-    """Right click entry test"""
-    bl_idname = "wm.button_context_test"
-    bl_label = "Run Context Test"
-
-    @classmethod
-    def poll(cls, context):
-        return context.active_object is not None
-
-    def execute(self, context):
-        value = getattr(context, "button_pointer", None)
-        if value is not None:
-            dump(value, "button_pointer")
-
-        value = getattr(context, "button_prop", None)
-        if value is not None:
-            dump(value, "button_prop")
-
-        value = getattr(context, "button_operator", None)
-        if value is not None:
-            dump(value, "button_operator")
-
-        return {'FINISHED'}
-
-
-# This class has to be exactly named like that to insert an entry in the right click menu
-class WM_MT_button_context(Menu):
-    bl_label = "Unused"
-
-    def draw(self, context):
-        pass
-
-
-def menu_func(self, context):
-    layout = self.layout
-    layout.separator()
-    layout.operator(WM_OT_button_context_test.bl_idname)
-
-classes = (
-    WM_OT_button_context_test,
-    WM_MT_button_context,
-)
-
-
-def register():
-    for cls in classes:
-        bpy.utils.register_class(cls)
-    bpy.types.WM_MT_button_context.append(menu_func)
-
-
-def unregister():
-    for cls in classes:
-        bpy.utils.unregister_class(cls)
-    bpy.types.WM_MT_button_context.remove(menu_func)
-
-if __name__ == "__main__":
-    register()

doc/python_api/examples/bpy.types.Operator.5.py

@@ -2,14 +2,13 @@
 Modal Execution
 +++++++++++++++
 
-This operator defines a :class:`Operator.modal` function that will keep being
-run to handle events until it returns ``{'FINISHED'}`` or ``{'CANCELLED'}``.
+This operator defines a :class:`Operator.modal` function which running,
+handling events until it returns ``{'FINISHED'}`` or ``{'CANCELLED'}``.
 
-Modal operators run every time a new event is detected, such as a mouse click
-or key press. Conversely, when no new events are detected, the modal operator
-will not run. Modal operators are especially useful for interactive tools, an
-operator can have its own state where keys toggle options as the operator runs.
-Grab, Rotate, Scale, and Fly-Mode are examples of modal operators.
+Grab, Rotate, Scale and Fly-Mode are examples of modal operators.
+They are especially useful for interactive tools,
+your operator can have its own state where keys toggle options as the operator
+runs.
 
 :class:`Operator.invoke` is used to initialize the operator as being by
 returning ``{'RUNNING_MODAL'}``, initializing the modal loop.

doc/python_api/examples/bpy.types.Operator.6.py

@@ -1,38 +0,0 @@
-"""
-Enum Search Popup
-+++++++++++++++++
-
-You may want to have an operator prompt the user to select an item
-from a search field, this can be done using :class:`bpy.types.Operator.invoke_search_popup`.
-"""
-import bpy
-from bpy.props import EnumProperty
-
-
-class SearchEnumOperator(bpy.types.Operator):
-    bl_idname = "object.search_enum_operator"
-    bl_label = "Search Enum Operator"
-    bl_property = "my_search"
-
-    my_search = EnumProperty(
-        name="My Search",
-        items=(
-            ('FOO', "Foo", ""),
-            ('BAR', "Bar", ""),
-            ('BAZ', "Baz", ""),
-        ),
-    )
-
-    def execute(self, context):
-        self.report({'INFO'}, "Selected:" + self.my_search)
-        return {'FINISHED'}
-
-    def invoke(self, context, event):
-        context.window_manager.invoke_search_popup(self)
-        return {'RUNNING_MODAL'}
-
-
-bpy.utils.register_class(SearchEnumOperator)
-
-# test call
-bpy.ops.object.search_enum_operator('INVOKE_DEFAULT')

doc/python_api/examples/bpy.types.PropertyGroup.py

@@ -13,7 +13,7 @@ be animated, accessed from the user interface and from python.
    definitions are not, this means whenever you load blender the class needs
    to be registered too.
 
-   This is best done by creating an add-on which loads on startup and registers
+   This is best done by creating an addon which loads on startup and registers
    your properties.
 
 .. note::

doc/python_api/examples/mathutils.Vector.py

@@ -49,7 +49,7 @@ vec2d[:] = vec3d[:2]
 
 
 # Vectors support 'swizzle' operations
-# See https://en.wikipedia.org/wiki/Swizzling_(computer_graphics)
+# See http://en.wikipedia.org/wiki/Swizzling_(computer_graphics)
 vec.xyz = vec.zyx
 vec.xy = vec4d.zw
 vec.xyz = vec4d.wzz

doc/python_api/rst/bge.app.rst

@@ -47,3 +47,4 @@ Module to access application values that remain unchanged during runtime.
    True if the BGE has been built with physics support.
 
    :type: bool
+

doc/python_api/rst/bge.constraints.rst

@@ -2,33 +2,12 @@
 Physics Constraints (bge.constraints)
 =====================================
 
-Bullet Physics provides collision detection
-and rigid body dynamics for the Blender Game Engine.
-
-Features:
-
-- Vehicle simulation.
-- Rigid body constraints: hinge and point to point (ball socket).
-- Access to internal physics settings,
-  like deactivation time, and debugging features
-
 .. module:: bge.constraints
 
-.. note:: Note about parameter settings
-
-   Since this API is not well documented, it can be unclear what kind of values to use for setting parameters.
-   In general, damping settings should be in the range of 0 to 1 and
-   stiffness settings should not be much higher than about 10.
-
 
 Examples
 --------
 
-.. seealso::
-
-   For more examples of Bullet physics and how to use them
-   see the `pybullet forum <https://pybullet.org/Bullet/phpBB3/viewforum.php?f=17>`__.
-
 .. include:: __/examples/bge.constraints.py
    :start-line: 1
    :end-line: 4
@@ -354,3 +333,4 @@ Constraint type to be used with :func:`createConstraint`.
 .. data:: GENERIC_6DOF_CONSTRAINT
 
    .. to do
+

doc/python_api/rst/bge.texture.rst

@@ -6,15 +6,18 @@ Video Texture (bge.texture)
 Introduction
 ************
 
-The ``bge.texture`` module allows you to manipulate textures during the game.
-Several sources for texture are possible: video files, image files, video capture,
-memory buffer, camera render or a mix of that.
-The video and image files can be loaded from the Internet using a URL instead of a file name.
-In addition, you can apply filters on the images before sending them to the GPU,
-allowing video effect: blue screen, color band, gray, normal map.
-``bge.texture`` uses FFmpeg to load images and videos.
-All the formats and codecs that FFmpeg supports are supported by ``bge.texture``,
-including but not limited to:
+The bge.texture module allows you to manipulate textures during the game.
+
+Several sources for texture are possible: video files, image files, video capture, memory buffer,
+camera render or a mix of that.
+
+The video and image files can be loaded from the internet using an URL instead of a file name.
+
+In addition, you can apply filters on the images before sending them to the GPU, allowing video effect:
+blue screen, color band, gray, normal map.
+
+bge.texture uses FFmpeg to load images and videos.
+All the formats and codecs that FFmpeg supports are supported by this module, including but not limited to:
 
 * AVI
 * Ogg
@@ -25,45 +28,16 @@ including but not limited to:
 * videoForWindows capture card (this includes many webcams)
 * JPG
 
-
-How it works
-------------
-
-The principle is simple: first you identify a texture on an existing object using the
-:class:`~bge.texture.materialID` function, then you create a new texture with dynamic content
+The principle is simple: first you identify a texture on an existing object using
+the :class:`~bge.texture.materialID` function, then you create a new texture with dynamic content
 and swap the two textures in the GPU.
 
-The game engine is not aware of the substitution and continues to display the object as always,
+The GE is not aware of the substitution and continues to display the object as always,
 except that you are now in control of the texture.
 
 When the texture object is deleted, the new texture is deleted and the old texture restored.
 
-
-Game Preparation
-----------------
-
-Before you can use the :mod:`bge.texture` module,
-you must have objects with textures applied appropriately.
-
-Imagine you want to have a television showing live broadcast programs in the game.
-You will create a television object and UV-apply a different texture at the place of the screen,
-for example ``tv.png``. What this texture looks like is not important;
-probably you want to make it dark gray to simulate power-off state.
-When the television must be turned on, you create a dynamic texture from a video capture card
-and use it instead of ``tv.png``: the TV screen will come to life.
-
-You have two ways to define textures that ``bge.texture`` can grab:
-
-- Simple UV texture.
-- Blender material with image texture channel.
-
-Because ``bge.texture`` works at texture level, it is compatible with all
-the Blender Game Engine's fancy texturing features: GLSL, multi-texture, custom shaders, etc.
-
-
-********
-Examples
-********
+.. module:: bge.texture
 
 .. include:: __/examples/bge.texture.py
    :start-line: 1
@@ -79,6 +53,7 @@ Examples
 .. literalinclude:: __/examples/bge.texture.1.py
    :lines: 8-
 
+
 .. include:: __/examples/bge.texture.2.py
    :start-line: 1
    :end-line: 6
@@ -87,15 +62,13 @@ Examples
    :lines: 8-
 
 
-.. module:: bge.texture
-
 *************
 Video classes
 *************
 
 .. class:: VideoFFmpeg(file, capture=-1, rate=25.0, width=0, height=0)
 
-   FFmpeg video source, used for video files, video captures, or video streams.
+   FFmpeg video source.
 
    :arg file: Path to the video to load; if capture >= 0 on Windows, this parameter will not be used.
    :type file: str
@@ -117,20 +90,19 @@ Video classes
 
    .. attribute:: range
 
-      The start and stop time of the video playback, expressed in seconds from beginning.
-      By default the entire video.
+      Replay range.
 
       :type: sequence of two floats
 
    .. attribute:: repeat
 
-      Number of times to replay the video, -1 for infinite repeat.
+      Repeat count, -1 for infinite repeat.
 
       :type: int
 
    .. attribute:: framerate
 
-      Relative frame rate, <1.0 for slow, >1.0 for fast.
+      Frame rate.
 
       :type: float
 
@@ -154,26 +126,21 @@ Video classes
 
    .. attribute:: scale
 
-      Set to True to activate fast nearest neighbor scaling algorithm.
-      Texture width and height must be a power of 2.
-      If the video picture size is not a power of 2, rescaling is required.
-      By default ``bge.texture`` uses the precise but slow ``gluScaleImage()`` function.
-      Best is to rescale the video offline so that no scaling is necessary at runtime!
+      Fast scale of image (near neighbour).
 
       :type: bool
 
    .. attribute:: flip
 
-      If True the imaged will be flipped vertically.
-      FFmpeg always delivers the image upside down, so this attribute is set to True by default.
+      Flip image vertically.
 
       :type: bool
 
    .. attribute:: filter
 
-      An additional filter that is applied on the video before sending it to the GPU.
+      Pixel filter.
 
-      :type: one of:
+      :type: one of...
 
          * :class:`FilterBGR24`
          * :class:`FilterBlueScreen`
@@ -240,7 +207,7 @@ Image classes
 
 .. class:: ImageFFmpeg(file)
 
-   FFmpeg image source, used for image files and web based images.
+   FFmpeg image source.
 
    :arg file: Path to the image to load.
    :type file: str
@@ -319,8 +286,7 @@ Image classes
 
 .. class:: ImageBuff(width, height, color=0, scale=False)
 
-   Image from application memory.
-   For computer generated images, drawing applications.
+   Image source from image buffer.
 
    :arg width: Width of the image.
    :type width: int
@@ -511,7 +477,7 @@ Image classes
 
 .. class:: ImageMix
 
-   Image mixer used to mix multiple image sources together.
+   Image mixer.
 
    .. attribute:: filter
 
@@ -626,7 +592,7 @@ Image classes
 
 .. class:: ImageRender(scene, camera)
 
-   Image source from a render of a non active camera.
+   Image source from render.
    The render is done on a custom framebuffer object if fbo is specified,
    otherwise on the default framebuffer.
 
@@ -715,7 +681,7 @@ Image classes
 
    .. attribute:: zbuff
 
-      Use depth component of render as grayscale color - suitable for texture source.
+      Use depth component of render as grey scale color -  suitable for texture source.
 
       :type: bool
 
@@ -757,8 +723,7 @@ Image classes
 
 .. class:: ImageViewport
 
-   Image source from viewport rendered by the active camera.
-   To render from a non active camera see :class:`ImageRender`.
+   Image source from viewport.
 
    .. attribute:: alpha
 
@@ -809,10 +774,11 @@ Image classes
 
       Refresh video - copy the viewport to an external buffer (optional) then invalidate its current content.
 
-      :arg buffer: An optional object that implements the buffer protocol. If specified,
-         the image is copied to the buffer, which must be big enough or an exception is thrown.
-         The transfer to the buffer is optimal if no processing of the image is needed. This is the case if
-         ``flip=False, alpha=True, scale=False, whole=True, depth=False, zbuff=False`` and no filter is set.
+      :arg buffer: An optional object that implements the buffer protocol.
+         If specified, the image is copied to the buffer, which must be big enough or an exception is thrown.
+         The transfer to the buffer is optimal if no processing of the image is needed.
+         This is the case if ``flip=False, alpha=True, scale=False, whole=True, depth=False, zbuff=False``
+         and no filter is set.
       :type buffer: any buffer type
       :arg format: An optional image format specifier for the image that will be copied to the buffer.
          Only valid values are "RGBA" or "BGRA"
@@ -851,7 +817,7 @@ Image classes
 
    .. attribute:: zbuff
 
-      Use depth component of viewport as grayscale color - suitable for texture source.
+      Use depth component of viewport as grey scale color - suitable for texture source.
 
       :type: bool
 
@@ -872,16 +838,18 @@ Image classes
    :arg capture: Card number from which the input video must be captured.
    :type capture: int
 
-   The format argument must be written as ``<displayMode>/<pixelFormat>[/3D][:<cacheSize>]``
-   where ``<displayMode>`` describes the frame size and rate and <pixelFormat> the encoding of the pixels.
+   The format argument must be written as ``<displayMode>/<pixelFormat>[/3D][:<cacheSize>]`` where ``<displayMode>``
+   describes the frame size and rate and <pixelFormat> the encoding of the pixels.
    The optional ``/3D`` suffix is to be used if the video stream is stereo with a left and right eye feed.
    The optional ``:<cacheSize>`` suffix determines the number of the video frames kept in cache, by default 8.
-   Some DeckLink cards won't work below a certain cache size. The default value 8 should be sufficient for all cards.
+   Some DeckLink cards won't work below a certain cache size.
+   The default value 8 should be sufficient for all cards.
    You may try to reduce the cache size to reduce the memory footprint. For example the The 4K Extreme is known
    to work with 3 frames only, the Extreme 2 needs 4 frames and the Intensity Shuttle needs 6 frames, etc.
    Reducing the cache size may be useful when Decklink is used in conjunction with GPUDirect:
    all frames must be locked in memory in that case and that puts a lot of pressure on memory.
-   If you reduce the cache size too much, you'll get no error but no video feed either.
+   If you reduce the cache size too much,
+   you'll get no error but no video feed either.
 
    The valid ``<displayMode>`` values are copied from the ``BMDDisplayMode`` enum in the DeckLink API
    without the 'bmdMode' prefix. In case a mode that is not in this list is added in a later version
@@ -1038,20 +1006,15 @@ Texture classes
 
 .. class:: Texture(gameObj, materialID=0, textureID=0, textureObj=None)
 
-   Class that creates the ``Texture`` object that loads the dynamic texture on the GPU.
+   Texture object.
 
    :arg gameObj: Game object to be created a video texture on.
    :type gameObj: :class:`~bge.types.KX_GameObject`
-   :arg materialID: Material ID default, 0 is the first material. (optional)
+   :arg materialID: Material ID. (optional)
    :type materialID: int
-   :arg textureID: Texture index in case of multi-texture channel, 0 = first channel by default.
-      In case of UV texture, this parameter should always be 0. (optional)
+   :arg textureID: Texture ID. (optional)
    :type textureID: int
-   :arg textureObj: Reference to another ``Texture`` object with shared bindId
-      which he user might want to reuse the texture.
-      If this argument is used, you should not create any source on this texture
-      and there is no need to refresh it either: the other ``Texture`` object will
-      provide the texture for both materials/textures.(optional)
+   :arg textureObj: Texture object with shared bindId. (optional)
    :type textureObj: :class:`Texture`
 
    .. attribute:: bindId
@@ -1131,7 +1094,7 @@ Texture classes
 
    .. attribute:: source
 
-      This attribute must be set to one of the image sources. If the image size does not fit exactly
+      This attribute must be set to one of the image source. If the image size does not fit exactly
       the frame size, the extend attribute determines what to do.
 
       For best performance, the source image should match exactly the size of the output frame.
@@ -1297,8 +1260,8 @@ Filter classes
 
 .. class:: FilterGray
 
-   Filter for grayscale effect.
-   Proportions of R, G and B contributions in the output grayscale are 28:151:77.
+   Filter for gray scale effect.
+   Proportions of R, G and B contributions in the output gray scale are 28:151:77.
 
    .. attribute:: previous
 
@@ -1405,7 +1368,7 @@ Functions
 
    Returns a :class:`~bgl.Buffer` corresponding to the current image stored in a texture source object.
 
-   :arg image: Image source object of type:
+   :arg image: Image source object of type ...
 
       * :class:`VideoFFmpeg`
       * :class:`ImageFFmpeg`
@@ -1424,7 +1387,7 @@ Functions
 
         - "BGR" will return 3 bytes per pixel with the
           Blue, Green and Red channels in that order.
-        - "RGB1" will return 4 bytes per pixel with the
+        - "RGB1" will return 4 bytes per pixel with the 
           Red, Green, Blue channels in that order and the alpha channel forced to 255.
 
       - A special mode "F" allows to return the image as an array of float.
@@ -1466,10 +1429,9 @@ Functions
 
 .. function:: setLogFile(filename)
 
-   Sets the name of a text file in which runtime error messages will be written,
-   in addition to the printing of the messages on the Python console.
-   Only the runtime errors specific to the VideoTexture module are written in that file,
-   ordinary runtime time errors are not written.
+   Sets the name of a text file in which runtime error messages will be written, in addition to the printing
+   of the messages on the Python console. Only the runtime errors specific to the VideoTexture module
+   are written in that file, ordinary runtime time errors are not written.
 
    :arg filename: Name of the error log file.
    :type filename: str
@@ -1555,3 +1517,4 @@ See Wikipedia's `Blend Modes <https://en.wikipedia.org/wiki/Blend_modes>`_ for r
 .. data:: IMB_BLEND_COPY_RGB
 
 .. data:: IMB_BLEND_COPY_ALPHA
+

doc/python_api/rst/bge.types.rst

@@ -35,3 +35,4 @@ Types
    :glob:
 
    bge.types.*
+

doc/python_api/rst/bge_types/bge.types.BL_ActionActuator.rst

@@ -1,6 +1,8 @@
 BL_ActionActuator(SCA_IActuator)
 ================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: BL_ActionActuator(SCA_IActuator)
@@ -73,3 +75,4 @@ base class --- :class:`SCA_IActuator`
       The name of the property that is set to the current frame number.
 
       :type: string
+

doc/python_api/rst/bge_types/bge.types.BL_ArmatureActuator.rst

@@ -1,6 +1,8 @@
 BL_ArmatureActuator(SCA_IActuator)
 ==================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: BL_ArmatureActuator(SCA_IActuator)
@@ -56,3 +58,4 @@ base class --- :class:`SCA_IActuator`
       The influence this actuator will set on the constraint it controls.
 
       :type: float.
+

doc/python_api/rst/bge_types/bge.types.BL_ArmatureBone.rst

@@ -1,6 +1,8 @@
 BL_ArmatureBone(PyObjectPlus)
 =============================
 
+.. module:: bge.types
+
 base class --- :class:`PyObjectPlus`
 
 .. class:: BL_ArmatureBone(PyObjectPlus)

doc/python_api/rst/bge_types/bge.types.BL_ArmatureChannel.rst

@@ -1,6 +1,8 @@
 BL_ArmatureChannel(PyObjectPlus)
 ================================
 
+.. module:: bge.types
+
 base class --- :class:`PyObjectPlus`
 
 .. class:: BL_ArmatureChannel(PyObjectPlus)
@@ -273,3 +275,4 @@ base class --- :class:`PyObjectPlus`
       .. note::
       
          You can read the result of the calculation in rotation or euler_rotation attributes after setting this attribute.
+

doc/python_api/rst/bge_types/bge.types.BL_ArmatureConstraint.rst

@@ -1,6 +1,8 @@
 BL_ArmatureConstraint(PyObjectPlus)
 ===================================
 
+.. module:: bge.types
+
 base class --- :class:`PyObjectPlus`
 
 .. class:: BL_ArmatureConstraint(PyObjectPlus)
@@ -124,3 +126,4 @@ base class --- :class:`PyObjectPlus`
       Additional mode for IK constraint. Currently only used for Distance constraint:
 
       :type: integer
+

doc/python_api/rst/bge_types/bge.types.BL_ArmatureObject.rst

@@ -1,6 +1,8 @@
 BL_ArmatureObject(KX_GameObject)
 ================================
 
+.. module:: bge.types
+
 base class --- :class:`KX_GameObject`
 
 .. class:: BL_ArmatureObject(KX_GameObject)
@@ -29,3 +31,4 @@ base class --- :class:`KX_GameObject`
       This action is unecessary if a KX_ArmatureActuator with mode run is active
       or if an action is playing. Use this function in other cases. It must be called
       on each frame to ensure that the armature is updated continously.
+

doc/python_api/rst/bge_types/bge.types.BL_Shader.rst

@@ -1,6 +1,8 @@
 BL_Shader(PyObjectPlus)
 =======================
 
+.. module:: bge.types
+
 base class --- :class:`PyObjectPlus`
 
 .. class:: BL_Shader(PyObjectPlus)
@@ -225,3 +227,4 @@ base class --- :class:`PyObjectPlus`
    .. method:: validate()
 
       Validate the shader object.
+

doc/python_api/rst/bge_types/bge.types.BL_ShapeActionActuator.rst

@@ -1,6 +1,8 @@
 BL_ShapeActionActuator(SCA_IActuator)
 =====================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: BL_ShapeActionActuator(SCA_IActuator)
@@ -57,7 +59,7 @@ base class --- :class:`SCA_IActuator`
 
    .. attribute:: mode
 
-      The operation mode of the actuator. Can be one of :ref:`these constants<action-actuator>`.
+      The operation mode of the actuator. Can be one of :ref:`these constants<shape-action-actuator>`.
 
       :type: integer
 
@@ -66,3 +68,5 @@ base class --- :class:`SCA_IActuator`
       The name of the property that is set to the current frame number.
 
       :type: string
+
+

doc/python_api/rst/bge_types/bge.types.CListValue.rst

@@ -1,6 +1,8 @@
 CListValue(CPropValue)
 ======================
 
+.. module:: bge.types
+
 base class --- :class:`CPropValue`
 
 .. class:: CListValue(CPropValue)
@@ -67,3 +69,4 @@ base class --- :class:`CPropValue`
       .. warning::
 
          The id can't be stored as an integer in game object properties, as those only have a limited range that the id may not be contained in. Instead an id can be stored as a string game property and converted back to an integer for use in from_id lookups.
+

doc/python_api/rst/bge_types/bge.types.CPropValue.rst

@@ -1,8 +1,11 @@
 CPropValue(CValue)
 ==================
 
+.. module:: bge.types
+
 base class --- :class:`CValue`
 
 .. class:: CPropValue(CValue)
 
    This class has no python functions
+

doc/python_api/rst/bge_types/bge.types.CValue.rst

@@ -1,6 +1,8 @@
 CValue(PyObjectPlus)
 ====================
 
+.. module:: bge.types
+
 base class --- :class:`PyObjectPlus`
 
 .. class:: CValue(PyObjectPlus)

doc/python_api/rst/bge_types/bge.types.KX_ArmatureSensor.rst

@@ -1,6 +1,8 @@
 KX_ArmatureSensor(SCA_ISensor)
 ==============================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_ISensor`
 
 .. class:: KX_ArmatureSensor(SCA_ISensor)

doc/python_api/rst/bge_types/bge.types.KX_BlenderMaterial.rst

@@ -1,6 +1,8 @@
 KX_BlenderMaterial(PyObjectPlus)
 ================================
 
+.. module:: bge.types
+
 base class --- :class:`PyObjectPlus`
 
 .. class:: KX_BlenderMaterial(PyObjectPlus)
@@ -180,3 +182,4 @@ base class --- :class:`PyObjectPlus`
 
       :return: the material's index
       :rtype: integer
+

doc/python_api/rst/bge_types/bge.types.KX_Camera.rst

@@ -1,6 +1,8 @@
 KX_Camera(KX_GameObject)
 ========================
 
+.. module:: bge.types
+
 base class --- :class:`KX_GameObject`
 
 .. class:: KX_Camera(KX_GameObject)

doc/python_api/rst/bge_types/bge.types.KX_CameraActuator.rst

@@ -1,6 +1,8 @@
 KX_CameraActuator(SCA_IActuator)
 ================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_CameraActuator(SCA_IActuator)
@@ -42,3 +44,4 @@ base class --- :class:`SCA_IActuator`
       the object this actuator tracks.
 
       :type: :class:`KX_GameObject` or None
+

doc/python_api/rst/bge_types/bge.types.KX_CharacterWrapper.rst

@@ -1,6 +1,8 @@
 KX_CharacterWrapper(PyObjectPlus)
 =================================
 
+.. module:: bge.types
+
 base class --- :class:`PyObjectPlus`
 
 .. class:: KX_CharacterWrapper(PyObjectPlus)
@@ -40,3 +42,4 @@ base class --- :class:`PyObjectPlus`
    .. method:: jump()
 
       The character jumps based on it's jump speed.
+

doc/python_api/rst/bge_types/bge.types.KX_ConstraintActuator.rst

@@ -1,6 +1,8 @@
 KX_ConstraintActuator(SCA_IActuator)
 ====================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_ConstraintActuator(SCA_IActuator)

doc/python_api/rst/bge_types/bge.types.KX_ConstraintWrapper.rst

@@ -1,6 +1,8 @@
 KX_ConstraintWrapper(PyObjectPlus)
 ==================================
 
+.. module:: bge.types
+
 base class --- :class:`PyObjectPlus`
 
 .. class:: KX_ConstraintWrapper(PyObjectPlus)
@@ -138,3 +140,4 @@ base class --- :class:`PyObjectPlus`
          - :class:`~bge.constraints.CONETWIST_CONSTRAINT`
          - :class:`~bge.constraints.VEHICLE_CONSTRAINT`
          - :class:`~bge.constraints.GENERIC_6DOF_CONSTRAINT`
+

doc/python_api/rst/bge_types/bge.types.KX_FontObject.rst

@@ -1,6 +1,8 @@
 KX_FontObject(KX_GameObject)
 ============================
 
+.. module:: bge.types
+
 base class --- :class:`KX_GameObject`
 
 .. class:: KX_FontObject(KX_GameObject)
@@ -27,3 +29,4 @@ base class --- :class:`KX_GameObject`
       The text displayed by this Font object.
 
       :type: string
+

doc/python_api/rst/bge_types/bge.types.KX_GameActuator.rst

@@ -1,6 +1,8 @@
 KX_GameActuator(SCA_IActuator)
 ==============================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_GameActuator(SCA_IActuator)
@@ -18,3 +20,4 @@ base class --- :class:`SCA_IActuator`
       The mode of this actuator. Can be on of :ref:`these constants <game-actuator>`
 
       :type: Int
+

doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst

@@ -1,6 +1,8 @@
 KX_GameObject(SCA_IObject)
 ==========================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IObject`
 
 .. class:: KX_GameObject(SCA_IObject)
@@ -403,7 +405,7 @@ base class --- :class:`SCA_IObject`
 
       .. note::
 
-         This attribute is experimental and may be removed (but probably wont be).
+         This attribute is experemental and may be removed (but probably wont be).
 
       .. note::
 
@@ -417,7 +419,7 @@ base class --- :class:`SCA_IObject`
 
       .. note::
 
-         This attribute is experimental and may be removed (but probably wont be).
+         This attribute is experemental and may be removed (but probably wont be).
 
       .. note::
 
@@ -451,7 +453,7 @@ base class --- :class:`SCA_IObject`
 
    .. attribute:: childrenRecursive
 
-      all children of this object including children's children, (read-only).
+      all children of this object including childrens children, (read-only).
 
       :type: :class:`CListValue` of :class:`KX_GameObject`'s
 
@@ -534,7 +536,7 @@ base class --- :class:`SCA_IObject`
 
    .. method:: getAxisVect(vect)
 
-      Returns the axis vector rotates by the object's worldspace orientation.
+      Returns the axis vector rotates by the objects worldspace orientation.
       This is the equivalent of multiplying the vector by the orientation matrix.
 
       :arg vect: a vector to align the axis.
@@ -594,7 +596,7 @@ base class --- :class:`SCA_IObject`
 
       Gets the game object's linear velocity.
 
-      This method returns the game object's velocity through it's center of mass, ie no angular velocity component.
+      This method returns the game object's velocity through it's centre of mass, ie no angular velocity component.
 
       :arg local:
          * False: you get the "global" velocity ie: relative to world orientation.
@@ -607,7 +609,7 @@ base class --- :class:`SCA_IObject`
 
       Sets the game object's linear velocity.
 
-      This method sets game object's velocity through it's center of mass,
+      This method sets game object's velocity through it's centre of mass,
       ie no angular velocity component.
 
       This requires a dynamic object.
@@ -812,7 +814,7 @@ base class --- :class:`SCA_IObject`
             # do something
             pass
 
-      The face parameter determines the orientation of the normal.
+      The face paremeter determines the orientation of the normal.
 
       * 0 => hit normal is always oriented towards the ray origin (as if you casted the ray from outside)
       * 1 => hit normal is the real face normal (only for mesh object, otherwise face has no effect)
@@ -909,7 +911,7 @@ base class --- :class:`SCA_IObject`
 
       .. note::
 
-         The gameObject argument has an advantage that it can convert from a mesh with modifiers applied (such as the Subdivision Surface modifier).
+         The gameObject argument has an advantage that it can convert from a mesh with modifiers applied (such as subsurf).
 
       .. warning::
 
@@ -917,7 +919,7 @@ base class --- :class:`SCA_IObject`
 
       .. warning::
 
-         If the object is a part of a compound object it will fail (parent or child)
+         If the object is a part of a combound object it will fail (parent or child)
 
       .. warning::
 

doc/python_api/rst/bge_types/bge.types.KX_LibLoadStatus.rst

@@ -1,6 +1,8 @@
 KX_LibLoadStatus(PyObjectPlus)
 ==============================
 
+.. module:: bge.types
+
 base class --- :class:`PyObjectPlus`
 
 .. class:: KX_LibLoadStatus(PyObjectPlus)
@@ -46,3 +48,4 @@ base class --- :class:`PyObjectPlus`
       The amount of time, in seconds, the lib load took (0 until the operation is complete).
 
       :type: float
+

doc/python_api/rst/bge_types/bge.types.KX_LightObject.rst

@@ -1,6 +1,8 @@
 KX_LightObject(KX_GameObject)
 =============================
 
+.. module:: bge.types
+
 base class --- :class:`KX_GameObject`
 
 .. class:: KX_LightObject(KX_GameObject)
@@ -159,3 +161,4 @@ base class --- :class:`KX_GameObject`
       .. note::
          
          Higher values result in a more focused light source.
+

doc/python_api/rst/bge_types/bge.types.KX_MeshProxy.rst

@@ -1,6 +1,8 @@
 KX_MeshProxy(SCA_IObject)
 =========================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IObject`
 
 .. class:: KX_MeshProxy(SCA_IObject)
@@ -129,3 +131,4 @@ base class --- :class:`SCA_IObject`
       :type uv_index: integer
       :arg uv_index_from: optional uv index to copy from, -1 to transform the current uv.
       :type uv_index_from: integer
+

doc/python_api/rst/bge_types/bge.types.KX_MouseActuator.rst

@@ -1,6 +1,8 @@
 KX_MouseActuator(SCA_IActuator)
 ====================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_MouseActuator(SCA_IActuator)
@@ -98,3 +100,4 @@ base class --- :class:`SCA_IActuator`
       The current rotational offset caused by the mouse actuator in degrees.
 
       :type: list (vector of 2 floats)
+

doc/python_api/rst/bge_types/bge.types.KX_MouseFocusSensor.rst

@@ -1,6 +1,8 @@
 KX_MouseFocusSensor(SCA_MouseSensor)
 ====================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_MouseSensor`
 
 .. class:: KX_MouseFocusSensor(SCA_MouseSensor)

doc/python_api/rst/bge_types/bge.types.KX_NavMeshObject.rst

@@ -1,6 +1,8 @@
 KX_NavMeshObject(KX_GameObject)
 ===============================
 
+.. module:: bge.types
+
 base class --- :class:`KX_GameObject`
 
 .. class:: KX_NavMeshObject(KX_GameObject)
@@ -42,3 +44,4 @@ base class --- :class:`KX_GameObject`
       Rebuild the navigation mesh.
 
       :return: None
+

doc/python_api/rst/bge_types/bge.types.KX_NearSensor.rst

@@ -1,6 +1,8 @@
 KX_NearSensor(KX_TouchSensor)
 =============================
 
+.. module:: bge.types
+
 base class --- :class:`KX_TouchSensor`
 
 .. class:: KX_NearSensor(KX_TouchSensor)
@@ -18,3 +20,4 @@ base class --- :class:`KX_TouchSensor`
       The near sensor deactivates when the object exceeds this distance.
 
       :type: float
+

doc/python_api/rst/bge_types/bge.types.KX_NetworkMessageActuator.rst

@@ -1,6 +1,8 @@
 KX_NetworkMessageActuator(SCA_IActuator)
 ========================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_NetworkMessageActuator(SCA_IActuator)
@@ -30,3 +32,4 @@ base class --- :class:`SCA_IActuator`
       Send a property instead of a regular body message.
 
       :type: boolean
+

doc/python_api/rst/bge_types/bge.types.KX_NetworkMessageSensor.rst

@@ -1,6 +1,8 @@
 KX_NetworkMessageSensor(SCA_ISensor)
 ====================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_ISensor`
 
 .. class:: KX_NetworkMessageSensor(SCA_ISensor)
@@ -32,3 +34,5 @@ base class --- :class:`SCA_ISensor`
       The list of message bodies received. (read-only).
 
       :type: list of strings
+
+

doc/python_api/rst/bge_types/bge.types.KX_ObjectActuator.rst

@@ -1,6 +1,8 @@
 KX_ObjectActuator(SCA_IActuator)
 ================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_ObjectActuator(SCA_IActuator)
@@ -124,3 +126,4 @@ base class --- :class:`SCA_IActuator`
       The object that is used as reference to compute the velocity for the servo controller.
 
       :type: :class:`KX_GameObject` or None
+

doc/python_api/rst/bge_types/bge.types.KX_ParentActuator.rst

@@ -1,6 +1,8 @@
 KX_ParentActuator(SCA_IActuator)
 ================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_ParentActuator(SCA_IActuator)
@@ -33,3 +35,4 @@ base class --- :class:`SCA_IActuator`
       Effective only if the shape is not added to the parent compound shape.
 
       :type: boolean
+

doc/python_api/rst/bge_types/bge.types.KX_PolyProxy.rst

@@ -1,6 +1,8 @@
 KX_PolyProxy(SCA_IObject)
 =========================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IObject`
 
 .. class:: KX_PolyProxy(SCA_IObject)
@@ -134,3 +136,4 @@ base class --- :class:`SCA_IObject`
 
       :return: mesh proxy
       :rtype: :class:`MeshProxy`
+

doc/python_api/rst/bge_types/bge.types.KX_RadarSensor.rst

@@ -1,6 +1,8 @@
 KX_RadarSensor(KX_NearSensor)
 =============================
 
+.. module:: bge.types
+
 base class --- :class:`KX_NearSensor`
 
 .. class:: KX_RadarSensor(KX_NearSensor)
@@ -39,3 +41,4 @@ base class --- :class:`KX_NearSensor`
 
       KX_RADAR_AXIS_POS_X, KX_RADAR_AXIS_POS_Y, KX_RADAR_AXIS_POS_Z, 
       KX_RADAR_AXIS_NEG_X, KX_RADAR_AXIS_NEG_Y, KX_RADAR_AXIS_NEG_Z
+

doc/python_api/rst/bge_types/bge.types.KX_RaySensor.rst

@@ -1,6 +1,8 @@
 KX_RaySensor(SCA_ISensor)
 =========================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_ISensor`
 
 .. class:: KX_RaySensor(SCA_ISensor)
@@ -73,3 +75,4 @@ base class --- :class:`SCA_ISensor`
       * KX_RAY_AXIS_NEG_X
       * KX_RAY_AXIS_NEG_Y
       * KX_RAY_AXIS_NEG_Z
+

doc/python_api/rst/bge_types/bge.types.KX_SCA_AddObjectActuator.rst

@@ -1,6 +1,8 @@
 KX_SCA_AddObjectActuator(SCA_IActuator)
 =======================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_SCA_AddObjectActuator(SCA_IActuator)
@@ -50,3 +52,4 @@ base class --- :class:`SCA_IActuator`
       adds the object without needing to calling SCA_PythonController.activate()
 
       .. note:: Use objectLastCreated to get the newly created object.
+

doc/python_api/rst/bge_types/bge.types.KX_SCA_DynamicActuator.rst

@@ -1,6 +1,8 @@
 KX_SCA_DynamicActuator(SCA_IActuator)
 =====================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_SCA_DynamicActuator(SCA_IActuator)
@@ -24,3 +26,4 @@ base class --- :class:`SCA_IActuator`
       the mass value for the KX_DYN_SET_MASS operation.
 
       :type: float
+

doc/python_api/rst/bge_types/bge.types.KX_SCA_EndObjectActuator.rst

@@ -1,6 +1,8 @@
 KX_SCA_EndObjectActuator(SCA_IActuator)
 =======================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_SCA_EndObjectActuator(SCA_IActuator)
@@ -8,3 +10,4 @@ base class --- :class:`SCA_IActuator`
    Edit Object Actuator (in End Object mode)
 
    This actuator has no python methods.
+

doc/python_api/rst/bge_types/bge.types.KX_SCA_ReplaceMeshActuator.rst

@@ -1,6 +1,8 @@
 KX_SCA_ReplaceMeshActuator(SCA_IActuator)
 =========================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_SCA_ReplaceMeshActuator(SCA_IActuator)
@@ -84,3 +86,4 @@ base class --- :class:`SCA_IActuator`
    .. method:: instantReplaceMesh()
 
       Immediately replace mesh without delay.
+

doc/python_api/rst/bge_types/bge.types.KX_Scene.rst

@@ -1,6 +1,8 @@
 KX_Scene(PyObjectPlus)
 ======================
 
+.. module:: bge.types
+
 base class --- :class:`PyObjectPlus`
 
 .. class:: KX_Scene(PyObjectPlus)
@@ -181,3 +183,4 @@ base class --- :class:`PyObjectPlus`
    .. method:: drawObstacleSimulation()
 
       Draw debug visualization of obstacle simulation.
+

doc/python_api/rst/bge_types/bge.types.KX_SceneActuator.rst

@@ -1,6 +1,8 @@
 KX_SceneActuator(SCA_IActuator)
 ===============================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_SceneActuator(SCA_IActuator)
@@ -44,3 +46,4 @@ base class --- :class:`SCA_IActuator`
       The mode of the actuator.
 
       :type: integer from 0 to 5.
+

doc/python_api/rst/bge_types/bge.types.KX_SoundActuator.rst

@@ -1,6 +1,8 @@
 KX_SoundActuator(SCA_IActuator)
 ===============================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_SoundActuator(SCA_IActuator)
@@ -110,3 +112,4 @@ base class --- :class:`SCA_IActuator`
       Stops the sound.
 
       :return: None
+

doc/python_api/rst/bge_types/bge.types.KX_StateActuator.rst

@@ -1,6 +1,8 @@
 KX_StateActuator(SCA_IActuator)
 ===============================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_StateActuator(SCA_IActuator)
@@ -24,3 +26,4 @@ base class --- :class:`SCA_IActuator`
       The bits that are 0 are will be left unmodified expect for the Copy operation which copies the mask to the object state.
 
       :type: integer
+

doc/python_api/rst/bge_types/bge.types.KX_SteeringActuator.rst

@@ -1,6 +1,8 @@
 KX_SteeringActuator(SCA_IActuator)
 ==================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_SteeringActuator(SCA_IActuator)
@@ -66,3 +68,4 @@ base class --- :class:`SCA_IActuator`
       Path update period
 
       :type: int
+

doc/python_api/rst/bge_types/bge.types.KX_TouchSensor.rst

@@ -1,6 +1,8 @@
 KX_TouchSensor(SCA_ISensor)
 ===========================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_ISensor`
 
 .. class:: KX_TouchSensor(SCA_ISensor)
@@ -42,3 +44,4 @@ base class --- :class:`SCA_ISensor`
       The material of the object in the face hit by the ray. (read-only).
 
       :type: string
+

doc/python_api/rst/bge_types/bge.types.KX_TrackToActuator.rst

@@ -1,6 +1,8 @@
 KX_TrackToActuator(SCA_IActuator)
 =================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_TrackToActuator(SCA_IActuator)

doc/python_api/rst/bge_types/bge.types.KX_VehicleWrapper.rst

@@ -1,6 +1,8 @@
 KX_VehicleWrapper(PyObjectPlus)
 ===============================
 
+.. module:: bge.types
+
 base class --- :class:`PyObjectPlus`
 
 .. class:: KX_VehicleWrapper(PyObjectPlus)
@@ -161,3 +163,4 @@ base class --- :class:`PyObjectPlus`
 
       :arg wheelIndex: the wheel index
       :type wheelIndex: integer
+

doc/python_api/rst/bge_types/bge.types.KX_VertexProxy.rst

@@ -1,6 +1,8 @@
 KX_VertexProxy(SCA_IObject)
 ===========================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IObject`
 
 .. class:: KX_VertexProxy(SCA_IObject)
@@ -204,3 +206,4 @@ base class --- :class:`SCA_IObject`
       :type:  sequence of floats [r, g, b]
 
       :arg normal: the new normal of this vertex.
+

doc/python_api/rst/bge_types/bge.types.KX_VisibilityActuator.rst

@@ -1,6 +1,8 @@
 KX_VisibilityActuator(SCA_IActuator)
 ====================================
 
+.. module:: bge.types
+
 base class --- :class:`SCA_IActuator`
 
 .. class:: KX_VisibilityActuator(SCA_IActuator)
@@ -24,3 +26,4 @@ base class --- :class:`SCA_IActuator`
       whether the visibility/occlusion should be propagated to all children of the object.
 
       :type: boolean
+

doc/python_api/rst/bge_types/bge.types.KX_WorldInfo.rst

@@ -1,6 +1,8 @@
 KX_WorldInfo(PyObjectPlus)
 =============================
 
+.. module:: bge.types
+
 base class --- :class:`PyObjectPlus`
 
 .. class:: KX_WorldInfo(PyObjectPlus)