First commit to this branch

This branch is supposed to serve as a template and tutorial to
newcomers of the Blender codebase.

.clang-format

@@ -1,248 +0,0 @@
-
-# Configuration of clang-format
-# =============================
-#
-# Tested to work with versions: 6 to 8.
-
-# This causes parameters on continuations to align to the opening brace.
-#
-#   like_this_long_name(parameter_one,
-#                       parameter_two,
-#                       parameter_three);
-#
-AlignAfterOpenBracket: 'Align'
-
-# Disallow short functions on one line; break them up.
-AllowShortBlocksOnASingleLine: false
-
-# These two settings trigger stacking of parameters in most cases; this is
-# easier to read and also makes diffs easier to read (since an added or removed
-# parameter is obvious). For example, function calls will look like this:
-#
-#   like_this_long_name(parameter_one,
-#                       parameter_two,
-#                       parameter_three,
-#                       parameter_four,
-#                       parameter_five,
-#                       parameter_six);
-#
-# Instead of:
-#
-#   like_this_long_name(parameter_one, parameter_two, parameter_three, parameter_four,
-#                       parameter_five, parameter_six);
-#
-BinPackArguments: false
-BinPackParameters: false
-
-# Line width (don't exceed 100).
-ColumnLimit: 99
-
-# Cause initializer lists to have one member initialized per line, in the case
-# that all initializers can't fit on a single line.
-ConstructorInitializerAllOnOneLineOrOnePerLine: true
-
-# Indent the : after a constructor. For example:
-#
-#   explicit foo_class ()
-#       : member1_(5)
-#   {
-#   }
-#
-ConstructorInitializerIndentWidth: 4
-
-# Make access modifier slightly more visible.
-AccessModifierOffset: -1
-
-# This will unfortunately use spaces in some cases where it's not desired (like
-# function calls) but the overall result is better since it will allow
-# alignment to work properly with different tab width settings.
-ContinuationIndentWidth: 4
-
-# This tries to match Blender's style as much as possible. One
-BreakBeforeBraces: Custom
-BraceWrapping: {
-    AfterClass: 'false'
-    AfterControlStatement: 'false'
-    AfterEnum : 'false'
-    AfterFunction : 'true'
-    AfterNamespace : 'false'
-    AfterStruct : 'false'
-    AfterUnion : 'false'
-    BeforeCatch : 'true'
-    BeforeElse : 'true'
-    IndentBraces : 'false'
-    AfterObjCDeclaration: 'true'
-}
-
-# For switch statements, indent the cases.
-IndentCaseLabels: true
-
-# Indent after the hash inside preprocessor directives
-IndentPPDirectives: AfterHash
-
-BreakBeforeTernaryOperators: false
-
-SpaceAfterTemplateKeyword: false
-
-# Handy comment at the end of each C++ name space.
-FixNamespaceComments: true
-
-# Use "if (...)" instead of "if(...)", but have function calls like foo().
-SpaceBeforeParens: ControlStatements
-SpaceInEmptyParentheses: false
-
-# Use two spaces before trailing comments, for example
-#
-#   foo = bar;  // comment
-#
-# Note that this doesn't work for C-style comments.
-SpacesBeforeTrailingComments: 2
-
-# Reflow comments, developers must disable formatting as with code to override this.
-ReflowComments: true
-
-# Never use tabs for indentation.
-# Note: TabWidth and IndentWidth must be the same, or strange things happen.
-UseTab: Never
-TabWidth: 2
-IndentWidth: 2
-
-# Add a big penalty on breaking after the return type of functions. For example,
-#
-#   static void foo(...)
-#
-# Instead of:
-#
-#   static void
-#   foo(very long content here that maybe could be stacked)
-#
-PenaltyReturnTypeOnItsOwnLine: 10000
-
-# Avoid having function calls broken onto a new line:
-#
-#   int a = foo(
-#       long, list, of, many, params);
-#
-# Instead of:
-#
-#   int a =
-#       foo(long, list, of, many, params);
-#
-PenaltyBreakAssignment: 100
-
-AllowShortFunctionsOnASingleLine: None
-
-# Disable for now since it complicates initial migration tests,
-# TODO: look into enabling this in the future.
-SortIncludes: false
-
-# Don't right align escaped newlines to the right because we have a wide default
-AlignEscapedNewlines: DontAlign
-
-# Always break:
-#
-#   const char *foo =
-#       "multi"
-#       "line";
-#
-# Instead of:
-#
-#   const char *foo = "multi"
-#                     "line";
-#
-AlwaysBreakBeforeMultilineStrings: true
-
-# We don't want literal strings to break,
-# however clang-format seems to ignore this (sigh).
-PenaltyBreakString: 1000000
-
-# There are macros in Blender for custom for loops; tell Clang to treat them
-# like loops rather than an expression, and so put the { on the same line.
-#
-# To find these use multi-line regex search:
-# "^\s+[A-Z][A-Z0-9_]+\s*\([^\n]*\)\n\s*\{"
-ForEachMacros:
-  - BEGIN_ANIMFILTER_SUBCHANNELS
-  - BLI_FOREACH_SPARSE_RANGE
-  - BLI_SMALLSTACK_ITER_BEGIN
-  - BMO_ITER
-  - BMO_ITER_INDEX
-  - BMW_ITER
-  - BM_FACES_OF_VERT_ITER_BEGIN
-  - BM_ITER_BPY_BM_SEQ
-  - BM_ITER_ELEM
-  - BM_ITER_ELEM_INDEX
-  - BM_ITER_MESH
-  - BM_ITER_MESH_INDEX
-  - BM_ITER_MESH_MUTABLE
-  - BM_LOOPS_OF_VERT_ITER_BEGIN
-  - BOOST_FOREACH
-  - CTX_DATA_BEGIN
-  - CTX_DATA_BEGIN_WITH_ID
-  - DEG_OBJECT_ITER_BEGIN
-  - DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN
-  - DRIVER_TARGETS_LOOPER_BEGIN
-  - DRIVER_TARGETS_USED_LOOPER_BEGIN
-  - FOREACH_BASE_IN_EDIT_MODE_BEGIN
-  - FOREACH_BASE_IN_MODE_BEGIN
-  - FOREACH_BEGIN
-  - FOREACH_COLLECTION_BEGIN
-  - FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN
-  - FOREACH_COLLECTION_VISIBLE_OBJECT_RECURSIVE_BEGIN
-  - FOREACH_EDIT_OBJECT_BEGIN
-  - FOREACH_MAIN_ID_BEGIN
-  - FOREACH_MAIN_LISTBASE_BEGIN
-  - FOREACH_MAIN_LISTBASE_ID_BEGIN
-  - FOREACH_NODETREE_BEGIN
-  - FOREACH_OBJECT_BEGIN
-  - FOREACH_OBJECT_FLAG_BEGIN
-  - FOREACH_OBJECT_IN_EDIT_MODE_BEGIN
-  - FOREACH_OBJECT_IN_MODE_BEGIN
-  - FOREACH_OBJECT_RENDERABLE_BEGIN
-  - FOREACH_PCHAN_SELECTED_IN_OBJECT_BEGIN
-  - FOREACH_PCHAN_VISIBLE_IN_OBJECT_BEGIN
-  - FOREACH_SCENE_COLLECTION_BEGIN
-  - FOREACH_SCENE_OBJECT_BEGIN
-  - FOREACH_SELECTED_BASE_BEGIN
-  - FOREACH_SELECTED_EDITABLE_OBJECT_BEGIN
-  - FOREACH_SELECTED_OBJECT_BEGIN
-  - FOREACH_TRANS_DATA_CONTAINER
-  - FOREACH_VIEW_LAYER_TO_RENDER_BEGIN
-  - FOREACH_VISIBLE_BASE_BEGIN
-  - FOREACH_VISIBLE_OBJECT_BEGIN
-  - GHASH_FOREACH_BEGIN
-  - GHASH_ITER
-  - GHASH_ITER_INDEX
-  - GPU_SELECT_LOAD_IF_PICKSEL_LIST
-  - GP_EDITABLE_STROKES_BEGIN
-  - GSET_FOREACH_BEGIN
-  - GSET_ITER
-  - GSET_ITER_INDEX
-  - ITER_BEGIN
-  - ITER_PIXELS
-  - ITER_SLOTS
-  - LISTBASE_CIRCULAR_BACKWARD_BEGIN
-  - LISTBASE_CIRCULAR_FORWARD_BEGIN
-  - LISTBASE_FOREACH
-  - LISTBASE_FOREACH_MUTABLE
-  - MAN2D_ITER_AXES_BEGIN
-  - MAN_ITER_AXES_BEGIN
-  - NODE_INSTANCE_HASH_ITER
-  - NODE_SOCKET_TYPES_BEGIN
-  - NODE_TREE_TYPES_BEGIN
-  - NODE_TYPES_BEGIN
-  - PIXEL_LOOPER_BEGIN
-  - PIXEL_LOOPER_BEGIN_CHANNELS
-  - RNA_BEGIN
-  - RNA_PROP_BEGIN
-  - RNA_STRUCT_BEGIN
-  - RNA_STRUCT_BEGIN_SKIP_RNA_TYPE
-  - SEQP_BEGIN
-  - SEQ_BEGIN
-  - foreach
-
-# Use once we bump the minimum version to version 8.
-# # Without this string literals that in-line 'STRINGIFY' behave strangely (a bug?).
-# StatementMacros:
-#   - PyObject_VAR_HEAD
-#   - STRINGIFY

.editorconfig

@@ -3,18 +3,18 @@
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = space
-indent_size = 2
-max_line_length = 99
+indent_style = tab
+indent_size = 4
+max_line_length = 120
 
 # CMake & Text
 [*.{cmake,txt}]
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = space
-indent_size = 2
-max_line_length = 99
+indent_style = tab
+indent_size = 4
+max_line_length = 120
 
 # Python
 [*.py]
@@ -30,9 +30,9 @@ max_line_length = 120
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
-indent_style = space
-indent_size = 2
-max_line_length = 99
+indent_style = tab
+indent_size = 4
+max_line_length = 120
 
 # reStructuredText
 [*.rst]

CMakeLists.txt

@@ -182,8 +182,6 @@ if(UNIX AND NOT APPLE)
 	set(_init_SDL                            OFF)
 	set(_init_FFTW3                          OFF)
 	set(_init_OPENSUBDIV                     OFF)
-  set(_init_OPENVDB                        OFF)
-  set(_init_OPENIMAGEDENOISE               OFF)
 elseif(WIN32)
 	set(_init_JACK                           OFF)
 elseif(APPLE)
@@ -239,12 +237,11 @@ option(WITH_OPENCOLORIO   "Enable OpenColorIO color management" ${_init_OPENCOLO
 
 # Compositor
 option(WITH_COMPOSITOR         "Enable the tile based nodal compositor" ON)
-option(WITH_OPENIMAGEDENOISE   "Enable the OpenImageDenoise compositing node" ${_init_OPENIMAGEDENOISE})
 
 option(WITH_OPENSUBDIV    "Enable OpenSubdiv for surface subdivision" ${_init_OPENSUBDIV})
 
-option(WITH_OPENVDB       "Enable features relying on OpenVDB" ${_init_OPENVDB})
-option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" ${_init_OPENVDB})
+option(WITH_OPENVDB       "Enable features relying on OpenVDB" OFF)
+option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" OFF)
 option(WITH_OPENVDB_3_ABI_COMPATIBLE "Assume OpenVDB library has been compiled with version 3 ABI compatibility" OFF)
 mark_as_advanced(WITH_OPENVDB_3_ABI_COMPATIBLE)
 
@@ -347,7 +344,6 @@ option(WITH_LZMA          "Enable best LZMA compression, (used for pointcache)"
 if(UNIX AND NOT APPLE)
 	option(WITH_SYSTEM_LZO    "Use the system LZO library" OFF)
 endif()
-option(WITH_DRACO         "Enable Draco mesh compression Python module (used for glTF)" ON)
 
 # Camera/motion tracking
 option(WITH_LIBMV         "Enable Libmv structure from motion library" ON)
@@ -416,8 +412,6 @@ unset(PLATFORM_DEFAULT)
 option(WITH_CYCLES_LOGGING	"Build Cycles with logging support" ON)
 option(WITH_CYCLES_DEBUG	"Build Cycles with extra debug capabilities" OFF)
 option(WITH_CYCLES_NATIVE_ONLY	"Build Cycles with native kernel only (which fits current CPU, use for development only)" OFF)
-option(WITH_CYCLES_KERNEL_ASAN  "Build Cycles kernels with address sanitizer when WITH_COMPILER_ASAN is on, even if it's very slow" OFF)
-mark_as_advanced(WITH_CYCLES_KERNEL_ASAN)
 mark_as_advanced(WITH_CYCLES_CUBIN_COMPILER)
 mark_as_advanced(WITH_CYCLES_LOGGING)
 mark_as_advanced(WITH_CYCLES_DEBUG)
@@ -476,7 +470,7 @@ endif()
 option(WITH_OPENGL              "When off limits visibility of the opengl headers to just bf_gpu and gawain (temporary option for development purposes)" ON)
 option(WITH_GLEW_ES             "Switches to experimental copy of GLEW that has support for OpenGL ES. (temporary option for development purposes)" OFF)
 option(WITH_GL_EGL              "Use the EGL OpenGL system library instead of the platform specific OpenGL system library (CGL, glX, or WGL)"       OFF)
-option(WITH_GL_PROFILE_ES20     "Support using OpenGL ES 2.0. (through either EGL or the AGL/WGL/XGL 'es20' profile)"                               OFF)
+option(WITH_GL_PROFILE_ES20     "Support using OpenGL ES 2.0. (thru either EGL or the AGL/WGL/XGL 'es20' profile)"                                  OFF)
 
 mark_as_advanced(
 	WITH_OPENGL
@@ -549,6 +543,10 @@ if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
 	endif()
 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)
@@ -563,24 +561,13 @@ if(WIN32)
 	set(WINDOWS_CODESIGN_PFX_PASSWORD CACHE STRING  "password for pfx file used for codesigning.")
 	mark_as_advanced(WINDOWS_CODESIGN_PFX_PASSWORD)
 
-  option(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS "Organize the visual studio projects according to source folder structure." ON)
-  mark_as_advanced(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS)
-
-  option(WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS "Organize the source files in filters matching the source folders." ON)
-  mark_as_advanced(WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS)
+	option(WINDOWS_USE_VISUAL_STUDIO_FOLDERS "Organize the visual studio project according to source folders." ON)
+	mark_as_advanced(WINDOWS_USE_VISUAL_STUDIO_FOLDERS)
 
 	option(WINDOWS_PYTHON_DEBUG "Include the files needed for debugging python scripts with visual studio 2017+." OFF)
 	mark_as_advanced(WINDOWS_PYTHON_DEBUG)
 endif()
 
-# The following only works with the Ninja generator in CMake >= 3.0.
-if("${CMAKE_GENERATOR}" MATCHES "Ninja")
-  option(WITH_NINJA_POOL_JOBS
-         "Enable Ninja pools of jobs, to try to ease building on machines with 16GB of RAM or less (if not yet defined, will try to set best values based on detected machine specifications)."
-         OFF)
-  mark_as_advanced(WITH_NINJA_POOL_JOBS)
-endif()
-
 # avoid using again
 option_defaults_clear()
 
@@ -649,12 +636,6 @@ endif()
 
 if(NOT WITH_PYTHON)
 	set(WITH_CYCLES OFF)
-  set(WITH_DRACO OFF)
-endif()
-
-if(WITH_DRACO AND NOT WITH_PYTHON_INSTALL)
-  message(STATUS "WITH_DRACO requires WITH_PYTHON_INSTALL to be ON, disabling WITH_DRACO for now")
-  set(WITH_DRACO OFF)
 endif()
 
 # enable boost for cycles, audaspace or i18n
@@ -745,7 +726,7 @@ endif()
 # Auto-enable CUDA dynload if toolkit is not found.
 if(NOT WITH_CUDA_DYNLOAD)
 	find_package(CUDA)
-  if(NOT CUDA_FOUND)
+	if (NOT CUDA_FOUND)
 		message("CUDA toolkit not found, using dynamic runtime loading of libraries instead")
 		set(WITH_CUDA_DYNLOAD ON)
 	endif()
@@ -820,7 +801,7 @@ set(PLATFORM_LINKLIBS "")
 set(PLATFORM_LINKFLAGS "")
 set(PLATFORM_LINKFLAGS_DEBUG "")
 
-if(NOT CMAKE_BUILD_TYPE MATCHES "Release")
+if (NOT CMAKE_BUILD_TYPE MATCHES "Release")
 	if(WITH_COMPILER_ASAN)
 		set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${COMPILER_ASAN_CFLAGS}")
 		set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} ${COMPILER_ASAN_CFLAGS}")
@@ -851,8 +832,7 @@ if(WITH_X11)
 		if(X11_Xinput_LIB)
 			list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB})
 		else()
-      message(FATAL_ERROR "LibXi not found. Disable WITH_X11_XINPUT if you
-      want to build without tablet support")
+			set(WITH_X11_XINPUT OFF)
 		endif()
 	endif()
 
@@ -863,8 +843,7 @@ if(WITH_X11)
 		if(X11_Xxf86vmode_LIB)
 			list(APPEND PLATFORM_LINKLIBS ${X11_Xxf86vmode_LIB})
 		else()
-      message(FATAL_ERROR "libXxf86vm not found. Disable WITH_X11_XF86VMODE if you
-      want to build without")
+			set(WITH_X11_XF86VMODE OFF)
 		endif()
 	endif()
 
@@ -872,8 +851,7 @@ if(WITH_X11)
 		if(X11_Xfixes_LIB)
 			list(APPEND PLATFORM_LINKLIBS ${X11_Xfixes_LIB})
 		else()
-      message(FATAL_ERROR "libXfixes not found. Disable WITH_X11_XFIXES if you
-      want to build without")
+			set(WITH_X11_XFIXES OFF)
 		endif()
 	endif()
 
@@ -883,8 +861,7 @@ if(WITH_X11)
 		if(X11_Xrender_LIB)
 			list(APPEND PLATFORM_LINKLIBS ${X11_Xrender_LIB})
 		else()
-      message(FATAL_ERROR "libXrender not found. Disable WITH_X11_ALPHA if you
-      want to build without")
+			set(WITH_X11_ALPHA OFF)
 		endif()
 	endif()
 
@@ -968,9 +945,9 @@ 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
-  # so we just set endianness according CMAKE_OSX_ARCHITECTURES
+# OSX-Note: as we do cross-compiling with specific set architecture,
+# endianess-detection and auto-setting is counterproductive
+# so we just set endianness according CMAKE_OSX_ARCHITECTURES
 
 elseif(CMAKE_OSX_ARCHITECTURES MATCHES i386 OR CMAKE_OSX_ARCHITECTURES MATCHES x86_64)
 	add_definitions(-D__LITTLE_ENDIAN__)
@@ -1300,76 +1277,6 @@ if(WITH_LIBMV)
 	set(CERES_DEFINES -DCERES_STD_UNORDERED_MAP)
 endif()
 
-#-----------------------------------------------------------------------------
-# Extra limits to number of jobs running in parallel for some kind os tasks.
-# Only supported by Ninja build system currently.
-if("${CMAKE_GENERATOR}" MATCHES "Ninja" AND WITH_NINJA_POOL_JOBS)
-  if(NOT NINJA_MAX_NUM_PARALLEL_COMPILE_JOBS AND
-     NOT NINJA_MAX_NUM_PARALLEL_COMPILE_HEAVY_JOBS AND
-     NOT NINJA_MAX_NUM_PARALLEL_LINK_JOBS)
-    # Try to define good default values.
-    # Max mem of heavy cpp files compilation: about 2.5GB
-    # Max mem during linking: about 3.3GB
-    cmake_host_system_information(RESULT _NUM_CORES QUERY NUMBER_OF_LOGICAL_CORES)
-    # Note: this gives mem in MB.
-    cmake_host_system_information(RESULT _TOT_MEM QUERY TOTAL_PHYSICAL_MEMORY)
-
-    # Heuristics... the more cores we have, the more free mem we have to keep for the non-heavy tasks too.
-    if(${_TOT_MEM} LESS 8000 AND ${_NUM_CORES} GREATER 2)
-      set(_compile_heavy_jobs "1")
-    elseif(${_TOT_MEM} LESS 16000 AND ${_NUM_CORES} GREATER 4)
-      set(_compile_heavy_jobs "2")
-    elseif(${_TOT_MEM} LESS 24000 AND ${_NUM_CORES} GREATER 8)
-      set(_compile_heavy_jobs "3")
-    elseif(${_TOT_MEM} LESS 32000 AND ${_NUM_CORES} GREATER 16)
-      set(_compile_heavy_jobs "4")
-    elseif(${_TOT_MEM} LESS 64000 AND ${_NUM_CORES} GREATER 32)
-      set(_compile_heavy_jobs "8")
-    else()
-      set(_compile_heavy_jobs "")
-    endif()
-
-    set(NINJA_MAX_NUM_PARALLEL_COMPILE_HEAVY_JOBS "${_compile_heavy_jobs}" CACHE STRING
-        "Define the maximum number of concurrent heavy compilation jobs, for ninja build system (used for some targets which cpp files can take several GB each during compilation)." FORCE)
-    mark_as_advanced(NINJA_MAX_NUM_PARALLEL_COMPILE_HEAVY_JOBS)
-    set(_compile_heavy_jobs)
-
-    # Only set regular compile jobs if we set heavy jobs, otherwise default (using all cores) if fine.
-    if(NINJA_MAX_NUM_PARALLEL_COMPILE_HEAVY_JOBS)
-      math(EXPR _compile_jobs "${_NUM_CORES} - 1")
-    else()
-      set(_compile_jobs "")
-    endif()
-    set(NINJA_MAX_NUM_PARALLEL_COMPILE_JOBS "${_compile_jobs}" CACHE STRING
-        "Define the maximum number of concurrent compilation jobs, for ninja build system." FORCE)
-    mark_as_advanced(NINJA_MAX_NUM_PARALLEL_COMPILE_JOBS)
-    set(_compile_jobs)
-
-    # In practice, even when there is RAM available, this proves to be quicker than running in parallel
-    # (due to slow disks accesses).
-    set(NINJA_MAX_NUM_PARALLEL_LINK_JOBS "1" CACHE STRING
-        "Define the maximum number of concurrent link jobs, for ninja build system." FORCE)
-    mark_as_advanced(NINJA_MAX_NUM_PARALLEL_LINK_JOBS)
-
-    set(_NUM_CORES)
-    set(_TOT_MEM)
-  endif()
-
-  if(NINJA_MAX_NUM_PARALLEL_COMPILE_JOBS)
-    set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${NINJA_MAX_NUM_PARALLEL_COMPILE_JOBS})
-    set(CMAKE_JOB_POOL_COMPILE compile_job_pool)
-  endif()
-
-  if(NINJA_MAX_NUM_PARALLEL_COMPILE_HEAVY_JOBS)
-    set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_heavy_job_pool=${NINJA_MAX_NUM_PARALLEL_COMPILE_HEAVY_JOBS})
-  endif()
-
-  if(NINJA_MAX_NUM_PARALLEL_LINK_JOBS)
-    set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${NINJA_MAX_NUM_PARALLEL_LINK_JOBS})
-    set(CMAKE_JOB_POOL_LINK link_job_pool)
-  endif()
-endif()
-
 #-----------------------------------------------------------------------------
 # Extra compile flags
 
@@ -1467,8 +1374,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
 	ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_SWITCH                  -Wno-switch)
 
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_CLASS_MEMACCESS     -Wno-class-memaccess)
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_COMMENT             -Wno-comment)
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_TYPEDEFS     -Wno-unused-local-typedefs)
 
 	if(CMAKE_COMPILER_IS_GNUCC AND (NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "7.0"))
 		ADD_CHECK_C_COMPILER_FLAG(C_REMOVE_STRICT_FLAGS C_WARN_NO_IMPLICIT_FALLTHROUGH    -Wno-implicit-fallthrough)
@@ -1521,8 +1426,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_NON_VIRTUAL_DTOR -Wno-non-virtual-dtor)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_MACROS -Wno-unused-macros)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_REORDER -Wno-reorder)
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_COMMENT -Wno-comment)
-  ADD_CHECK_CXX_COMPILER_FLAG(CXX_REMOVE_STRICT_FLAGS CXX_WARN_NO_UNUSED_TYPEDEFS -Wno-unused-local-typedefs)
 
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 
@@ -1543,7 +1446,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
 		# warning level:
 		"/W3"
 		"/w34062"  # switch statement contains 'default' but no 'case' labels
-    "/w34115"  # 'type' : named type definition in parentheses
 		"/w34189"  # local variable is initialized but not referenced
 		# disable:
 		"/wd4018"  # signed/unsigned mismatch
@@ -1558,7 +1460,6 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "MSVC")
 		"/wd4800"  # forcing value to bool 'true' or 'false'
 		"/wd4828"  # The file contains a character that is illegal
 		"/wd4996"  # identifier was declared deprecated
-    "/wd4661"  # no suitable definition provided for explicit template instantiation request
 		# errors:
 		"/we4013"  # 'function' undefined; assuming extern returning int
 		"/we4133"  # incompatible pointer types
@@ -1706,11 +1607,6 @@ endif()
 add_subdirectory(tests)
 
 
-#-----------------------------------------------------------------------------
-# Define 'heavy' submodules (for Ninja builder when using pools).
-setup_heavy_lib_pool()
-
-
 #-----------------------------------------------------------------------------
 # CPack for generating packages
 include(build_files/cmake/packaging.cmake)
@@ -1763,7 +1659,6 @@ if(FIRST_RUN)
 	info_cfg_option(WITH_CYCLES)
 	info_cfg_option(WITH_FREESTYLE)
 	info_cfg_option(WITH_OPENCOLORIO)
-  info_cfg_option(WITH_OPENIMAGEDENOISE)
 	info_cfg_option(WITH_OPENVDB)
 	info_cfg_option(WITH_ALEMBIC)
 

GNUmakefile

@@ -37,16 +37,14 @@ Convenience Targets
    * bpy:           Build as a python module which can be loaded from python directly.
    * deps:          Build library dependencies (intended only for platform maintainers).
 
-   * developer:     Enable faster builds, error checking and tests, recommended for developers.
    * config:        Run cmake configuration tool to set build options.
-   * ninja:         Use ninja build tool for faster builds.
 
    Note: passing the argument 'BUILD_DIR=path' when calling make will override the default build dir.
    Note: passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments.
 
 
 Project Files
-   Generate project files for development environments.
+   Generate poject files for development environments.
 
    * project_qtcreator:     QtCreator Project Files.
    * project_netbeans:      NetBeans Project Files.
@@ -125,11 +123,6 @@ Utilities
    * update:
      updates git and all submodules
 
-   * format
-     Format source code using clang (uses PATHS if passed in). For example::
-
-        make format PATHS="source/blender/blenlib source/blender/blenkernel"
-
 Environment Variables
 
    * BUILD_CMAKE_ARGS:      Arguments passed to CMake.
@@ -223,23 +216,6 @@ ifneq "$(findstring bpy, $(MAKECMDGOALS))" ""
 	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake"
 endif
 
-ifneq "$(findstring developer, $(MAKECMDGOALS))" ""
-	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C"$(BLENDER_DIR)/build_files/cmake/config/blender_developer.cmake"
-endif
-
-# -----------------------------------------------------------------------------
-# build tool
-
-ifneq "$(findstring ninja, $(MAKECMDGOALS))" ""
-	BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -G Ninja
-	BUILD_COMMAND:=ninja
-else
-	ifneq ("$(wildcard $(BUILD_DIR)/build.ninja)","")
-		BUILD_COMMAND:=ninja
-	else
-		BUILD_COMMAND:=make -s
-	endif
-endif
 
 # -----------------------------------------------------------------------------
 # Blender binary path
@@ -247,7 +223,7 @@ endif
 # Allow passing in own BLENDER_BIN so developers who don't
 # use the default build path can still use utility helpers.
 ifeq ($(OS), Darwin)
-	BLENDER_BIN?="$(BUILD_DIR)/bin/Blender.app/Contents/MacOS/Blender"
+	BLENDER_BIN?="$(BUILD_DIR)/bin/blender.app/Contents/MacOS/blender"
 else
 	BLENDER_BIN?="$(BUILD_DIR)/bin/blender"
 endif
@@ -301,7 +277,7 @@ all: .FORCE
 
 	@echo
 	@echo Building Blender ...
-	$(BUILD_COMMAND) -C "$(BUILD_DIR)" -j $(NPROCS) install
+	$(MAKE) -C "$(BUILD_DIR)" -s -j $(NPROCS) install
 	@echo
 	@echo edit build configuration with: "$(BUILD_DIR)/CMakeCache.txt" run make again to rebuild.
 	@echo Blender successfully built, run from: $(BLENDER_BIN)
@@ -313,8 +289,6 @@ lite: all
 cycles: all
 headless: all
 bpy: all
-developer: all
-ninja: all
 
 # -----------------------------------------------------------------------------
 # Build dependencies
@@ -333,7 +307,7 @@ deps: .FORCE
 
 	@echo
 	@echo Building dependencies ...
-	$(BUILD_COMMAND) -C "$(DEPS_BUILD_DIR)" -j $(NPROCS) $(DEPS_TARGET)
+	$(MAKE) -C "$(DEPS_BUILD_DIR)" -s -j $(NPROCS) $(DEPS_TARGET)
 	@echo
 	@echo Dependencies successfully built and installed to $(DEPS_INSTALL_DIR).
 	@echo
@@ -429,7 +403,7 @@ test_style_osl_qtc: .FORCE
 #
 
 project_qtcreator: .FORCE
-	$(PYTHON) build_files/cmake/cmake_qtcreator_project.py --build-dir "$(BUILD_DIR)"
+	$(PYTHON) build_files/cmake/cmake_qtcreator_project.py "$(BUILD_DIR)"
 
 project_netbeans: .FORCE
 	$(PYTHON) build_files/cmake/cmake_netbeans_project.py "$(BUILD_DIR)"
@@ -536,10 +510,6 @@ update: .FORCE
 	git submodule foreach git checkout master
 	git submodule foreach git pull --rebase origin master
 
-format: .FORCE
-	PATH="../lib/${OS_NCASE}/llvm/bin/:$(PATH)" \
-		python3 source/tools/utils_maintenance/clang_format_paths.py $(PATHS)
-
 
 # -----------------------------------------------------------------------------
 # Documentation
@@ -569,7 +539,7 @@ help_features: .FORCE
 	@$(PYTHON) "$(BLENDER_DIR)/build_files/cmake/cmake_print_build_options.py" $(BLENDER_DIR)"/CMakeLists.txt"
 
 clean: .FORCE
-	$(BUILD_COMMAND) -C "$(BUILD_DIR)" clean
+	$(MAKE) -C "$(BUILD_DIR)" clean
 
 .PHONY: all
 

build_files/build_environment/CMakeLists.txt

@@ -25,16 +25,16 @@
 # Windows and macOS, and install_deps.sh on Linux.
 #
 # WINDOWS USAGE:
-#   Don't call this cmake file yourself, use build_deps.cmd
+#   Don't call this cmake file your self, use build_deps.cmd
 #   build_deps 2013 x64 / build_deps 2013 x86
 #   build_deps 2015 x64 / build_deps 2015 x86
 #
 # MAC OS X USAGE:
-#   Install with homebrew: brew install cmake autoconf automake libtool yasm nasm
+#	Install with homebrew: brew install autoconf automake libtool yasm nasm
 #   Run "make deps" from main Blender directory
 #
 # LINUX USAGE:
-#   Install compiler cmake autoconf automake libtool yasm nasm tcl
+#   Install compiler, cmake, autoconf, automake, libtool, yasm
 #   Run "make deps" from main Blender directory
 #
 ####################################################################################################
@@ -90,14 +90,8 @@ include(cmake/tbb.cmake)
 include(cmake/openvdb.cmake)
 include(cmake/python.cmake)
 include(cmake/python_site_packages.cmake)
-include(cmake/package_python.cmake)
 include(cmake/numpy.cmake)
-if(UNIX AND NOT APPLE)
-  # Rely on PugiXML compiled with OpenImageIO
-else()
-  include(cmake/pugixml.cmake)
-endif()
-include(cmake/openimagedenoise.cmake)
+include(cmake/pugixml.cmake)
 
 if(WITH_WEBP)
 	include(cmake/webp.cmake)

build_files/build_environment/cmake/blosc.cmake

@@ -58,7 +58,7 @@ if(WIN32)
 	)
 endif()
 
-if(WIN32)
+if (WIN32)
 	if(BUILD_MODE STREQUAL Release)
 		ExternalProject_Add_Step(external_blosc after_install
 			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/blosc/lib/libblosc.lib ${HARVEST_TARGET}/blosc/lib/libblosc.lib

build_files/build_environment/cmake/boost.cmake

@@ -33,9 +33,19 @@ if(WIN32)
 		set(BOOST_TOOLSET toolset=msvc-14.0)
 		set(BOOST_COMPILER_STRING -vc140)
 	endif()
-  set(BOOST_CONFIGURE_COMMAND bootstrap.bat)
+	set(JAM_FILE ${BUILD_DIR}/boost/src/external_boost/user-config.jam)
+	set(semi_path "${PATCH_DIR}/semi.txt")
+	FILE(TO_NATIVE_PATH ${semi_path} semi_path)
+	set(BOOST_CONFIGURE_COMMAND bootstrap.bat &&
+								echo using python : ${PYTHON_OUTPUTDIR}\\python.exe > "${JAM_FILE}" &&
+								echo.   : ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/pc >> "${JAM_FILE}" &&
+								echo.   : ${BUILD_DIR}/python/src/external_python/pcbuild >> "${JAM_FILE}" &&
+								type ${semi_path} >> "${JAM_FILE}"
+	)
 	set(BOOST_BUILD_COMMAND bjam)
+	#--user-config=user-config.jam
 	set(BOOST_BUILD_OPTIONS runtime-link=static )
+	#set(BOOST_WITH_PYTHON --with-python)
 	set(BOOST_HARVEST_CMD 	${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/lib/ ${HARVEST_TARGET}/boost/lib/ )
 	if(BUILD_MODE STREQUAL Release)
 		set(BOOST_HARVEST_CMD ${BOOST_HARVEST_CMD} && ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/boost/include/boost-1_68/ ${HARVEST_TARGET}/boost/include/)
@@ -72,6 +82,7 @@ set(BOOST_OPTIONS
 	--with-serialization
 	--with-program_options
 	--with-iostreams
+	${BOOST_WITH_PYTHON}
 	${BOOST_TOOLSET}
 )
 
@@ -89,3 +100,10 @@ ExternalProject_Add(external_boost
 	BUILD_IN_SOURCE 1
 	INSTALL_COMMAND "${BOOST_HARVEST_CMD}"
 )
+
+if(WIN32)
+	add_dependencies(
+		external_boost
+		Make_Python_Environment
+	)
+endif()

build_files/build_environment/cmake/faad.cmake

@@ -18,7 +18,7 @@
 
 set(FAAD_EXTRA_ARGS)
 
-if(WIN32)
+if (WIN32)
 	set(FAAD_EXTRA_CONFIGURE "utils\\win32\\ac2ver.exe" "faad2" "configure.ac" > libfaad\\win32_ver.h)
 else()
 	set(FAAD_EXTRA_CONFIGURE echo .)

build_files/build_environment/cmake/ffi.cmake

@@ -32,7 +32,7 @@ ExternalProject_Add(external_ffi
 	INSTALL_DIR ${LIBDIR}/ffi
 )
 
-if(UNIX AND NOT APPLE)
+if (UNIX AND NOT APPLE)
 	ExternalProject_Add_Step(external_ffi after_install
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/ffi/lib/libffi.a ${LIBDIR}/ffi/lib/libffi_pic.a
 		DEPENDEES install

build_files/build_environment/cmake/harvest.cmake

@@ -129,8 +129,6 @@ harvest(jpg/include jpeg/include "*.h")
 harvest(jpg/lib jpeg/lib "libjpeg.a")
 harvest(lame/lib ffmpeg/lib "*.a")
 harvest(clang/bin llvm/bin "clang-format")
-harvest(clang/include llvm/include "*")
-harvest(llvm/include llvm/include "*")
 harvest(llvm/bin llvm/bin "llvm-config")
 harvest(llvm/lib llvm/lib "libLLVM*.a")
 if(APPLE)
@@ -166,8 +164,6 @@ harvest(openimageio/bin openimageio/bin "maketx")
 harvest(openimageio/bin openimageio/bin "oiiotool")
 harvest(openimageio/include openimageio/include "*")
 harvest(openimageio/lib openimageio/lib "*.a")
-harvest(openimagedenoise/include openimagedenoise/include "*")
-harvest(openimagedenoise/lib openimagedenoise/lib "*.a")
 harvest(openjpeg/include/openjpeg-2.3 openjpeg/include "*.h")
 harvest(openjpeg/lib openjpeg/lib "*.a")
 harvest(opensubdiv/include opensubdiv/include "*.h")

build_files/build_environment/cmake/llvm.cmake

@@ -47,8 +47,7 @@ if(MSVC)
 		set(LLVM_HARVEST_COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/ ${HARVEST_TARGET}/llvm/ )
 	else()
 		set(LLVM_HARVEST_COMMAND
-      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ ${HARVEST_TARGET}/llvm/debug/lib/ &&
-      ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/include/ ${HARVEST_TARGET}/llvm/debug/include/
+			${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/llvm/lib/ ${HARVEST_TARGET}/llvm/debug/lib/
 		)
 	endif()
 	ExternalProject_Add_Step(ll after_install

build_files/build_environment/cmake/numpy.cmake

@@ -17,7 +17,6 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(MSVC)
-  message("BIN >${PYTHON_BINARY}<")
 	if(BUILD_MODE STREQUAL Debug)
 		set(NUMPY_DIR_POSTFIX -pydebug)
 		set(NUMPY_ARCHIVE_POSTFIX d)
@@ -31,6 +30,17 @@ endif()
 
 set(NUMPY_POSTFIX)
 
+if(WIN32)
+	set(NUMPY_INSTALL
+		${CMAKE_COMMAND} -E copy_directory "${BUILD_DIR}/python/src/external_python/run/lib/site-packages/numpy/core/include/numpy" "${LIBDIR}/python/include/python${PYTHON_SHORT_VERSION}/numpy" &&
+		${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/numpy/src/external_numpy/build/lib.${PYTHON_ARCH2}-${PYTHON_SHORT_VERSION}${NUMPY_DIR_POSTFIX}"
+		${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz" "."
+	)
+else()
+	set(NUMPY_INSTALL echo .)
+	set(NUMPY_PATCH echo .)
+endif()
+
 ExternalProject_Add(external_numpy
 	URL ${NUMPY_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
@@ -40,10 +50,17 @@ ExternalProject_Add(external_numpy
 	CONFIGURE_COMMAND ""
 	LOG_BUILD 1
 	BUILD_COMMAND ${PYTHON_BINARY} ${BUILD_DIR}/numpy/src/external_numpy/setup.py build ${NUMPY_BUILD_OPTION} install --old-and-unmanageable
-  INSTALL_COMMAND ""
+	INSTALL_COMMAND ${NUMPY_INSTALL}
 )
 
+if(WIN32)
+	ExternalProject_Add_Step(external_numpy after_install
+			COMMAND	${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}_numpy_${NUMPY_SHORT_VERSION}${NUMPY_ARCHIVE_POSTFIX}.tar.gz
+			DEPENDEES install
+		)
+endif()
+
 add_dependencies(
 	external_numpy
-  external_python
+	Make_Python_Environment
 )

build_files/build_environment/cmake/openal.cmake

@@ -18,31 +18,18 @@
 
 if(BUILD_MODE STREQUAL Release)
 	set(OPENAL_EXTRA_ARGS
-    -DALSOFT_UTILS=OFF
-    -DALSOFT_NO_CONFIG_UTIL=ON
-    -DALSOFT_EXAMPLES=OFF
-    -DALSOFT_TESTS=OFF
-    -DALSOFT_CONFIG=OFF
-    -DALSOFT_HRTF_DEFS=OFF
-    -DALSOFT_INSTALL=ON
-    -DALSOFT_BACKEND_SNDIO=OFF
+		-DALSOFT_UTILS=Off
+		-DALSOFT_NO_CONFIG_UTIL=On
+		-DALSOFT_EXAMPLES=Off
+		-DALSOFT_TESTS=Off
+		-DALSOFT_CONFIG=Off
+		-DALSOFT_HRTF_DEFS=Off
+		-DALSOFT_INSTALL=On
+		-DALSOFT_BACKEND_SNDIO=Off
 	)
 
 	if(UNIX)
-    set(OPENAL_EXTRA_ARGS
-      ${OPENAL_EXTRA_ARGS}
-      -DLIBTYPE=STATIC
-    )
-  endif()
-
-  if(UNIX AND NOT APPLE)
-    # Ensure we have backends for playback.
-    set(OPENAL_EXTRA_ARGS
-      ${OPENAL_EXTRA_ARGS}
-      -DALSOFT_REQUIRE_ALSA=ON
-      -DALSOFT_REQUIRE_OSS=ON
-      -DALSOFT_REQUIRE_PULSEAUDIO=ON
-    )
+		set(OPENAL_EXTRA_ARGS ${OPENAL_EXTRA_ARGS} -DLIBTYPE=STATIC)
 	endif()
 
 	ExternalProject_Add(external_openal

build_files/build_environment/cmake/openimagedenoise.cmake

@@ -1,61 +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.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-
-set(OIDN_EXTRA_ARGS
-  -DWITH_EXAMPLE=OFF
-  -DWITH_TEST=OFF
-  -DTBB_ROOT=${LIBDIR}/tbb
-  -DTBB_STATIC_LIB=ON
-  -DOIDN_STATIC_LIB=ON
-)
-
-ExternalProject_Add(external_openimagedenoise
-  URL ${OIDN_URI}
-  DOWNLOAD_DIR ${DOWNLOAD_DIR}
-  URL_HASH MD5=${OIDN_HASH}
-  PREFIX ${BUILD_DIR}/openimagedenoise
-  CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openimagedenoise ${DEFAULT_CMAKE_FLAGS} ${OIDN_EXTRA_ARGS}
-  PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/openimagedenoise/src/external_openimagedenoise < ${PATCH_DIR}/openimagedenoise.diff
-  INSTALL_DIR ${LIBDIR}/openimagedenoise
-)
-
-add_dependencies(
-  external_openimagedenoise
-  external_tbb
-)
-
-if(WIN32)
-  if(BUILD_MODE STREQUAL Release)
-    ExternalProject_Add_Step(external_openimagedenoise after_install
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/openimagedenoise/include ${HARVEST_TARGET}/openimagedenoise/include
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/openimagedenoise.lib ${HARVEST_TARGET}/openimagedenoise/lib/openimagedenoise.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/common.lib ${HARVEST_TARGET}/openimagedenoise/lib/common.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/mkldnn.lib ${HARVEST_TARGET}/openimagedenoise/lib/mkldnn.lib
-      DEPENDEES install
-    )
-  endif()
-  if(BUILD_MODE STREQUAL Debug)
-    ExternalProject_Add_Step(external_openimagedenoise after_install
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/openimagedenoise.lib ${HARVEST_TARGET}/openimagedenoise/lib/openimagedenoise_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/common.lib ${HARVEST_TARGET}/openimagedenoise/lib/common_d.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/openimagedenoise/lib/mkldnn.lib ${HARVEST_TARGET}/openimagedenoise/lib/mkldnn_d.lib
-      DEPENDEES install
-    )
-  endif()
-endif()

build_files/build_environment/cmake/opensubdiv.cmake

@@ -70,6 +70,7 @@ ExternalProject_Add(external_opensubdiv
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	URL_HASH MD5=${OPENSUBDIV_Hash}
 	PREFIX ${BUILD_DIR}/opensubdiv
+	PATCH_COMMAND ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/opensubdiv/src/external_opensubdiv < ${PATCH_DIR}/opensubdiv.diff
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/opensubdiv -Wno-dev ${DEFAULT_CMAKE_FLAGS} ${OPENSUBDIV_EXTRA_ARGS}
 	INSTALL_DIR ${LIBDIR}/opensubdiv
 )

build_files/build_environment/cmake/options.cmake

@@ -126,13 +126,13 @@ else()
 			OUTPUT_VARIABLE XCODE_DEV_PATH OUTPUT_STRIP_TRAILING_WHITESPACE
 		)
 		set(OSX_ARCHITECTURES x86_64)
-    set(OSX_DEPLOYMENT_TARGET 10.11)
+		set(OSX_DEPLOYMENT_TARGET 10.9)
 		set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
 
 		set(PLATFORM_CFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
 		set(PLATFORM_CXXFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET} -std=c++11 -stdlib=libc++")
 		set(PLATFORM_LDFLAGS "-isysroot ${OSX_SYSROOT} -mmacosx-version-min=${OSX_DEPLOYMENT_TARGET}")
-    set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin15.0.0) # OS X 10.11
+		set(PLATFORM_BUILD_TARGET --build=x86_64-apple-darwin13.0.0) # OS X 10.9
 		set(PLATFORM_CMAKE_FLAGS
 			-DCMAKE_OSX_ARCHITECTURES:STRING=${OSX_ARCHITECTURES}
 			-DCMAKE_OSX_DEPLOYMENT_TARGET:STRING=${OSX_DEPLOYMENT_TARGET}

build_files/build_environment/cmake/osl.cmake

@@ -111,16 +111,8 @@ add_dependencies(
 	external_zlib
 	external_flexbison
 	external_openimageio
-)
-
-if(UNIX AND NOT APPLE)
-  # Rely on PugiXML compiled with OpenImageIO
-else()
-  add_dependencies(
-    external_osl
 	external_pugixml
-  )
-endif()
+)
 
 if(WIN32)
 	if(BUILD_MODE STREQUAL Release)

build_files/build_environment/cmake/package_python.cmake

@@ -1,58 +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.
-#
-# ***** END GPL LICENSE BLOCK *****
-
-if(MSVC)
-  set(PYTARGET ${HARVEST_TARGET}/python/${PYTHON_SHORT_VERSION_NO_DOTS})
-  set(PYSRC ${LIBDIR}/python/)
-
-  if(BUILD_MODE STREQUAL Release)
-    add_custom_command(
-      OUTPUT ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
-      COMMAND echo packaging python
-      COMMAND echo this should ouput at ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTARGET}/libs
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python.exe ${PYTARGET}/bin/python.exe
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}.dll ${PYTARGET}/bin/python${PYTHON_SHORT_VERSION_NO_DOTS}.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}.pdb ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.pdb
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/include/ ${PYTARGET}/include/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/lib/ ${PYTARGET}/lib/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/DLLs/ ${PYTARGET}/DLLs/
-      COMMAND cd ${PYTARGET}/lib/ && for /d /r . %%d in (__pycache__) do @if exist "%%d" echo "%%d" && rd /s/q "%%d"
-    )
-    add_custom_target(Package_Python ALL DEPENDS external_python external_numpy external_python_site_packages OUTPUT ${HARVEST_TARGET}/python/${PYTHON_SHORT_VERSION_NO_DOTS}/bin/python${PYTHON_POSTFIX}.exe)
-  endif()
-
-  if(BUILD_MODE STREQUAL Debug)
-    add_custom_command(
-      OUTPUT ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
-      COMMAND echo packaging python
-      COMMAND echo this should ouput at ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${PYTARGET}/libs
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_POSTFIX}.exe ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll ${PYTARGET}/bin/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll
-      COMMAND ${CMAKE_COMMAND} -E copy ${PYSRC}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb ${PYTARGET}/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/include/ ${PYTARGET}/include/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/lib/ ${PYTARGET}/lib/
-      COMMAND ${CMAKE_COMMAND} -E copy_directory ${PYSRC}/DLLs/ ${PYTARGET}/DLLs/
-      COMMAND cd ${PYTARGET}/lib/ && for /d /r . %%d in (__pycache__) do @if exist "%%d" echo "%%d" && rd /s/q "%%d"
-    )
-    add_custom_target(Package_Python ALL DEPENDS external_python external_numpy external_python_site_packages OUTPUT ${PYTARGET}/bin/python${PYTHON_POSTFIX}.exe)
-  endif()
-endif()

build_files/build_environment/cmake/python.cmake

@@ -19,13 +19,17 @@
 set(PYTHON_POSTFIX)
 if(BUILD_MODE STREQUAL Debug)
 	set(PYTHON_POSTFIX _d)
-  set(PYTHON_EXTRA_INSTLAL_FLAGS -d)
 endif()
 
 if(WIN32)
-  set(PYTHON_BINARY_INTERNAL ${BUILD_DIR}/python/src/external_python/PCBuild/amd64/python${PYTHON_POSTFIX}.exe)
-  set(PYTHON_BINARY ${LIBDIR}/python/python${PYTHON_POSTFIX}.exe)
-  set(PYTHON_SRC ${BUILD_DIR}/python/src/external_python/)
+	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+		set(SSL_POSTFIX -x64)
+	else()
+		set(SSL_POSTFIX)
+	endif()
+
+	set(PYTHON_BINARY ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe)
+
 	macro(cmake_to_dos_path MsysPath ResultingPath)
 		string(REPLACE "/" "\\" ${ResultingPath} "${MsysPath}")
 	endmacro()
@@ -36,16 +40,31 @@ if(WIN32)
 	cmake_to_dos_path(${PYTHON_EXTERNALS_FOLDER} PYTHON_EXTERNALS_FOLDER_DOS)
 	cmake_to_dos_path(${DOWNLOADS_EXTERNALS_FOLDER} DOWNLOADS_EXTERNALS_FOLDER_DOS)
 
+	message("Python externals = ${PYTHON_EXTERNALS_FOLDER}")
+	message("Python externals_dos = ${PYTHON_EXTERNALS_FOLDER_DOS}")
+	message("Python DOWNLOADS_EXTERNALS_FOLDER = ${DOWNLOADS_EXTERNALS_FOLDER}")
+	message("Python DOWNLOADS_EXTERNALS_FOLDER_DOS = ${DOWNLOADS_EXTERNALS_FOLDER_DOS}")
+
 	ExternalProject_Add(external_python
 		URL ${PYTHON_URI}
 		DOWNLOAD_DIR ${DOWNLOAD_DIR}
 		URL_HASH MD5=${PYTHON_HASH}
 		PREFIX ${BUILD_DIR}/python
+		PATCH_COMMAND
+			echo mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}" &&
+			mklink /D "${PYTHON_EXTERNALS_FOLDER_DOS}" "${DOWNLOADS_EXTERNALS_FOLDER_DOS}"
 		CONFIGURE_COMMAND ""
 		BUILD_COMMAND cd ${BUILD_DIR}/python/src/external_python/pcbuild/ && set IncludeTkinter=false && call build.bat -e -p ${PYTHON_ARCH} -c ${BUILD_MODE}
-    INSTALL_COMMAND ${PYTHON_BINARY_INTERNAL} ${PYTHON_SRC}/PC/layout/main.py -b ${PYTHON_SRC}/PCbuild/amd64 -s ${PYTHON_SRC} -t ${PYTHON_SRC}/tmp/  --include-underpth --include-stable --include-pip --include-dev --include-launchers  --include-symbols ${PYTHON_EXTRA_INSTLAL_FLAGS} --copy ${LIBDIR}/python
+		INSTALL_COMMAND COMMAND
+			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll &&
+			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.pdb &&
+			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib &&
+			${CMAKE_COMMAND} -E copy ${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.exp ${LIBDIR}/python/lib/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.exp &&
+			${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${LIBDIR}/python/include/Python${PYTHON_SHORT_VERSION} &&
+			${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${LIBDIR}/python/include/Python${PYTHON_SHORT_VERSION}/pyconfig.h
 	)
-
+	message("PythinRedist = ${BUILD_DIR}/python/src/external_python/redist")
+	message("POutput = ${PYTHON_OUTPUTDIR}")
 else()
 	if(APPLE)
 		# disable functions that can be in 10.13 sdk but aren't available on 10.9 target
@@ -88,6 +107,65 @@ else()
 		BUILD_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make -j${MAKE_THREADS}
 		INSTALL_COMMAND ${PYTHON_CONFIGURE_ENV} && cd ${BUILD_DIR}/python/src/external_python/ && make install
 		INSTALL_DIR ${LIBDIR}/python)
+
+	add_custom_target(Make_Python_Environment ALL DEPENDS external_python)
+endif()
+
+if(MSVC)
+	add_custom_command(
+		OUTPUT ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz
+		OUTPUT ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
+		COMMAND ${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/lib ${BUILD_DIR}/python/src/external_python/redist/lib
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_asyncio${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_asyncio${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_bz2${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_bz2${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_contextvars${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_contextvars${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ctypes${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ctypes_test${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ctypes_test${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_decimal${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_decimal${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_distutils_findvs${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_distutils_findvs${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_elementtree${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_elementtree${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_hashlib${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_hashlib${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_lzma${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_lzma${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_msi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_msi${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_multiprocessing${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_multiprocessing${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_overlapped${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_overlapped${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_queue${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_queue${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_socket${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_socket${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_sqlite3${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_sqlite3${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_ssl${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_ssl${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testbuffer${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testbuffer${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testcapi${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testcapi${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testimportmultiple${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testimportmultiple${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/_testmultiphase${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/_testmultiphase${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/pyexpat${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/pyexpat${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/select${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/select${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/unicodedata${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/unicodedata${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/winsound${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/winsound${PYTHON_POSTFIX}.pyd
+		#xxlimited is an example extension module, we don't need to ship it and debug doesn't build it
+		#leaving it commented out, so I won't get confused again with the next update.
+		#COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/xxlimited${PYTHON_POSTFIX}.pyd" ${BUILD_DIR}/python/src/external_python/redist/lib/xxlimited${PYTHON_POSTFIX}.pyd
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/libssl-1_1${SSL_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/libssl-1_1${SSL_POSTFIX}.dll
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/libcrypto-1_1${SSL_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/libcrypto-1_1${SSL_POSTFIX}.dll
+		COMMAND ${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/sqlite3${PYTHON_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/redist/lib/sqlite3${PYTHON_POSTFIX}.dll
+		COMMAND ${CMAKE_COMMAND} -E chdir "${BUILD_DIR}/python/src/external_python/redist" ${CMAKE_COMMAND} -E tar "cfvz" "${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz" "."
+		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBDIR}/python/ ${HARVEST_TARGET}/python/
+		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${HARVEST_TARGET}/Release/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz
+	)
+
+	add_custom_target(Package_Python ALL DEPENDS external_python ${LIBDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.tar.gz ${BUILD_DIR}/python/src/external_python/redist/bin/python${PYTHON_POSTFIX}.exe)
+
+	add_custom_command(OUTPUT ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
+		COMMAND	${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/redist ${BUILD_DIR}/python/src/external_python/run
+		COMMAND	${CMAKE_COMMAND} -E copy_directory ${BUILD_DIR}/python/src/external_python/include ${BUILD_DIR}/python/src/external_python/run/include
+		COMMAND	${CMAKE_COMMAND} -E copy "${BUILD_DIR}/python/src/external_python/PC/pyconfig.h" ${BUILD_DIR}/python/src/external_python/run/include/pyconfig.h
+		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll" ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.dll
+		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib" ${BUILD_DIR}/python/src/external_python/run/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}.lib  #missing postfix on purpose, distutils is not expecting it
+		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib" ${BUILD_DIR}/python/src/external_python/run/libs/python${PYTHON_SHORT_VERSION_NO_DOTS}${PYTHON_POSTFIX}.lib  #other things like numpy still want it though.
+		COMMAND	${CMAKE_COMMAND} -E copy "${PYTHON_OUTPUTDIR}/python${PYTHON_POSTFIX}.exe" ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe
+		COMMAND	${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe -m ensurepip --upgrade
+	)
+	add_custom_target(Make_Python_Environment ALL DEPENDS ${BUILD_DIR}/python/src/external_python/run/python${PYTHON_POSTFIX}.exe Package_Python)
 endif()
 
 if(UNIX)

build_files/build_environment/cmake/python_site_packages.cmake

@@ -15,16 +15,27 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # ***** END GPL LICENSE BLOCK *****
+if(WIN32)
+	set(HARVEST_CMD cmd /C FOR /d /r ${BUILD_DIR}/python/src/external_python/run/lib/site-packages %d IN (__pycache__) DO @IF EXIST "%d" rd /s /q "%d" &&
+		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/idna ${HARVEST_TARGET}/Release/site-packages/idna &&
+		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/chardet ${HARVEST_TARGET}/Release/site-packages/chardet &&
+		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/urllib3 ${HARVEST_TARGET}/Release/site-packages/urllib3 &&
+		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/certifi ${HARVEST_TARGET}/Release/site-packages/certifi &&
+		${CMAKE_COMMAND} -E copy_directory  ${BUILD_DIR}/python/src/external_python/run/lib/site-packages/requests ${HARVEST_TARGET}/Release/site-packages/requests
+	)
+else()
+	set(HARVEST_CMD echo .)
+endif()
 
 ExternalProject_Add(external_python_site_packages
 	DOWNLOAD_COMMAND ""
 	CONFIGURE_COMMAND ""
 	BUILD_COMMAND ""
 	PREFIX ${BUILD_DIR}/site_packages
-  INSTALL_COMMAND ${PYTHON_BINARY} -m pip install idna==${IDNA_VERSION} chardet==${CHARDET_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all:
+	INSTALL_COMMAND ${PYTHON_BINARY} -m pip install idna==${IDNA_VERSION} chardet==${CHARDET_VERSION} urllib3==${URLLIB3_VERSION} certifi==${CERTIFI_VERSION} requests==${REQUESTS_VERSION} --no-binary :all: && ${HARVEST_CMD}
 )
 
 add_dependencies(
 	external_python_site_packages
-  external_python
+	Make_Python_Environment
 )

build_files/build_environment/cmake/ssl.cmake

@@ -19,7 +19,7 @@
 set(SSL_CONFIGURE_COMMAND ./Configure)
 set(SSL_PATCH_CMD echo .)
 
-if(APPLE)
+if (APPLE)
 	set(SSL_OS_COMPILER "blender-darwin-x86_64")
 else()
 	if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")

build_files/build_environment/cmake/tbb.cmake

@@ -18,7 +18,7 @@
 
 set(TBB_EXTRA_ARGS
 	-DTBB_BUILD_SHARED=Off
-  -DTBB_BUILD_TBBMALLOC=On
+	-DTBB_BUILD_TBBMALLOC=Off
 	-DTBB_BUILD_TBBMALLOC_PROXY=Off
 	-DTBB_BUILD_STATIC=On
 )
@@ -35,7 +35,7 @@ ExternalProject_Add(external_tbb
 	INSTALL_DIR ${LIBDIR}/tbb
 )
 
-if(WIN32)
+if (WIN32)
 	if(BUILD_MODE STREQUAL Release)
 		ExternalProject_Add_Step(external_tbb after_install
 			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tbb/lib/tbb_static.lib ${HARVEST_TARGET}/tbb/lib/tbb.lib

build_files/build_environment/cmake/theora.cmake

@@ -16,26 +16,20 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-if (UNIX)
-  set(THEORA_CONFIGURE_ENV ${CONFIGURE_ENV} && export HAVE_PDFLATEX=no)
-else()
-  set(THEORA_CONFIGURE_ENV ${CONFIGURE_ENV})
-endif()
-
 ExternalProject_Add(external_theora
 	URL ${THEORA_URI}
 	DOWNLOAD_DIR ${DOWNLOAD_DIR}
 	URL_HASH SHA256=${THEORA_HASH}
 	PREFIX ${BUILD_DIR}/theora
-  CONFIGURE_COMMAND ${THEORA_CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/theora
+	CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/theora
 		--disable-shared
 		--enable-static
 		--with-pic
 		--with-ogg=${LIBDIR}/ogg
 		--with-vorbis=${LIBDIR}/vorbis
 		--disable-examples
-  BUILD_COMMAND ${THEORA_CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && make -j${MAKE_THREADS}
-  INSTALL_COMMAND ${THEORA_CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && make install
+	BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && make -j${MAKE_THREADS}
+	INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/theora/src/external_theora/ && make install
 	INSTALL_DIR ${LIBDIR}/theora
 )
 

build_files/build_environment/cmake/versions.cmake

@@ -46,7 +46,7 @@ set(PTHREADS_URI http://sourceforge.mirrorservice.org/p/pt/pthreads4w/pthreads4w
 set(PTHREADS_HASH f3bf81bb395840b3446197bcf4ecd653)
 
 set(ILMBASE_VERSION 2.3.0)
-if(WIN32)
+if (WIN32)
 	if(BUILD_MODE STREQUAL Release)
 		set(ILMBASE_VERSION_POSTFIX _s)
 		set(OPENEXR_VERSION_POSTFIX _s)
@@ -61,7 +61,7 @@ set(ILMBASE_URI https://github.com/openexr/openexr/releases/download/v${ILMBASE_
 set(ILMBASE_HASH 354bf86de3b930ab87ac63619d60c860)
 
 set(OPENEXR_VERSION 2.3.0)
-if(WIN32) #release 2.3.0 tarball has broken cmake support
+if (WIN32) #release 2.3.0 tarball has broken cmake support
 	set(OPENEXR_URI https://github.com/openexr/openexr/archive/0ac2ea34c8f3134148a5df4052e40f155b76f6fb.tar.gz)
 	set(OPENEXR_HASH ed159435d508240712fbaaa21d94bafb)
 else()
@@ -71,7 +71,7 @@ else()
 endif()
 
 set(FREETYPE_VERSION 2.9.1)
-set(FREETYPE_URI http://prdownloads.sourceforge.net/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
+set(FREETYPE_URI http://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz)
 set(FREETYPE_HASH 3adb0e35d3c100c456357345ccfa8056)
 
 set(GLEW_VERSION 1.13.0)
@@ -105,8 +105,8 @@ set(CUEW_GIT_UID 1744972026de9cf27c8a7dc39cf39cd83d5f922f)
 set(CUEW_URI https://github.com/CudaWrangler/cuew/archive/${CUEW_GIT_UID}.zip)
 set(CUEW_HASH 86760d62978ebfd96cd93f5aa1abaf4a)
 
-set(OPENSUBDIV_VERSION v3_4_0_RC2)
-set(OPENSUBDIV_Hash f6a10ba9efaa82fde86fe65aad346319)
+set(OPENSUBDIV_VERSION v3_3_3)
+set(OPENSUBDIV_Hash 29c79dc01ef616aab02670bed5544ddd)
 set(OPENSUBDIV_URI https://github.com/PixarAnimationStudios/OpenSubdiv/archive/${OPENSUBDIV_VERSION}.tar.gz)
 
 set(SDL_VERSION 2.0.8)
@@ -143,11 +143,11 @@ set(OSL_VERSION 1.9.9)
 set(OSL_URI https://github.com/imageworks/OpenShadingLanguage/archive/Release-${OSL_VERSION}.tar.gz)
 set(OSL_HASH 44ad511e424965a10fce051a053b0605)
 
-set(PYTHON_VERSION 3.7.4)
+set(PYTHON_VERSION 3.7.0)
 set(PYTHON_SHORT_VERSION 3.7)
 set(PYTHON_SHORT_VERSION_NO_DOTS 37)
 set(PYTHON_URI https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz)
-set(PYTHON_HASH d33e4aae66097051c2eca45ee3604803)
+set(PYTHON_HASH eb8c2a6b1447d50813c02714af4681f3)
 
 set(TBB_VERSION 2018_U5)
 set(TBB_URI https://github.com/01org/tbb/archive/${TBB_VERSION}.tar.gz)
@@ -157,16 +157,16 @@ set(OPENVDB_VERSION 5.1.0)
 set(OPENVDB_URI https://github.com/dreamworksanimation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)
 set(OPENVDB_HASH 5310101f874dcfd2165f9cee68c22624)
 
-set(IDNA_VERSION 2.8)
+set(IDNA_VERSION 2.7)
 set(CHARDET_VERSION 3.0.4)
-set(URLLIB3_VERSION 1.25.3)
-set(CERTIFI_VERSION 2019.6.16)
-set(REQUESTS_VERSION 2.22.0)
+set(URLLIB3_VERSION 1.23)
+set(CERTIFI_VERSION 2018.8.13)
+set(REQUESTS_VERSION 2.19.1)
 
-set(NUMPY_VERSION v1.17.0)
-set(NUMPY_SHORT_VERSION 1.17)
-set(NUMPY_URI https://files.pythonhosted.org/packages/da/32/1b8f2bb5fb50e4db68543eb85ce37b9fa6660cd05b58bddfafafa7ed62da/numpy-1.17.0.zip)
-set(NUMPY_HASH aed49b31bcb44ec73b8155be78566135)
+set(NUMPY_VERSION v1.15.0)
+set(NUMPY_SHORT_VERSION 1.15)
+set(NUMPY_URI https://files.pythonhosted.org/packages/3a/20/c81632328b1a4e1db65f45c0a1350a9c5341fd4bbb8ea66cdd98da56fe2e/numpy-1.15.0.zip)
+set(NUMPY_HASH 20e13185089011116a98e11c9bf8aa07)
 
 set(LAME_VERSION 3.100)
 set(LAME_URI http://downloads.sourceforge.net/project/lame/lame/3.100/lame-${LAME_VERSION}.tar.gz)
@@ -251,7 +251,7 @@ set(JEMALLOC_URI https://github.com/jemalloc/jemalloc/releases/download/${JEMALL
 set(JEMALLOC_HASH 507f7b6b882d868730d644510491d18f)
 
 set(XML2_VERSION 2.9.4)
-set(XML2_URI http://xmlsoft.org/sources/libxml2-${XML2_VERSION}.tar.gz)
+set(XML2_URI ftp://xmlsoft.org/libxml2/libxml2-${XML2_VERSION}.tar.gz)
 set(XML2_HASH ae249165c173b1ff386ee8ad676815f5)
 
 set(TINYXML_VERSION 2_6_2)
@@ -284,7 +284,7 @@ set(BZIP2_URI http://http.debian.net/debian/pool/main/b/bzip2/bzip2_${BZIP2_VERS
 set(BZIP2_HASH d70a9ccd8bdf47e302d96c69fecd54925f45d9c7b966bb4ef5f56b770960afa7)
 
 set(FFI_VERSION 3.2.1)
-set(FFI_URI https://sourceware.org/pub/libffi/libffi-${FFI_VERSION}.tar.gz)
+set(FFI_URI ftp://sourceware.org/pub/libffi/libffi-${FFI_VERSION}.tar.gz)
 set(FFI_HASH d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37)
 
 set(LZMA_VERSION 5.2.4)
@@ -302,7 +302,3 @@ set(SQLITE_HASH fb558c49ee21a837713c4f1e7e413309aabdd9c7)
 set(EMBREE_VERSION 3.2.4)
 set(EMBREE_URI https://github.com/embree/embree/archive/v${EMBREE_VERSION}.zip)
 set(EMBREE_HASH 3d4a1147002ff43939d45140aa9d6fb8)
-
-set(OIDN_VERSION 1.0.0)
-set(OIDN_URI https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.zip)
-set(OIDN_HASH 19fe67b0164e8f020ac8a4f520defe60)

build_files/build_environment/cmake/zlib.cmake

@@ -25,7 +25,7 @@ ExternalProject_Add(external_zlib
 	INSTALL_DIR ${LIBDIR}/zlib
 )
 
-if(WIN32)
+if (WIN32)
 	if(BUILD_MODE STREQUAL Release)
 		ExternalProject_Add_Step(external_zlib after_install
 			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstatic${LIBEXT} ${HARVEST_TARGET}/zlib/lib/libz_st${LIBEXT}

build_files/build_environment/install_deps.sh

@@ -26,17 +26,17 @@ ARGS=$( \
 getopt \
 -o s:i:t:h \
 --long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\
-with-all,with-opencollada,with-jack,with-embree,with-oidn,\
+with-all,with-opencollada,with-jack,with-embree,\
 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,\
-force-ffmpeg,force-opencollada,force-alembic,force-embree,force-oidn,\
+force-ffmpeg,force-opencollada,force-alembic,force-embree,\
 build-all,build-python,build-numpy,build-boost,\
 build-ocio,build-openexr,build-oiio,build-llvm,build-osl,build-osd,build-openvdb,\
-build-ffmpeg,build-opencollada,build-alembic,build-embree,build-oidn,\
+build-ffmpeg,build-opencollada,build-alembic,build-embree,\
 skip-python,skip-numpy,skip-boost,\
 skip-ocio,skip-openexr,skip-oiio,skip-llvm,skip-osl,skip-osd,skip-openvdb,\
-skip-ffmpeg,skip-opencollada,skip-alembic,skip-embree,skip-oidn \
+skip-ffmpeg,skip-opencollada,skip-alembic,skip-embree \
 -- "$@" \
 )
 
@@ -57,7 +57,6 @@ WITH_ALL=false
 # Do not yet enable opencollada or embree, use --with-opencollada/--with-embree (or --with-all) option to try it.
 WITH_OPENCOLLADA=false
 WITH_EMBREE=false
-WITH_OIDN=false
 
 THREADS=$(nproc)
 
@@ -70,7 +69,6 @@ Number of threads for building: \$THREADS (automatically detected, use --threads
 Full install: \$WITH_ALL (use --with-all option to enable it).
 Building OpenCOLLADA: \$WITH_OPENCOLLADA (use --with-opencollada option to enable it).
 Building Embree: \$WITH_EMBREE (use --with-embree option to enable it).
-Building OpenImageDenoise: \$WITH_OIDN (use --with-oidn option to enable it).
 
 Example:
 Full install without OpenCOLLADA: --with-all --skip-opencollada
@@ -120,9 +118,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --with-embree
         Build and install the Embree libraries.
 
-    --with-oidn
-        Build and install the OpenImageDenoise libraries.
-
     --with-jack
         Install the jack libraries.
 
@@ -190,9 +185,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --build-embree
         Force the build of Embree.
 
-    --build-oidn
-        Force the build of OpenImageDenoise.
-
     --build-ffmpeg
         Force the build of FFMpeg.
 
@@ -248,9 +240,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --force-embree
         Force the rebuild of Embree.
 
-    --force-oidn
-        Force the rebuild of OpenImageDenoise.
-
     --force-ffmpeg
         Force the rebuild of FFMpeg.
 
@@ -299,9 +288,6 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
     --skip-Embree
         Unconditionally skip Embree installation/building.
 
-    --skip-oidn
-        Unconditionally skip OpenImageDenoise installation/building.
-
     --skip-ffmpeg
         Unconditionally skip FFMpeg installation/building.\""
 
@@ -315,15 +301,13 @@ NO_BUILD=false
 NO_CONFIRM=false
 USE_CXX11=true
 
-CLANG_FORMAT_VERSION_MIN="6.0"
-
-PYTHON_VERSION="3.7.4"
+PYTHON_VERSION="3.7.0"
 PYTHON_VERSION_MIN="3.7"
 PYTHON_FORCE_BUILD=false
 PYTHON_FORCE_REBUILD=false
 PYTHON_SKIP=false
 
-NUMPY_VERSION="1.17.0"
+NUMPY_VERSION="1.15.0"
 NUMPY_VERSION_MIN="1.8"
 NUMPY_FORCE_BUILD=false
 NUMPY_FORCE_REBUILD=false
@@ -372,7 +356,7 @@ OSL_FORCE_REBUILD=false
 OSL_SKIP=false
 
 # OpenSubdiv needs to be compiled for now
-OSD_VERSION="3.4.0_RC2"
+OSD_VERSION="3.3.3"
 OSD_VERSION_MIN=$OSD_VERSION
 OSD_FORCE_BUILD=false
 OSD_FORCE_REBUILD=false
@@ -399,16 +383,12 @@ OPENCOLLADA_FORCE_BUILD=false
 OPENCOLLADA_FORCE_REBUILD=false
 OPENCOLLADA_SKIP=false
 
+
 EMBREE_VERSION="3.2.4"
 EMBREE_FORCE_BUILD=false
 EMBREE_FORCE_REBUILD=false
 EMBREE_SKIP=false
 
-OIDN_VERSION="1.0.0"
-OIDN_FORCE_BUILD=false
-OIDN_FORCE_REBUILD=false
-OIDN_SKIP=false
-
 FFMPEG_VERSION="4.0.2"
 FFMPEG_VERSION_MIN="2.8.4"
 FFMPEG_FORCE_BUILD=false
@@ -545,9 +525,6 @@ while true; do
     --with-embree)
       WITH_EMBREE=true; shift; continue
     ;;
-    --with-oidn)
-      WITH_OIDN=true; shift; continue
-    ;;
     --with-jack)
       WITH_JACK=true; shift; continue;
     ;;
@@ -594,7 +571,6 @@ while true; do
       OPENVDB_FORCE_BUILD=true
       OPENCOLLADA_FORCE_BUILD=true
       EMBREE_FORCE_BUILD=true
-      OIDN_FORCE_BUILD=true
       FFMPEG_FORCE_BUILD=true
       ALEMBIC_FORCE_BUILD=true
       shift; continue
@@ -639,9 +615,6 @@ while true; do
     --build-embree)
       EMBREE_FORCE_BUILD=true; shift; continue
     ;;
-    --build-oidn)
-      OIDN_FORCE_BUILD=true; shift; continue
-    ;;
     --build-ffmpeg)
       FFMPEG_FORCE_BUILD=true; shift; continue
     ;;
@@ -661,7 +634,6 @@ while true; do
       OPENVDB_FORCE_REBUILD=true
       OPENCOLLADA_FORCE_REBUILD=true
       EMBREE_FORCE_REBUILD=true
-      OIDN_FORCE_REBUILD=true
       FFMPEG_FORCE_REBUILD=true
       ALEMBIC_FORCE_REBUILD=true
       shift; continue
@@ -704,9 +676,6 @@ while true; do
     --force-embree)
       EMBREE_FORCE_REBUILD=true; shift; continue
     ;;
-    --force-oidn)
-      OIDN_FORCE_REBUILD=true; shift; continue
-    ;;
     --force-ffmpeg)
       FFMPEG_FORCE_REBUILD=true; shift; continue
     ;;
@@ -749,9 +718,6 @@ while true; do
     --skip-embree)
       EMBREE_SKIP=true; shift; continue
     ;;
-    --skip-oidn)
-      OIDN_SKIP=true; shift; continue
-    ;;
     --skip-ffmpeg)
       FFMPEG_SKIP=true; shift; continue
     ;;
@@ -779,9 +745,6 @@ fi
 if [ "$WITH_ALL" = true -a "$EMBREE_SKIP" = false ]; then
   WITH_EMBREE=true
 fi
-if [ "$WITH_ALL" = true -a "$OIDN_SKIP" = false ]; then
-  WITH_OIDN=true
-fi
 if [ "$WITH_ALL" = true ]; then
   WITH_JACK=true
 fi
@@ -876,11 +839,6 @@ EMBREE_SOURCE=( "https://github.com/embree/embree/archive/v${EMBREE_VERSION}.tar
 #~ EMBREE_REPO_UID="4a12bfed63c90e85b6eab98b8cdd8dd2a3ba5809"
 #~ EMBREE_REPO_BRANCH="master"
 
-OIDN_USE_REPO=false
-OIDN_SOURCE=( "https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz" )
-#~ OIDN_SOURCE_REPO=( "https://github.com/OpenImageDenoise/oidn.git" )
-#~ OIDN_REPO_UID="dabfd9c80101edae9d25a710160d12d6d963c591"
-#~ OIDN_REPO_BRANCH="master"
 
 FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
 
@@ -923,7 +881,6 @@ You may also want to build them yourself (optional ones are [between brackets]):
     * [OpenVDB $OPENVDB_VERSION_MIN] (from $OPENVDB_SOURCE), [Blosc $OPENVDB_BLOSC_VERSION] (from $OPENVDB_BLOSC_SOURCE).
     * [OpenCollada $OPENCOLLADA_VERSION] (from $OPENCOLLADA_SOURCE).
     * [Embree $EMBREE_VERSION] (from $EMBREE_SOURCE).
-    * [OpenImageDenoise $OIDN_VERSION] (from $OIDN_SOURCE).
     * [Alembic $ALEMBIC_VERSION] (from $ALEMBIC_SOURCE).\""
 
 if [ "$DO_SHOW_DEPS" = true ]; then
@@ -2594,96 +2551,6 @@ compile_Embree() {
   fi
 }
 
-#### Build OpenImageDenoise ####
-_init_oidn() {
-  _src=$SRC/oidn-$OIDN_VERSION
-  _git=true
-  _inst=$INST/oidn-$OIDN_VERSION
-  _inst_shortcut=$INST/oidn
-}
-
-clean_oidn() {
-  _init_oidn
-  _clean
-}
-
-compile_OIDN() {
-  if [ "$NO_BUILD" = true ]; then
-    WARNING "--no-build enabled, OpenImageDenoise will not be compiled!"
-    return
-  fi
-
-  # To be changed each time we make edits that would modify the compiled results!
-  oidn_magic=9
-  _init_oidn
-
-  # Clean install if needed!
-  magic_compile_check oidn-$OIDN_VERSION $oidn_magic
-  if [ $? -eq 1 -o "$OIDN_FORCE_REBUILD" = true ]; then
-    clean_oidn
-  fi
-
-  if [ ! -d $_inst ]; then
-    INFO "Building OpenImageDenoise-$OIDN_VERSION"
-
-    prepare_opt
-
-    if [ ! -d $_src ]; then
-      mkdir -p $SRC
-      if [ "OIDN_USE_REPO" = true ]; then
-        git clone $OIDN_SOURCE_REPO $_src
-      else
-        download OIDN_SOURCE[@] "$_src.tar.gz"
-        INFO "Unpacking OpenImageDenoise-$OIDN_VERSION"
-        tar -C $SRC -xf $_src.tar.gz
-      fi
-    fi
-
-    cd $_src
-
-    if [ "$OIDN_USE_REPO" = true ]; then
-      git pull origin $OIDN_REPO_BRANCH
-
-      # Stick to same rev as windows' libs...
-      git checkout $OIDN_REPO_UID
-      git reset --hard
-    fi
-
-    # Always refresh the whole build!
-    if [ -d build ]; then
-      rm -rf build
-    fi
-    mkdir build
-    cd build
-
-    cmake_d="-D CMAKE_BUILD_TYPE=Release"
-    cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
-    cmake_d="$cmake_d -D WITH_EXAMPLE=OFF"
-    cmake_d="$cmake_d -D WITH_TEST=OFF"
-    cmake_d="$cmake_d -D OIDN_STATIC_LIB=ON"
-
-    cmake $cmake_d ../
-
-    make -j$THREADS && make install
-    make clean
-
-    if [ -d $_inst ]; then
-      _create_inst_shortcut
-    else
-      ERROR "OpenImageDenoise-$OIDN_VERSION failed to compile, exiting"
-      exit 1
-    fi
-
-    magic_compile_set oidn-$OIDN_VERSION $oidn_magic
-
-    cd $CWD
-    INFO "Done compiling OpenImageDenoise-$OIDN_VERSION!"
-  else
-    INFO "Own OpenImageDenoise-$OIDN_VERSION is up to date, nothing to do!"
-    INFO "If you want to force rebuild of this lib, use the --force-oidn option."
-  fi
-}
-
 #### Build FFMPEG ####
 _init_ffmpeg() {
   _src=$SRC/ffmpeg-$FFMPEG_VERSION
@@ -2761,7 +2628,7 @@ compile_FFmpeg() {
     ./configure --cc="gcc -Wl,--as-needed" \
         --extra-ldflags="-pthread -static-libgcc" \
         --prefix=$_inst --enable-static \
-        --disable-ffplay --disable-doc \
+        --disable-ffplay --disable-ffserver --disable-doc \
         --enable-gray \
         --enable-avfilter --disable-vdpau \
         --disable-bzlib --disable-libgsm --disable-libspeex \
@@ -2921,17 +2788,6 @@ install_DEB() {
     PRINT ""
   fi
 
-  PRINT ""
-  CLANG_FORMAT="clang-format"
-  check_package_version_ge_DEB $CLANG_FORMAT $CLANG_FORMAT_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    _packages="$_packages $CLANG_FORMAT"
-  else
-    PRINT ""
-    WARNING "clang-format $CLANG_FORMAT_VERSION_MIN or higher not found, this is NOT needed to get Blender compiling..."
-    PRINT ""
-  fi
-
   if [ "$WITH_JACK" = true ]; then
     _packages="$_packages libspnav-dev"
     # Only install jack if jack2 is not already installed!
@@ -3280,24 +3136,6 @@ install_DEB() {
     fi
   fi
 
-  if [ "$WITH_OIDN" = true ]; then
-    _do_compile_oidn=false
-    PRINT ""
-    if [ "$OIDN_SKIP" = true ]; then
-      WARNING "Skipping OpenImgeDenoise installation, as requested..."
-    elif [ "$OIDN_FORCE_BUILD" = true ]; then
-      INFO "Forced OpenImageDenoise building, as requested..."
-      _do_compile_oidn=true
-    else
-      # No package currently!
-      _do_compile_oidn=true
-    fi
-
-    if [ "$_do_compile_oidn" = true ]; then
-      compile_OIDN
-    fi
-  fi
-
   PRINT ""
   if [ "$FFMPEG_SKIP" = true ]; then
     WARNING "Skipping FFMpeg installation, as requested..."
@@ -3601,16 +3439,6 @@ install_RPM() {
     install_packages_RPM libspnav-devel
   fi
 
-  PRINT ""
-  CLANG_FORMAT="clang"  # Yeah, on fedora/suse clang-format is part of main clang package...
-  check_package_version_ge_RPM $CLANG_FORMAT $CLANG_FORMAT_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    install_packages_RPM $CLANG_FORMAT
-  else
-    PRINT ""
-    WARNING "clang-format $CLANG_FORMAT_VERSION_MIN or higher not found, this is NOT needed to get Blender compiling..."
-    PRINT ""
-  fi
 
   PRINT ""
   _do_compile_python=false
@@ -3872,24 +3700,6 @@ install_RPM() {
     fi
   fi
 
-  if [ "$WITH_OIDN" = true ]; then
-    _do_compile_oidn=false
-    PRINT ""
-    if [ "$OIDN_SKIP" = true ]; then
-      WARNING "Skipping OpenImgeDenoise installation, as requested..."
-    elif [ "$OIDN_FORCE_BUILD" = true ]; then
-      INFO "Forced OpenImageDenoise building, as requested..."
-      _do_compile_oidn=true
-    else
-      # No package currently!
-      _do_compile_oidn=true
-    fi
-
-    if [ "$_do_compile_oidn" = true ]; then
-      compile_OIDN
-    fi
-  fi
-
   PRINT ""
   if [ "$FFMPEG_SKIP" = true ]; then
     WARNING "Skipping FFMpeg installation, as requested..."
@@ -4076,18 +3886,6 @@ install_ARCH() {
   fi
 
 
-  PRINT ""
-  CLANG_FORMAT="clang"  # Yeah, on arch clang-format is part of main clang package...
-  check_package_version_ge_ARCH $CLANG_FORMAT $CLANG_FORMAT_VERSION_MIN
-  if [ $? -eq 0 ]; then
-    install_packages_ARCH $CLANG_FORMAT
-  else
-    PRINT ""
-    WARNING "clang-format $CLANG_FORMAT_VERSION_MIN or higher not found, this is NOT needed to get Blender compiling..."
-    PRINT ""
-  fi
-
-
   PRINT ""
   _do_compile_python=false
   if [ "$PYTHON_SKIP" = true ]; then
@@ -4354,24 +4152,6 @@ install_ARCH() {
     fi
   fi
 
-  if [ "$WITH_OIDN" = true ]; then
-    _do_compile_oidn=false
-    PRINT ""
-    if [ "$OIDN_SKIP" = true ]; then
-      WARNING "Skipping OpenImgeDenoise installation, as requested..."
-    elif [ "$OIDN_FORCE_BUILD" = true ]; then
-      INFO "Forced OpenImageDenoise building, as requested..."
-      _do_compile_oidn=true
-    else
-      # No package currently!
-      _do_compile_oidn=true
-    fi
-
-    if [ "$_do_compile_oidn" = true ]; then
-      compile_OIDN
-    fi
-  fi
-
   PRINT ""
   if [ "$FFMPEG_SKIP" = true ]; then
     WARNING "Skipping FFMpeg installation, as requested..."
@@ -4558,24 +4338,6 @@ install_OTHER() {
     fi
   fi
 
-  if [ "$WITH_OIDN" = true ]; then
-    _do_compile_oidn=false
-    PRINT ""
-    if [ "$OIDN_SKIP" = true ]; then
-      WARNING "Skipping OpenImgeDenoise installation, as requested..."
-    elif [ "$OIDN_FORCE_BUILD" = true ]; then
-      INFO "Forced OpenImageDenoise building, as requested..."
-      _do_compile_oidn=true
-    else
-      # No package currently!
-      _do_compile_oidn=true
-    fi
-
-    if [ "$_do_compile_oidn" = true ]; then
-      compile_OIDN
-    fi
-  fi
-
   PRINT ""
   if [ "$FFMPEG_SKIP" = true ]; then
     WARNING "Skipping FFMpeg installation, as requested..."
@@ -4762,44 +4524,18 @@ print_info() {
       PRINT "  $_1"
       _buildargs="$_buildargs $_1"
     fi
-    if [ -d $INST/blosc ]; then
-      _1="-D BLOSC_ROOT_DIR=$INST/blosc"
-      PRINT "  $_1"
-      _buildargs="$_buildargs $_1"
-    fi
   fi
 
   if [ "$WITH_OPENCOLLADA" = true ]; then
     _1="-D WITH_OPENCOLLADA=ON"
     PRINT "  $_1"
     _buildargs="$_buildargs $_1"
-    if [ -d $INST/opencollada ]; then
-      _1="-D OPENCOLLADA_ROOT_DIR=$INST/opencollada"
-      PRINT "  $_1"
-      _buildargs="$_buildargs $_1"
-    fi
   fi
 
   if [ "$WITH_EMBREE" = true ]; then
     _1="-D WITH_CYCLES_EMBREE=ON"
     PRINT "  $_1"
     _buildargs="$_buildargs $_1"
-    if [ -d $INST/embree ]; then
-      _1="-D EMBREE_ROOT_DIR=$INST/embree"
-      PRINT "  $_1"
-      _buildargs="$_buildargs $_1"
-    fi
-  fi
-
-  if [ "$WITH_OIDN" = true ]; then
-    _1="-D WITH_OPENIMAGEDENOISE=ON"
-    PRINT "  $_1"
-    _buildargs="$_buildargs $_1"
-    if [ -d $INST/oidn ]; then
-      _1="-D OPENIMAGEDENOISE_ROOT_DIR=$INST/oidn"
-      PRINT "  $_1"
-      _buildargs="$_buildargs $_1"
-    fi
   fi
 
   if [ "$WITH_JACK" = true ]; then

build_files/build_environment/patches/openimagedenoise.diff

@@ -1,119 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 70ec895..e616b63 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -178,7 +178,9 @@ set_property(TARGET ${PROJECT_NAME} PROPERTY SOVERSION "0")
- ## Open Image Denoise examples
- ## ----------------------------------------------------------------------------
- 
--add_subdirectory(examples)
-+if(WITH_EXAMPLE)
-+  add_subdirectory(examples)
-+endif()
- 
- ## ----------------------------------------------------------------------------
- ## Open Image Denoise install and packaging
-Submodule mkl-dnn contains modified content
-diff --git a/mkl-dnn/cmake/TBB.cmake b/mkl-dnn/cmake/TBB.cmake
-index 0711e699..c14210b6 100644
---- a/mkl-dnn/cmake/TBB.cmake
-+++ b/mkl-dnn/cmake/TBB.cmake
-@@ -90,8 +90,8 @@ if(WIN32)
-             NO_DEFAULT_PATH
-         )
-         set(TBB_LIB_DIR ${TBB_ROOT}/lib/${TBB_ARCH}/${TBB_VCVER})
--        find_library(TBB_LIBRARY tbb PATHS ${TBB_LIB_DIR} ${TBB_ROOT}/lib NO_DEFAULT_PATH)
--        find_library(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${TBB_LIB_DIR} ${TBB_ROOT}/lib NO_DEFAULT_PATH)
-+        find_library(TBB_LIBRARY tbb_static PATHS ${TBB_LIB_DIR} ${TBB_ROOT}/lib NO_DEFAULT_PATH)
-+        find_library(TBB_LIBRARY_MALLOC tbbmalloc_static PATHS ${TBB_LIB_DIR} ${TBB_ROOT}/lib NO_DEFAULT_PATH)
-     endif()
- 
- else()
-@@ -138,13 +138,13 @@ else()
-         set(TBB_LIBRARY_MALLOC TBB_LIBRARY_MALLOC-NOTFOUND)
-         if(APPLE)
-             find_path(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${TBB_ROOT}/include NO_DEFAULT_PATH)
--            find_library(TBB_LIBRARY tbb PATHS ${TBB_ROOT}/lib NO_DEFAULT_PATH)
--            find_library(TBB_LIBRARY_MALLOC tbbmalloc PATHS ${TBB_ROOT}/lib NO_DEFAULT_PATH)
-+            find_library(TBB_LIBRARY tbb_static PATHS ${TBB_ROOT}/lib NO_DEFAULT_PATH)
-+            find_library(TBB_LIBRARY_MALLOC tbbmalloc_static PATHS ${TBB_ROOT}/lib NO_DEFAULT_PATH)
-         else()
-             find_path(TBB_INCLUDE_DIR tbb/task_scheduler_init.h PATHS ${TBB_ROOT}/include NO_DEFAULT_PATH)
-             set(TBB_HINTS HINTS ${TBB_ROOT}/lib/intel64/gcc4.4 ${TBB_ROOT}/lib ${TBB_ROOT}/lib64 PATHS /usr/libx86_64-linux-gnu/)
--            find_library(TBB_LIBRARY tbb ${TBB_HINTS})
--            find_library(TBB_LIBRARY_MALLOC tbbmalloc ${TBB_HINTS})
-+            find_library(TBB_LIBRARY tbb_static ${TBB_HINTS})
-+            find_library(TBB_LIBRARY_MALLOC tbbmalloc_static ${TBB_HINTS})
-         endif()
-     endif()
- 
-diff '--ignore-matching-lines=:' -ur '--exclude=*.svn*' -u -r
---- a/cmake/install.cmake	2019-08-12 18:02:20.794402575 +0200
-+++ b/cmake/install.cmake	2019-08-12 18:06:07.470045703 +0200
-@@ -18,6 +18,13 @@
- ## Install library
- ## ----------------------------------------------------------------------------
- 
-+if(UNIX)
-+install(FILES
-+  ${CMAKE_BINARY_DIR}/libOpenImageDenoise.a
-+  ${CMAKE_BINARY_DIR}/libmkldnn.a
-+  ${CMAKE_BINARY_DIR}/libcommon.a
-+  DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+else()
- install(TARGETS ${PROJECT_NAME}
-   EXPORT
-     ${PROJECT_NAME}_Export
-@@ -38,6 +45,7 @@
-       DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
-   )
- endif()
-+endif()
- 
- ## ----------------------------------------------------------------------------
- ## Install headers
-@@ -78,6 +86,7 @@
- ## Install CMake configuration files
- ## ----------------------------------------------------------------------------
- 
-+if(NOT UNIX)
- install(EXPORT ${PROJECT_NAME}_Export
-   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-   #NAMESPACE ${PROJECT_NAME}::
-@@ -92,3 +101,4 @@
-   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
-   COMPONENT devel
- )
-+endif()
-diff '--ignore-matching-lines=:' -ur '--exclude=*.svn*' -u -r
---- a/CMakeLists.txt	2019-08-12 14:22:00.974078598 +0200
-+++ b/CMakeLists.txt	2019-08-12 18:05:05.949057375 +0200
-@@ -14,7 +14,11 @@
- ## limitations under the License.                                           ##
- ## ======================================================================== ##
- 
--cmake_minimum_required(VERSION 3.1)
-+if(UNIX)
-+  cmake_minimum_required(VERSION 3.1)
-+else()
-+  cmake_minimum_required(VERSION 3.13)
-+endif()
- 
- set(OIDN_VERSION_MAJOR 1)
- set(OIDN_VERSION_MINOR 0)
-@@ -32,13 +36,8 @@
- set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake")
- 
- # Build as shared or static library
--if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.13.0")
--  option(OIDN_STATIC_LIB "Build Open Image Denoise as a static library.")
--  mark_as_advanced(CLEAR OIDN_STATIC_LIB)
--else()
--  set(OIDN_STATIC_LIB OFF CACHE BOOL "Build Open Image Denoise as a static library." FORCE)
--  mark_as_advanced(OIDN_STATIC_LIB)
--endif()
-+option(OIDN_STATIC_LIB "Build Open Image Denoise as a static library.")
-+mark_as_advanced(CLEAR OIDN_STATIC_LIB)
- if(OIDN_STATIC_LIB)
-   set(OIDN_LIB_TYPE STATIC)
- else()

build_files/build_environment/patches/opensubdiv.diff

@@ -0,0 +1,13 @@
+diff --git a/opensubdiv/far/topologyRefiner.cpp b/opensubdiv/far/topologyRefiner.cpp
+index 3754b36e..7fe42bcc 100644
+--- a/opensubdiv/far/topologyRefiner.cpp
++++ b/opensubdiv/far/topologyRefiner.cpp
+@@ -263,7 +263,7 @@ namespace internal {
+         bool IsEmpty() const { return *((int_type*)this) == 0; }
+ 
+         FeatureMask() { Clear(); }
+-        FeatureMask(Options const & options, Sdc::SchemeType sType) { InitializeFeatures(options, sType); }
++        FeatureMask(Options const & options, Sdc::SchemeType sType) { Clear(); InitializeFeatures(options, sType); }
+ 
+         //  These are the two primary methods intended for use -- intialization via a set of Options
+         //  and reduction of the subsequent feature set (which presumes prior initialization with the

build_files/buildbot/config/blender_linux.cmake

@@ -2,22 +2,33 @@
 
 include("${CMAKE_CURRENT_LIST_DIR}/../../cmake/config/blender_release.cmake")
 
-# For libc-2.24 we are using chroot which runs on a 64bit system.
-# There we can not use CPU bitness check since it is always 64bit. So instead
-# we check for a specific libraries.
-#
-# Other builders we are running in a bare virtual machine, and the libraries
-# are installed to /opt/.
-# We assume that only 64bit builders exists in such configuration.
+# Detect which libc we'll be linking against.
+# Some of the paths will depend on this
+
 if(EXISTS "/lib/x86_64-linux-gnu/libc-2.24.so")
 	message(STATUS "Building in GLibc-2.24 environment")
+	set(GLIBC "2.24")
+	set(MULTILIB "/x86_64-linux-gnu")
 	set(LIBDIR_NAME "linux_x86_64")
 elseif(EXISTS "/lib/i386-linux-gnu//libc-2.24.so")
 	message(STATUS "Building in GLibc-2.24 environment")
+	set(GLIBC "2.24")
+	set(MULTILIB "/i386-linux-gnu")
 	set(LIBDIR_NAME "linux_i686")
+elseif(EXISTS "/lib/x86_64-linux-gnu/libc-2.19.so")
+	message(STATUS "Building in GLibc-2.19 environment")
+	set(GLIBC "2.19")
+	set(MULTILIB "/x86_64-linux-gnu")
+elseif(EXISTS "/lib/i386-linux-gnu//libc-2.19.so")
+	message(STATUS "Building in GLibc-2.19 environment")
+	set(GLIBC "2.19")
+	set(MULTILIB "/i386-linux-gnu")
+elseif(EXISTS "/lib/libc-2.11.3.so")
+	message(STATUS "Building in GLibc-2.11 environment")
+	set(GLIBC "2.11")
+	set(MULTILIB "")
 else()
-  message(STATUS "Building in generic 64bit environment")
-  set(LIBDIR_NAME "linux_x86_64")
+	message(FATAL_ERROR "Unknown build environment")
 endif()
 
 # Default to only build Blender
@@ -40,8 +51,122 @@ set(WITH_PYTHON_INSTALL_REQUESTS ON CACHE BOOL "" FORCE)
 
 # ######## Release environment specific settings ########
 
+if (NOT ${GLIBC} STREQUAL "2.24")
+
+# All the hardcoded library paths and such
+
+# LLVM libraries
+set(LLVM_VERSION             "3.4"  CACHE STRING "" FORCE)
+set(LLVM_ROOT_DIR            "/opt/lib/llvm-${LLVM_VERSION}"  CACHE STRING "" FORCE)
+set(LLVM_STATIC              ON  CACHE BOOL "" FORCE)
+
+# BOOST libraries
+set(BOOST_ROOT               "/opt/lib/boost" CACHE STRING "" FORCE)
+set(Boost_USE_STATIC_LIBS    ON CACHE BOOL "" FORCE)
+
+# FFmpeg libraries
+set(FFMPEG                   "/opt/lib/ffmpeg" CACHE STRING "" FORCE)
+set(FFMPEG_LIBRARIES
+	avdevice avformat avcodec avutil avfilter swscale swresample
+	/usr/lib${MULTILIB}/libxvidcore.a
+	/usr/lib${MULTILIB}/libx264.a
+	/usr/lib${MULTILIB}/libmp3lame.a
+	/usr/lib${MULTILIB}/libvpx.a
+	/usr/lib${MULTILIB}/libvorbis.a
+	/usr/lib${MULTILIB}/libogg.a
+	/usr/lib${MULTILIB}/libvorbisenc.a
+	/usr/lib${MULTILIB}/libtheora.a
+	/usr/lib${MULTILIB}/libschroedinger-1.0.a
+	/usr/lib${MULTILIB}/liborc-0.4.a
+	CACHE STRING "" FORCE
+)
+
+# SndFile libraries
+set(SNDFILE_LIBRARY          "/usr/lib${MULTILIB}/libsndfile.a;/usr/lib${MULTILIB}/libFLAC.a" CACHE STRING "" FORCE)
+
+# OpenAL libraries
+set(OPENAL_ROOT_DIR           "/opt/lib/openal" CACHE STRING "" FORCE)
+set(OPENAL_INCLUDE_DIR        "${OPENAL_ROOT_DIR}/include/AL" CACHE STRING "" FORCE)
+set(OPENAL_LIBRARY
+	${OPENAL_ROOT_DIR}/lib/libopenal.a
+	${OPENAL_ROOT_DIR}/lib/libcommon.a
+	CACHE STRING "" FORCE
+)
+
+# OpenCollada libraries
+set(OPENCOLLADA_UTF_LIBRARY   ""                              CACHE STRING "" FORCE)
+set(PCRE_INCLUDE_DIR          "/usr/include"                  CACHE STRING "" FORCE)
+set(PCRE_LIBRARY              "/usr/lib${MULTILIB}/libpcre.a" CACHE STRING "" FORCE)
+set(XML2_INCLUDE_DIR          "/usr/include"                  CACHE STRING "" FORCE)
+set(XML2_LIBRARY              "/usr/lib${MULTILIB}/libxml2.a" CACHE STRING "" FORCE)
+
+# OpenColorIO libraries
+set(OPENCOLORIO_ROOT_DIR      "/opt/lib/ocio" CACHE STRING "" FORCE)
+set(OPENCOLORIO_OPENCOLORIO_LIBRARY "${OPENCOLORIO_ROOT_DIR}/lib/libOpenColorIO.a" CACHE STRING "" FORCE)
+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
+		/opt/lib/oiio/lib/libOpenImageIO.a
+		/opt/lib/oiio/lib/libOpenImageIO_Util.a
+		/usr/lib${MULTILIB}/libwebp.a
+		/usr/lib${MULTILIB}/liblzma.a
+		/usr/lib${MULTILIB}/libjbig.a
+		${FREETYPE_LIBRARY}
+		CACHE STRING "" FORCE
+	)
+endif()
+
+# OpenSubdiv libraries
+set(OPENSUBDIV_ROOT_DIR "/opt/lib/opensubdiv" CACHE STRING "" FORCE)
+set(OPENSUBDIV_OSDCPU_LIBRARY "${OPENSUBDIV_ROOT_DIR}/lib/libosdCPU.a" CACHE STRING "" FORCE)
+set(OPENSUBDIV_OSDGPU_LIBRARY "${OPENSUBDIV_ROOT_DIR}/lib/libosdGPU.a" CACHE STRING "" FORCE)
+
+# OpenEXR libraries
+set(OPENEXR_ROOT_DIR          "/opt/lib/openexr"                    CACHE STRING "" FORCE)
+set(OPENEXR_HALF_LIBRARY      "/opt/lib/openexr/lib/libHalf.a"      CACHE STRING "" FORCE)
+set(OPENEXR_IEX_LIBRARY       "/opt/lib/openexr/lib/libIex.a"       CACHE STRING "" FORCE)
+set(OPENEXR_ILMIMF_LIBRARY    "/opt/lib/openexr/lib/libIlmImf.a"    CACHE STRING "" FORCE)
+set(OPENEXR_ILMTHREAD_LIBRARY "/opt/lib/openexr/lib/libIlmThread.a" CACHE STRING "" FORCE)
+set(OPENEXR_IMATH_LIBRARY     "/opt/lib/openexr/lib/libImath.a"     CACHE STRING "" FORCE)
+
+# JeMalloc library
+set(JEMALLOC_LIBRARY    "/opt/lib/jemalloc/lib/libjemalloc.a" CACHE STRING "" FORCE)
+
+# Space navigation
+set(SPACENAV_ROOT_DIR       "/opt/lib/libspnav" CACHE STRING "" FORCE)
+
+# Force some system libraries to be static
+set(FFTW3_LIBRARY       "/usr/lib${MULTILIB}/libfftw3.a" CACHE STRING "" FORCE)
+set(JPEG_LIBRARY        "/usr/lib${MULTILIB}/libjpeg.a"  CACHE STRING "" FORCE)
+set(PNG_LIBRARY         "/usr/lib${MULTILIB}/libpng.a"   CACHE STRING "" FORCE)
+set(TIFF_LIBRARY        "/usr/lib${MULTILIB}/libtiff.a"  CACHE STRING "" FORCE)
+set(ZLIB_LIBRARY        "/usr/lib${MULTILIB}/libz.a"     CACHE STRING "" FORCE)
+
+# OpenVDB
+set(OPENVDB_LIBRARY
+	/opt/lib/openvdb/lib/libopenvdb.a
+	CACHE BOOL "" FORCE
+)
+
+set(BLOSC_LIBRARY
+	/opt/lib/blosc/lib/libblosc.a
+	CACHE BOOL "" FORCE
+)
+
+else()
+
 set(LIBDIR "/opt/blender-deps/${LIBDIR_NAME}" CACHE BOOL "" FORCE)
 
+# TODO(sergey): Remove once Python is oficially bumped to 3.7.
+set(PYTHON_VERSION    3.7 CACHE BOOL "" FORCE)
+
 # Platform specific configuration, to ensure static linking against everything.
 
 set(Boost_USE_STATIC_LIBS    ON CACHE BOOL "" FORCE)
@@ -52,5 +177,7 @@ set(Boost_USE_STATIC_LIBS    ON CACHE BOOL "" FORCE)
 set(PCRE_INCLUDE_DIR          "/usr/include"                        CACHE STRING "" FORCE)
 set(PCRE_LIBRARY              "${LIBDIR}/opencollada/lib/libpcre.a" CACHE STRING "" FORCE)
 
+endif()
+
 # Additional linking libraries
 set(CMAKE_EXE_LINKER_FLAGS   "-lrt -static-libstdc++ -no-pie"  CACHE STRING "" FORCE)

build_files/buildbot/slave_compile.py

@@ -52,17 +52,20 @@ if 'cmake' in builder:
     build_dir = os.path.abspath(os.path.join('..', 'build', builder))
     install_dir = os.path.abspath(os.path.join('..', 'install', builder))
     targets = ['blender']
-    command_prefix = []
 
+    chroot_name = None  # If not None command will be delegated to that chroot
+    cuda_chroot_name = None  # If not None cuda compilationcommand will be delegated to that chroot
+    build_cubins = True  # Whether to build Cycles CUDA kernels
     bits = 64
 
     # Config file to be used (relative to blender's sources root)
     cmake_config_file = "build_files/cmake/config/blender_release.cmake"
+    cmake_cuda_config_file = None
 
     # Set build options.
     cmake_options = []
-    cmake_extra_options = ['-DCMAKE_BUILD_TYPE:STRING=Release',
-                           '-DWITH_GTESTS=ON']
+    cmake_extra_options = ['-DCMAKE_BUILD_TYPE:STRING=Release']
+    cuda_cmake_options = []
 
     if builder.startswith('mac'):
         # Set up OSX architecture
@@ -71,40 +74,93 @@ if 'cmake' in builder:
         cmake_extra_options.append('-DCMAKE_OSX_DEPLOYMENT_TARGET=10.9')
 
     elif builder.startswith('win'):
+        if builder.endswith('_vs2017'):
             if builder.startswith('win64'):
                 cmake_options.extend(['-G', 'Visual Studio 15 2017 Win64'])
             elif builder.startswith('win32'):
                 bits = 32
                 cmake_options.extend(['-G', 'Visual Studio 15 2017'])
+        elif builder.endswith('_vc2015'):
+            if builder.startswith('win64'):
+                cmake_options.extend(['-G', 'Visual Studio 14 2015 Win64'])
+            elif builder.startswith('win32'):
+                bits = 32
+                cmake_options.extend(['-G', 'Visual Studio 14 2015'])
+            cmake_extra_options.append('-DCUDA_NVCC_FLAGS=--cl-version;2013;' +
+                '--compiler-bindir;C:\\Program Files (x86)\\Microsoft Visual Studio 12.0\\VC\\bin')
+        else:
+            if builder.startswith('win64'):
+                cmake_options.extend(['-G', 'Visual Studio 12 2013 Win64'])
+            elif builder.startswith('win32'):
+                bits = 32
+                cmake_options.extend(['-G', 'Visual Studio 12 2013'])
 
     elif builder.startswith('linux'):
-        cmake_config_file = "build_files/buildbot/config/blender_linux.cmake"
         tokens = builder.split("_")
         glibc = tokens[1]
         if glibc == 'glibc224':
             deb_name = "stretch"
+        elif glibc == 'glibc219':
+            deb_name = "jessie"
+        elif glibc == 'glibc211':
+            deb_name = "squeeze"
+        cmake_config_file = "build_files/buildbot/config/blender_linux.cmake"
         if builder.endswith('x86_64_cmake'):
             chroot_name = 'buildbot_' + deb_name + '_x86_64'
+            targets = ['blender']
         elif builder.endswith('i686_cmake'):
             bits = 32
             chroot_name = 'buildbot_' + deb_name + '_i686'
-            command_prefix = ['schroot', '-c', chroot_name, '--']
-        elif glibc == 'glibc217':
-            command_prefix = ['scl', 'enable', 'devtoolset-6', '--']
+            targets = ['blender']
+        if deb_name != "stretch":
+            cmake_extra_options.extend(["-DCMAKE_C_COMPILER=/usr/bin/gcc-7",
+                                        "-DCMAKE_CXX_COMPILER=/usr/bin/g++-7"])
+
+    # Workaround to build only sm_7x kernels with CUDA 10, until
+    # older kernels work well with this version.
+    if builder.startswith('win'):
+        cmake_extra_options.append('-DCUDA_VERSION=9.1')
+        cmake_extra_options.append('-DCUDA_TOOLKIT_INCLUDE:PATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v9.1/include')
+        cmake_extra_options.append('-DCUDA_TOOLKIT_ROOT_DIR:PATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v9.1')
+        cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE:FILEPATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v9.1/bin/nvcc.exe')
+        cmake_extra_options.append('-DCUDA10_NVCC_EXECUTABLE:FILEPATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v10.0/bin/nvcc.exe')
+        cmake_extra_options.append('-DCUDA10_TOOLKIT_ROOT_DIR:PATH=C:/Program Files/NVIDIA GPU Computing Toolkit/CUDA/v10.0')
+    elif builder.startswith('linux'):
+        cmake_extra_options.append('-DCUDA_VERSION=9.1')
+        cmake_extra_options.append('-DCUDA_TOOLKIT_INCLDUE:PATH=/usr/local/cuda-9.1/include')
+        cmake_extra_options.append('-DCUDA_TOOLKIT_ROOT_DIR:PATH=/usr/local/cuda-9.1')
+        cmake_extra_options.append('-DCUDA_NVCC_EXECUTABLE:FILEPATH=/usr/local/cuda-9.1/bin/nvcc')
+        cmake_extra_options.append('-DCUDA10_NVCC_EXECUTABLE:FILEPATH=/usr/local/cuda-10.0/bin/nvcc')
+        cmake_extra_options.append('-DCUDA10_TOOLKIT_ROOT_DIR:PATH=/usr/local/cuda-10.0')
 
     cmake_options.append("-C" + os.path.join(blender_dir, cmake_config_file))
 
     # Prepare CMake options needed to configure cuda binaries compilation, 64bit only.
     if bits == 64:
-        cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=ON")
-        cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=ON")
+        cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=%s" % ('ON' if build_cubins else 'OFF'))
+        if build_cubins or 'cuda' in targets:
+            cuda_cmake_options.append("-DCUDA_64_BIT_DEVICE_CODE=ON")
+
+        # Only modify common cmake options if cuda doesn't require separate target.
+        if 'cuda' not in targets:
+            cmake_options += cuda_cmake_options
     else:
-        cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF")
+        cuda_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF")
 
     cmake_options.append("-DCMAKE_INSTALL_PREFIX=%s" % (install_dir))
 
     cmake_options += cmake_extra_options
 
+    # Prepare chroot command prefix if needed
+    if chroot_name:
+        chroot_prefix = ['schroot', '-c', chroot_name, '--']
+    else:
+        chroot_prefix = []
+    if cuda_chroot_name:
+        cuda_chroot_prefix = ['schroot', '-c', cuda_chroot_name, '--']
+    else:
+        cuda_chroot_prefix = chroot_prefix[:]
+
     # Make sure no garbage remained from the previous run
     if os.path.isdir(install_dir):
         shutil.rmtree(install_dir)
@@ -113,19 +169,27 @@ if 'cmake' in builder:
         print("Building target %s" % (target))
         # Construct build directory name based on the target
         target_build_dir = build_dir
-        target_command_prefix = command_prefix[:]
+        target_chroot_prefix = chroot_prefix[:]
         if target != 'blender':
             target_build_dir += '_' + target
         target_name = 'install'
         # Tweaking CMake options to respect the target
         target_cmake_options = cmake_options[:]
+        if target == 'cuda':
+            target_cmake_options += cuda_cmake_options
+            target_chroot_prefix = cuda_chroot_prefix[:]
+            target_name = 'cycles_kernel_cuda'
+        # If cuda binaries are compiled as a separate target, make sure
+        # other targets don't compile cuda binaries.
+        if 'cuda' in targets and target != 'cuda':
+            target_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF")
         # Do extra git fetch because not all platform/git/buildbot combinations
         # update the origin remote, causing buildinfo to detect local changes.
         os.chdir(blender_dir)
         print("Fetching remotes")
         command = ['git', 'fetch', '--all']
         print(command)
-        retcode = subprocess.call(target_command_prefix + command)
+        retcode = subprocess.call(target_chroot_prefix + command)
         if retcode != 0:
             sys.exit(retcode)
         # Make sure build directory exists and enter it
@@ -138,13 +202,7 @@ if 'cmake' in builder:
         if os.path.exists('CMakeCache.txt'):
             print("Removing CMake cache")
             os.remove('CMakeCache.txt')
-        # Remove buildinfo files to force buildbot to re-generate them.
-        for buildinfo in ('buildinfo.h', 'buildinfo.h.txt', ):
-            full_path = os.path.join('source', 'creator', buildinfo)
-            if os.path.exists(full_path):
-                print("Removing {}" . format(buildinfo))
-                os.remove(full_path)
-        retcode = subprocess.call(target_command_prefix + ['cmake', blender_dir] + target_cmake_options)
+        retcode = subprocess.call(target_chroot_prefix + ['cmake', blender_dir] + target_cmake_options)
         if retcode != 0:
             print('Configuration FAILED!')
             sys.exit(retcode)
@@ -156,11 +214,21 @@ if 'cmake' in builder:
 
         print("Executing command:")
         print(command)
-        retcode = subprocess.call(target_command_prefix + command)
+        retcode = subprocess.call(target_chroot_prefix + command)
 
         if retcode != 0:
             sys.exit(retcode)
 
+        if builder.startswith('linux') and target == 'cuda':
+            blender_h = os.path.join(blender_dir, "source", "blender", "blenkernel", "BKE_blender_version.h")
+            blender_version = int(parse_header_file(blender_h, 'BLENDER_VERSION'))
+            blender_version = "%d.%d" % (blender_version // 100, blender_version % 100)
+            kernels = os.path.join(target_build_dir, 'intern', 'cycles', 'kernel')
+            install_kernels = os.path.join(install_dir, blender_version, 'scripts', 'addons', 'cycles', 'lib')
+            os.mkdir(install_kernels)
+            print("Copying cuda binaries from %s to %s" % (kernels, install_kernels))
+            os.system('cp %s/*.cubin %s' % (kernels, install_kernels))
+
 else:
     print("Unknown building system")
     sys.exit(1)

build_files/buildbot/slave_pack.py

@@ -135,28 +135,24 @@ if builder.find('cmake') != -1:
         blender_version = "%d.%d" % (blender_version // 100, blender_version % 100)
         blender_hash = parse_header_file(buildinfo_h, 'BUILD_HASH')[1:-1]
         blender_glibc = builder.split('_')[1]
-        command_prefix = []
+
+        if builder.endswith('x86_64_cmake'):
+            chroot_name = 'buildbot_jessie_x86_64'
             bits = 64
             blender_arch = 'x86_64'
-
-        if blender_glibc == 'glibc224':
-            if builder.endswith('x86_64_cmake'):
-                chroot_name = 'buildbot_stretch_x86_64'
         elif builder.endswith('i686_cmake'):
-                chroot_name = 'buildbot_stretch_i686'
+            chroot_name = 'buildbot_jessie_i686'
             bits = 32
             blender_arch = 'i686'
-            command_prefix = ['schroot', '-c', chroot_name, '--']
-        elif blender_glibc == 'glibc217':
-            command_prefix = ['scl', 'enable', 'devtoolset-6', '--']
 
         # Strip all unused symbols from the binaries
         print("Stripping binaries...")
-        subprocess.call(command_prefix + ['strip', '--strip-all', blender])
+        chroot_prefix = ['schroot', '-c', chroot_name, '--']
+        subprocess.call(chroot_prefix + ['strip', '--strip-all', blender])
 
         print("Stripping python...")
         py_target = os.path.join(install_dir, blender_version)
-        subprocess.call(command_prefix + ['find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';'])
+        subprocess.call(chroot_prefix + ['find', py_target, '-iname', '*.so', '-exec', 'strip', '-s', '{}', ';'])
 
         # Copy all specific files which are too specific to be copied by
         # the CMake rules themselves

build_files/buildbot/slave_test.py

@@ -33,44 +33,27 @@ builder = sys.argv[1]
 blender_dir = '../blender.git'
 
 if "cmake" in builder:
+    # cmake
+
     print("Automated tests are still DISABLED!")
     sys.exit(0)
 
     build_dir = os.path.abspath(os.path.join('..', 'build', builder))
-    install_dir = os.path.abspath(os.path.join('..', 'install', builder))
-    # NOTE: For quick test only to see if the approach work.
-    # n the future must be replaced with an actual blender version.
-    blender_version = '2.80'
-    blender_version_dir = os.path.join(install_dir, blender_version)
-    command_prefix = []
-    extra_ctest_args = []
+    chroot_name = None
+    chroot_prefix = []
 
-    if builder.startswith('win'):
-        extra_ctest_args += ['-C', 'Release']
-    elif builder.startswith('linux'):
-        tokens = builder.split("_")
-        glibc = tokens[1]
-        if glibc == 'glibc224':
-            deb_name = "stretch"
+    """
     if builder.endswith('x86_64_cmake'):
-                chroot_name = 'buildbot_' + deb_name + '_x86_64'
+        chroot_name = 'buildbot_jessie_x86_64'
     elif builder.endswith('i686_cmake'):
-                chroot_name = 'buildbot_' + deb_name + '_i686'
-            command_prefix = ['schroot', '--preserve-environment', '-c', chroot_name, '--']
-        elif glibc == 'glibc217':
-            command_prefix = ['scl', 'enable', 'devtoolset-6', '--']
-
-    ctest_env = os.environ.copy()
-    ctest_env['BLENDER_SYSTEM_SCRIPTS'] = os.path.join(blender_version_dir, 'scripts')
-    ctest_env['BLENDER_SYSTEM_DATAFILES'] = os.path.join(blender_version_dir, 'datafiles')
+        chroot_name = 'buildbot_jessie_i686'
+    if chroot_name:
+        chroot_prefix = ['schroot', '-c', chroot_name, '--']
+    """
 
     os.chdir(build_dir)
-    retcode = subprocess.call(command_prefix + ['ctest', '--output-on-failure'] + extra_ctest_args,
-                              env=ctest_env)
-
-    # Always exit with a success, for until we know all the tests are passing
-    # on all builders.
-    sys.exit(0)
+    retcode = subprocess.call(chroot_prefix + ['ctest', '--output-on-failure'])
+    sys.exit(retcode)
 else:
     print("Unknown building system")
     sys.exit(1)

build_files/cmake/Modules/FindEmbree.cmake

@@ -47,10 +47,10 @@ FIND_PATH(EMBREE_INCLUDE_DIR
 
 
 SET(_embree_FIND_COMPONENTS
-  embree3
   embree_avx
   embree_avx2
   embree_sse42
+  embree3
   lexers
   math
   simd

build_files/cmake/Modules/FindOpenImageDenoise.cmake

@@ -1,101 +0,0 @@
-# - Find OpenImageDenoise library
-# Find the native OpenImageDenoise includes and library
-# This module defines
-#  OPENIMAGEDENOISE_INCLUDE_DIRS, where to find oidn.h, Set when
-#                    OPENIMAGEDENOISE is found.
-#  OPENIMAGEDENOISE_LIBRARIES, libraries to link against to use OpenImageDenoise.
-#  OPENIMAGEDENOISE_ROOT_DIR, The base directory to search for OpenImageDenoise.
-#                This can also be an environment variable.
-#  OPENIMAGEDENOISE_FOUND, If false, do not try to use OpenImageDenoise.
-#
-# also defined, but not for general use are
-#  OPENIMAGEDENOISE_LIBRARY, where to find the OpenImageDenoise library.
-
-#=============================================================================
-# Copyright 2019 Blender Foundation.
-#
-# Distributed under the OSI-approved BSD License (the "License");
-# see accompanying file Copyright.txt for details.
-#
-# This software is distributed WITHOUT ANY WARRANTY; without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the License for more information.
-#=============================================================================
-
-# If OPENIMAGEDENOISE_ROOT_DIR was defined in the environment, use it.
-IF(NOT OPENIMAGEDENOISE_ROOT_DIR AND NOT $ENV{OPENIMAGEDENOISE_ROOT_DIR} STREQUAL "")
-  SET(OPENIMAGEDENOISE_ROOT_DIR $ENV{OPENIMAGEDENOISE_ROOT_DIR})
-ENDIF()
-
-SET(_openimagedenoise_SEARCH_DIRS
-  ${OPENIMAGEDENOISE_ROOT_DIR}
-  /usr/local
-  /sw # Fink
-  /opt/local # DarwinPorts
-  /opt/lib/openimagedenoise
-)
-
-FIND_PATH(OPENIMAGEDENOISE_INCLUDE_DIR
-  NAMES
-    OpenImageDenoise/oidn.h
-  HINTS
-    ${_openimagedenoise_SEARCH_DIRS}
-  PATH_SUFFIXES
-    include
-)
-
-SET(_openimagedenoise_FIND_COMPONENTS
-  OpenImageDenoise
-  common
-  mkldnn
-)
-
-SET(_openimagedenoise_LIBRARIES)
-FOREACH(COMPONENT ${_openimagedenoise_FIND_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-
-  FIND_LIBRARY(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY
-    NAMES
-      ${COMPONENT}
-    HINTS
-      ${_openimagedenoise_SEARCH_DIRS}
-    PATH_SUFFIXES
-      lib64 lib
-    )
-  LIST(APPEND _openimagedenoise_LIBRARIES "${OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY}")
-ENDFOREACH()
-
-FIND_LIBRARY(OPENIMAGEDENOISE_LIBRARY
-  NAMES
-    OpenImageDenoise
-  HINTS
-    ${_openimagedenoise_SEARCH_DIRS}
-  PATH_SUFFIXES
-    lib64 lib
-  )
-
-# handle the QUIETLY and REQUIRED arguments and set OPENIMAGEDENOISE_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENIMAGEDENOISE DEFAULT_MSG
-    OPENIMAGEDENOISE_LIBRARY OPENIMAGEDENOISE_INCLUDE_DIR)
-
-IF(OPENIMAGEDENOISE_FOUND)
-  SET(OPENIMAGEDENOISE_LIBRARIES ${_openimagedenoise_LIBRARIES})
-  SET(OPENIMAGEDENOISE_INCLUDE_DIRS ${OPENIMAGEDENOISE_INCLUDE_DIR})
-ELSE()
-  SET(OPENIMAGEDENOISE_FOUND FALSE)
-ENDIF()
-
-MARK_AS_ADVANCED(
-  OPENIMAGEDENOISE_INCLUDE_DIR
-)
-
-FOREACH(COMPONENT ${_openimagedenoise_FIND_COMPONENTS})
-  STRING(TOUPPER ${COMPONENT} UPPERCOMPONENT)
-  MARK_AS_ADVANCED(OPENIMAGEDENOISE_${UPPERCOMPONENT}_LIBRARY)
-ENDFOREACH()
-
-UNSET(_openimagedenoise_SEARCH_DIRS)
-UNSET(_openimagedenoise_FIND_COMPONENTS)
-UNSET(_openimagedenoise_LIBRARIES)

build_files/cmake/Modules/FindSndFile.cmake

@@ -6,7 +6,7 @@
 #  LIBSNDFILE_LIBRARIES, libraries to link against to use SndFile.
 #  LIBSNDFILE_ROOT_DIR, The base directory to search for SndFile.
 #                    This can also be an environment variable.
-#  SNDFILE_FOUND, If false, do not try to use SndFile.
+#  LIBSNDFILE_FOUND, If false, do not try to use SndFile.
 #
 # also defined, but not for general use are
 #  LIBSNDFILE_LIBRARY, where to find the SndFile library.
@@ -50,16 +50,16 @@ FIND_LIBRARY(LIBSNDFILE_LIBRARY
     lib64 lib
   )
 
-# handle the QUIETLY and REQUIRED arguments and set SNDFILE_FOUND to TRUE if
+# handle the QUIETLY and REQUIRED arguments and set LIBSNDFILE_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(SndFile DEFAULT_MSG
 	LIBSNDFILE_LIBRARY LIBSNDFILE_INCLUDE_DIR)
 
-IF(SNDFILE_FOUND)
+IF(LIBSNDFILE_FOUND)
 	SET(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBRARY})
 	SET(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE_INCLUDE_DIR})
-ENDIF(SNDFILE_FOUND)
+ENDIF(LIBSNDFILE_FOUND)
 
 MARK_AS_ADVANCED(
 	LIBSNDFILE_INCLUDE_DIR

build_files/cmake/Modules/GTestTesting.cmake

@@ -50,10 +50,6 @@ macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST)
 		                      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>)
-
-      # Don't fail tests on leaks since these often happen in external libraries
-      # that we can't fix.
-      set_tests_properties(${NAME}_test PROPERTIES ENVIRONMENT LSAN_OPTIONS=exitcode=0)
 		endif()
 	endif()
 endmacro()

build_files/cmake/clang_array_check.py

@@ -130,7 +130,7 @@ def function_parm_wash_tokens(parm):
                          )
 
     """
-    Return tokens without trailing commands and 'const'
+    Return tolens without trailing commands and 'const'
     """
 
     tokens = [t for t in parm.get_tokens()]

build_files/cmake/cmake_netbeans_project.py

@@ -238,7 +238,7 @@ def create_nb_project_main():
 
         f.write('        </makeTool>\n')
         f.write('      </makefileType>\n')
-        # finished makefile info
+        # finishe makefle info
 
         f.write('    \n')
 

build_files/cmake/config/blender_developer.cmake

@@ -1,19 +0,0 @@
-# Configuration for developers, with faster builds, error checking and tests.
-#
-# Example usage:
-#   cmake -C../blender/build_files/cmake/config/blender_developer.cmake  ../blender
-#
-
-set(WITH_ASSERT_ABORT                 ON  CACHE BOOL "" FORCE)
-set(WITH_BUILDINFO                    OFF CACHE BOOL "" FORCE)
-set(WITH_COMPILER_ASAN                ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_DEBUG                 ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_NATIVE_ONLY           ON  CACHE BOOL "" FORCE)
-set(WITH_GTESTS                       ON  CACHE BOOL "" FORCE)
-set(WITH_LIBMV_SCHUR_SPECIALIZATIONS  OFF CACHE BOOL "" FORCE)
-set(WITH_PYTHON_SAFETY                ON  CACHE BOOL "" FORCE)
-set(WITH_DOC_MANPAGE                  OFF CACHE BOOL "" FORCE)
-
-# This may have issues with C++ initialization order, needs to be tested
-# on all platforms to be sure this is safe to enable.
-# set(WITH_CXX_GUARDEDALLOC             ON  CACHE BOOL "" FORCE)

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_DRACO               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)
@@ -40,7 +39,6 @@ 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_OPENIMAGEDENOISE    ON  CACHE BOOL "" FORCE)
 set(WITH_OPENMP              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB             ON  CACHE BOOL "" FORCE)

build_files/cmake/config/blender_lite.cmake

@@ -17,7 +17,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_DRACO               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)
@@ -45,7 +44,6 @@ set(WITH_AUDASPACE           OFF CACHE BOOL "" FORCE)
 set(WITH_OPENAL              OFF CACHE BOOL "" FORCE)
 set(WITH_OPENCOLLADA         OFF CACHE BOOL "" FORCE)
 set(WITH_OPENCOLORIO         OFF CACHE BOOL "" FORCE)
-set(WITH_OPENIMAGEDENOISE    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)

build_files/cmake/config/blender_release.cmake

@@ -13,7 +13,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_DRACO               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)
@@ -41,7 +40,6 @@ 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_OPENIMAGEDENOISE    ON  CACHE BOOL "" FORCE)
 set(WITH_OPENMP              ON  CACHE BOOL "" FORCE)
 set(WITH_OPENSUBDIV          ON  CACHE BOOL "" FORCE)
 set(WITH_OPENVDB             ON  CACHE BOOL "" FORCE)
@@ -54,7 +52,6 @@ set(WITH_X11_XF86VMODE       ON  CACHE BOOL "" FORCE)
 
 set(WITH_MEM_JEMALLOC        ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_CUDA_BINARIES ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_CUBIN_COMPILER OFF CACHE BOOL "" FORCE)
 set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_75 CACHE STRING "" FORCE)
 
 # platform dependent options

build_files/cmake/config/bpy_module.cmake

@@ -30,8 +30,3 @@ set(WITH_INTERNATIONAL       OFF CACHE BOOL "" FORCE)
 set(WITH_BULLET              OFF CACHE BOOL "" FORCE)
 set(WITH_OPENVDB             OFF CACHE BOOL "" FORCE)
 set(WITH_ALEMBIC             OFF CACHE BOOL "" FORCE)
-
-if(CMAKE_SYSTEM_NAME MATCHES "Linux")
-  # jemalloc causes linking error on import, disable.
-  set(WITH_MEM_JEMALLOC        OFF CACHE BOOL "" FORCE)
-endif()

build_files/cmake/macros.cmake

@@ -173,23 +173,9 @@ function(blender_source_group
 	sources
 	)
 
-  #if enabled, use the sources directories as filters.
-  if(WINDOWS_USE_VISUAL_STUDIO_SOURCE_FOLDERS)
-    foreach(_SRC ${sources})
-      # remove ../'s
-      get_filename_component(_SRC_DIR ${_SRC} REALPATH)
-      get_filename_component(_SRC_DIR ${_SRC_DIR} DIRECTORY)
-      string(FIND ${_SRC_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/" _pos)
-      if(NOT _pos EQUAL -1)
-        string(REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/" "" GROUP_ID ${_SRC_DIR})
-        string(REPLACE "/" "\\" GROUP_ID ${GROUP_ID})
-        source_group("${GROUP_ID}" FILES ${_SRC})
-      endif()
-      unset(_pos)
-    endforeach()
-  else()
 	# Group by location on disk
 	source_group("Source Files" FILES CMakeLists.txt)
+
 	foreach(_SRC ${sources})
 		get_filename_component(_SRC_EXT ${_SRC} EXT)
 		if((${_SRC_EXT} MATCHES ".h") OR
@@ -197,14 +183,11 @@ function(blender_source_group
 		   (${_SRC_EXT} MATCHES ".hh"))
 
 			set(GROUP_ID "Header Files")
-      elseif(${_SRC_EXT} MATCHES ".glsl$")
-        set(GROUP_ID "Shaders")
 		else()
 			set(GROUP_ID "Source Files")
 		endif()
 		source_group("${GROUP_ID}" FILES ${_SRC})
 	endforeach()
-  endif()
 endfunction()
 
 
@@ -239,7 +222,6 @@ function(blender_add_lib__impl
 	sources
 	includes
 	includes_sys
-  library_deps
 	)
 
 	# message(STATUS "Configuring library ${name}")
@@ -251,16 +233,12 @@ function(blender_add_lib__impl
 
 	add_library(${name} ${sources})
 
-  if(NOT "${library_deps}" STREQUAL "")
-    target_link_libraries(${name} INTERFACE "${library_deps}")
-  endif()
-
 	# works fine without having the includes
 	# listed is helpful for IDE's (QtCreator/MSVC)
 	blender_source_group("${sources}")
 
 	#if enabled, set the FOLDER property for visual studio projects
-  if(WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS)
+	if(WINDOWS_USE_VISUAL_STUDIO_FOLDERS)
 		get_filename_component(FolderDir ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 		string(REPLACE ${CMAKE_SOURCE_DIR} "" FolderDir ${FolderDir})
 		set_target_properties(${name} PROPERTIES FOLDER ${FolderDir})
@@ -279,12 +257,11 @@ function(blender_add_lib_nolist
 	sources
 	includes
 	includes_sys
-  library_deps
 	)
 
 	add_cc_flags_custom_test(${name} PARENT_SCOPE)
 
-  blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${library_deps}")
+	blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}")
 endfunction()
 
 function(blender_add_lib
@@ -292,36 +269,15 @@ function(blender_add_lib
 	sources
 	includes
 	includes_sys
-  library_deps
 	)
 
 	add_cc_flags_custom_test(${name} PARENT_SCOPE)
 
-  blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}" "${library_deps}")
+	blender_add_lib__impl(${name} "${sources}" "${includes}" "${includes_sys}")
 
 	set_property(GLOBAL APPEND PROPERTY BLENDER_LINK_LIBS ${name})
 endfunction()
 
-# Ninja only: assign 'heavy pool' to some targets that are especially RAM-consuming to build.
-function(setup_heavy_lib_pool)
-  if(WITH_NINJA_POOL_JOBS AND NINJA_MAX_NUM_PARALLEL_COMPILE_HEAVY_JOBS)
-    if(WITH_CYCLES)
-      list(APPEND _HEAVY_LIBS "cycles_device" "cycles_kernel")
-    endif()
-    if(WITH_LIBMV)
-      list(APPEND _HEAVY_LIBS "bf_intern_libmv")
-    endif()
-    if(WITH_OPENVDB)
-      list(APPEND _HEAVY_LIBS "bf_intern_openvdb")
-    endif()
-
-    foreach(TARGET ${_HEAVY_LIBS})
-      if(TARGET ${TARGET})
-        set_property(TARGET ${TARGET} PROPERTY JOB_POOL_COMPILE compile_heavy_job_pool)
-      endif()
-    endforeach()
-  endif()
-endfunction()
 
 function(SETUP_LIBDIRS)
 
@@ -352,9 +308,6 @@ function(SETUP_LIBDIRS)
 		if(WITH_OPENIMAGEIO)
 			link_directories(${OPENIMAGEIO_LIBPATH})
 		endif()
-    if(WITH_OPENIMAGEDENOISE)
-      link_directories(${OPENIMAGEDENOISE_LIBPATH})
-    endif()
 		if(WITH_OPENCOLORIO)
 			link_directories(${OPENCOLORIO_LIBPATH})
 		endif()
@@ -423,11 +376,19 @@ function(setup_liblinks
 		${FREETYPE_LIBRARY}
 	)
 
-
-  if(WITH_PYTHON)
+	# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
+	if(WITH_PYTHON)  # AND NOT WITH_PYTHON_MODULE  # WIN32 needs
 		target_link_libraries(${target} ${PYTHON_LINKFLAGS})
+
+		if(WIN32 AND NOT UNIX)
+			file_list_suffix(PYTHON_LIBRARIES_DEBUG "${PYTHON_LIBRARIES}" "_d")
+			target_link_libraries_debug(${target} "${PYTHON_LIBRARIES_DEBUG}")
+			target_link_libraries_optimized(${target} "${PYTHON_LIBRARIES}")
+			unset(PYTHON_LIBRARIES_DEBUG)
+		else()
 			target_link_libraries(${target} ${PYTHON_LIBRARIES})
 		endif()
+	endif()
 
 	if(WITH_LZO AND WITH_SYSTEM_LZO)
 		target_link_libraries(${target} ${LZO_LIBRARIES})
@@ -456,24 +417,24 @@ function(setup_liblinks
 	if(WITH_SDL AND NOT WITH_SDL_DYNLOAD)
 		target_link_libraries(${target} ${SDL_LIBRARY})
 	endif()
-  if(WITH_CYCLES_OSL)
-    target_link_libraries(${target} ${OSL_LIBRARIES})
-  endif()
-  if(WITH_OPENVDB)
-    target_link_libraries(${target} ${OPENVDB_LIBRARIES} ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
+	if(WITH_IMAGE_TIFF)
+		target_link_libraries(${target} ${TIFF_LIBRARY})
 	endif()
 	if(WITH_OPENIMAGEIO)
 		target_link_libraries(${target} ${OPENIMAGEIO_LIBRARIES})
 	endif()
-  if(WITH_OPENIMAGEDENOISE)
-    target_link_libraries(${target} ${OPENIMAGEDENOISE_LIBRARIES} ${TBB_LIBRARIES})
-  endif()
 	if(WITH_OPENCOLORIO)
 		target_link_libraries(${target} ${OPENCOLORIO_LIBRARIES})
 	endif()
 	if(WITH_OPENSUBDIV)
 			target_link_libraries(${target} ${OPENSUBDIV_LIBRARIES})
 	endif()
+	if(WITH_OPENVDB)
+		target_link_libraries(${target} ${OPENVDB_LIBRARIES} ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
+	endif()
+	if(WITH_CYCLES_OSL)
+		target_link_libraries(${target} ${OSL_LIBRARIES})
+	endif()
 	if(WITH_CYCLES_EMBREE)
 		target_link_libraries(${target} ${EMBREE_LIBRARIES})
 	endif()
@@ -487,9 +448,6 @@ function(setup_liblinks
 	if(WITH_ALEMBIC)
 		target_link_libraries(${target} ${ALEMBIC_LIBRARIES} ${HDF5_LIBRARIES})
 	endif()
-  if(WITH_IMAGE_TIFF)
-    target_link_libraries(${target} ${TIFF_LIBRARY})
-  endif()
 	if(WITH_IMAGE_OPENEXR)
 		target_link_libraries(${target} ${OPENEXR_LIBRARIES})
 	endif()
@@ -574,6 +532,266 @@ function(setup_liblinks
 	target_link_libraries(${target} ${PLATFORM_LINKLIBS})
 endfunction()
 
+
+function(SETUP_BLENDER_SORTED_LIBS)
+
+	get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
+
+	list(APPEND BLENDER_LINK_LIBS
+		bf_windowmanager
+		bf_render
+	)
+
+	if(WITH_MOD_FLUID)
+		list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
+	endif()
+
+	if(WITH_CYCLES)
+		list(APPEND BLENDER_LINK_LIBS
+			cycles_render
+			cycles_graph
+			cycles_bvh
+			cycles_device
+			cycles_kernel
+			cycles_util
+			cycles_subd)
+		if(WITH_CYCLES_OSL)
+			list(APPEND BLENDER_LINK_LIBS cycles_kernel_osl)
+		endif()
+	endif()
+
+	if(WITH_AUDASPACE AND NOT WITH_SYSTEM_AUDASPACE)
+		list(APPEND BLENDER_LINK_LIBS
+			audaspace
+			audaspace-py)
+	endif()
+
+	# Sort libraries
+	set(BLENDER_SORTED_LIBS
+		bf_windowmanager
+
+		bf_editor_undo
+
+		bf_editor_space_api
+		bf_editor_space_action
+		bf_editor_space_buttons
+		bf_editor_space_console
+		bf_editor_space_file
+		bf_editor_space_graph
+		bf_editor_space_image
+		bf_editor_space_info
+		bf_editor_space_logic
+		bf_editor_space_nla
+		bf_editor_space_node
+		bf_editor_space_outliner
+		bf_editor_space_script
+		bf_editor_space_sequencer
+		bf_editor_space_statusbar
+		bf_editor_space_text
+		bf_editor_space_time
+		bf_editor_space_topbar
+		bf_editor_space_userpref
+		bf_editor_space_view3d
+		bf_editor_space_clip
+
+		bf_editor_transform
+		bf_editor_uvedit
+		bf_editor_curve
+		bf_editor_interface
+		bf_editor_gizmo_library
+		bf_editor_mesh
+		bf_editor_metaball
+		bf_editor_object
+		bf_editor_gpencil
+		bf_editor_lattice
+		bf_editor_armature
+		bf_editor_physics
+		bf_editor_render
+		bf_editor_scene
+		bf_editor_screen
+		bf_editor_sculpt_paint
+		bf_editor_sound
+		bf_editor_animation
+		bf_editor_datafiles
+		bf_editor_mask
+		bf_editor_io
+		bf_editor_util
+
+		bf_render
+		bf_python
+		bf_python_ext
+		bf_python_mathutils
+		bf_python_gpu
+		bf_python_bmesh
+		bf_freestyle
+		bf_ikplugin
+		bf_modifiers
+		bf_gpencil_modifiers
+		bf_alembic
+		bf_bmesh
+		bf_gpu
+		bf_draw
+		bf_blenloader
+		bf_blenkernel
+		bf_shader_fx
+		bf_gpencil_modifiers
+		bf_physics
+		bf_nodes
+		bf_rna
+		bf_editor_gizmo_library  # rna -> gizmo bad-level calls
+		bf_python
+		bf_imbuf
+		bf_blenlib
+		bf_depsgraph
+		bf_intern_ghost
+		bf_intern_string
+		bf_avi
+		bf_imbuf_cineon
+		bf_imbuf_openexr
+		bf_imbuf_openimageio
+		bf_imbuf_dds
+		bf_collada
+		bf_intern_elbeem
+		bf_intern_memutil
+		bf_intern_guardedalloc
+		bf_intern_ctr
+		bf_intern_utfconv
+		bf_intern_smoke
+		extern_lzma
+		extern_curve_fit_nd
+		bf_intern_moto
+		extern_openjpeg
+		bf_dna
+
+		bf_blenfont
+		bf_gpu  # duplicate for blenfont
+		bf_blentranslation
+		bf_intern_audaspace
+		audaspace
+		audaspace-py
+		bf_intern_mikktspace
+		bf_intern_dualcon
+		bf_intern_cycles
+		cycles_device
+		cycles_render
+		cycles_graph
+		cycles_bvh
+		cycles_kernel
+		cycles_util
+		cycles_subd
+		bf_intern_opencolorio
+		bf_intern_gawain
+		bf_intern_eigen
+		extern_rangetree
+		extern_wcwidth
+		bf_intern_libmv
+		extern_sdlew
+
+		bf_intern_glew_mx
+		bf_intern_clog
+		bf_intern_opensubdiv
+		bf_intern_numaapi
+	)
+
+	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")
+		list_insert_after(BLENDER_SORTED_LIBS "bf_compositor" "bf_intern_opencl")
+	endif()
+
+	if(WITH_LIBMV)
+		list(APPEND BLENDER_SORTED_LIBS extern_ceres)
+	endif()
+
+	if(WITH_MOD_CLOTH_ELTOPO)
+		list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
+	endif()
+
+	if(NOT WITH_SYSTEM_LZO)
+		list(APPEND BLENDER_SORTED_LIBS extern_minilzo)
+	endif()
+
+	if(NOT WITH_SYSTEM_GLEW)
+		list(APPEND BLENDER_SORTED_LIBS ${BLENDER_GLEW_LIBRARIES})
+	endif()
+
+	if(WITH_BINRELOC)
+		list(APPEND BLENDER_SORTED_LIBS extern_binreloc)
+	endif()
+
+	if(WITH_CXX_GUARDEDALLOC)
+		list(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
+	endif()
+
+	if(WITH_IK_SOLVER)
+		list_insert_after(BLENDER_SORTED_LIBS "bf_intern_elbeem" "bf_intern_iksolver")
+	endif()
+
+	if(WITH_IK_ITASC)
+		list(APPEND BLENDER_SORTED_LIBS bf_intern_itasc)
+	endif()
+
+	if(WITH_GHOST_XDND)
+		list(APPEND BLENDER_SORTED_LIBS extern_xdnd)
+	endif()
+
+	if(WITH_CYCLES_OSL)
+		list_insert_after(BLENDER_SORTED_LIBS "cycles_kernel" "cycles_kernel_osl")
+	endif()
+
+	if(WITH_INTERNATIONAL)
+		list(APPEND BLENDER_SORTED_LIBS bf_intern_locale)
+	endif()
+
+	if(WITH_BULLET)
+		list_insert_after(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_intern_rigidbody")
+	endif()
+
+	if(WITH_BULLET AND NOT WITH_SYSTEM_BULLET)
+		list_insert_after(BLENDER_SORTED_LIBS "extern_openjpeg" "extern_bullet")
+	endif()
+
+	if(WIN32)
+		list(APPEND BLENDER_SORTED_LIBS bf_intern_gpudirect)
+	endif()
+
+	if(WITH_OPENVDB)
+		list(APPEND BLENDER_SORTED_LIBS bf_intern_openvdb)
+	endif()
+
+	foreach(SORTLIB ${BLENDER_SORTED_LIBS})
+		set(REMLIB ${SORTLIB})
+		foreach(SEARCHLIB ${BLENDER_LINK_LIBS})
+			if(${SEARCHLIB} STREQUAL ${SORTLIB})
+				set(REMLIB "")
+			endif()
+		endforeach()
+		if(REMLIB)
+			# message(STATUS "Removing library ${REMLIB} from blender linking because: not configured")
+			list(APPEND REM_MSG ${REMLIB})
+			list(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
+		endif()
+	endforeach()
+	if(REM_MSG)
+		list(SORT REM_MSG)
+		message(STATUS "Blender Skipping: (${REM_MSG})")
+	endif()
+
+
+	set(BLENDER_SORTED_LIBS ${BLENDER_SORTED_LIBS} PARENT_SCOPE)
+
+	# for top-level tests
+	set_property(GLOBAL PROPERTY BLENDER_SORTED_LIBS_PROP ${BLENDER_SORTED_LIBS})
+endfunction()
+
 macro(TEST_SSE_SUPPORT
 	_sse_flags
 	_sse2_flags)
@@ -719,7 +937,7 @@ macro(remove_strict_flags)
 	endif()
 
 	if(MSVC)
-    remove_cc_flag(/w34189) # Restore warn C4189 (unused variable) back to w4 
+		# TODO
 	endif()
 
 endmacro()
@@ -961,7 +1179,6 @@ function(delayed_install
 		endif()
 		set_property(GLOBAL APPEND PROPERTY DELAYED_INSTALL_DESTINATIONS ${destination})
 	endforeach()
-  unset(f)
 endfunction()
 
 # note this is a function instead of a macro so that ${BUILD_TYPE} in targetdir
@@ -1244,26 +1461,3 @@ macro(WINDOWS_SIGN_TARGET target)
 		endif()
 	endif()
 endmacro()
-
-macro(blender_precompile_headers target cpp header)
-  if(MSVC)
-    # get the name for the pch output file
-    get_filename_component( pchbase ${cpp} NAME_WE )
-    set( pchfinal "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${pchbase}.pch" )
-
-    # mark the cpp as the one outputting the pch
-    set_property(SOURCE ${cpp} APPEND PROPERTY OBJECT_OUTPUTS "${pchfinal}")
-
-    # get all sources for the target
-    get_target_property(sources ${target} SOURCES)
-
-    # make all sources depend on the pch to enforce the build order
-    foreach(src ${sources})
-      set_property(SOURCE ${src} APPEND PROPERTY OBJECT_DEPENDS "${pchfinal}")
-    endforeach()
-
-    target_sources(${target} PRIVATE ${cpp} ${header})
-    set_target_properties(${target} PROPERTIES COMPILE_FLAGS "/Yu${header} /Fp${pchfinal} /FI${header}")
-    set_source_files_properties(${cpp} PROPERTIES COMPILE_FLAGS "/Yc${header} /Fp${pchfinal}")
-  endif()
-endmacro()

build_files/cmake/packaging.cmake

@@ -80,28 +80,22 @@ if(APPLE)
 endif()
 
 if(WIN32)
-  set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender ${MAJOR_VERSION}.${MINOR_VERSION}")
-  set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender ${MAJOR_VERSION}.${MINOR_VERSION}")
+	set(CPACK_PACKAGE_INSTALL_DIRECTORY "Blender Foundation/Blender")
+	set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "Blender Foundation/Blender")
 
 	set(CPACK_NSIS_MUI_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
 	set(CPACK_NSIS_COMPRESSOR "/SOLID lzma")
 
-  set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/release/text/GPL3-license.txt)
+	set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/release/text/GPL-license.txt)
 	set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.ico)
-
-  set(BLENDER_NAMESPACE_GUID "507F933F-5898-404A-9A05-18282FD491A6")
-
-  string(UUID CPACK_WIX_UPGRADE_GUID
-    NAMESPACE ${BLENDER_NAMESPACE_GUID}
-    NAME ${CPACK_PACKAGE_INSTALL_DIRECTORY}
-    TYPE SHA1 UPPER
-  )
+	set(CPACK_WIX_UPGRADE_GUID "B767E4FD-7DE7-4094-B051-3AE62E13A17A")
 
 	set(CPACK_WIX_TEMPLATE ${LIBDIR}/package/installer_wix/WIX.template)
 	set(CPACK_WIX_UI_BANNER ${LIBDIR}/package/installer_wix/WIX_UI_BANNER.bmp)
 	set(CPACK_WIX_UI_DIALOG ${LIBDIR}/package/installer_wix/WIX_UI_DIALOG.bmp)
 
-  set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:medium)
+	#force lzma instead of deflate
+	set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:high)
 endif()
 
 set(CPACK_PACKAGE_EXECUTABLES "blender" "blender")

build_files/cmake/platform/platform_apple.cmake

@@ -20,7 +20,7 @@
 
 # Libraries configuration for Apple.
 
-set(MACOSX_DEPLOYMENT_TARGET "10.11")
+set(MACOSX_DEPLOYMENT_TARGET "10.9")
 
 macro(find_package_wrapper)
 # do nothing, just satisfy the macro
@@ -181,7 +181,7 @@ endif()
 
 set(PLATFORM_CFLAGS "-pipe -funsigned-char")
 set(PLATFORM_LINKFLAGS
-  "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework Metal -framework QuartzCore"
+	"-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Cocoa -framework Carbon -framework AudioUnit -framework AudioToolbox -framework CoreAudio"
 )
 
 list(APPEND PLATFORM_LINKLIBS c++)
@@ -382,19 +382,6 @@ if(WITH_CYCLES_EMBREE)
 	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Xlinker -stack_size -Xlinker 0x100000")
 endif()
 
-if(WITH_OPENIMAGEDENOISE)
-  find_package(OpenImageDenoise)
-  find_package(TBB)
-
-  if(NOT OPENIMAGEDENOISE_FOUND)
-    set(WITH_OPENIMAGEDENOISE OFF)
-    message(STATUS "OpenImageDenoise not found")
-  elseif(NOT TBB_FOUND)
-    set(WITH_OPENIMAGEDENOISE OFF)
-    message(STATUS "TBB not found")
-  endif()
-endif()
-
 # CMake FindOpenMP doesn't know about AppleClang before 3.12, so provide custom flags.
 if(WITH_OPENMP)
 	if(CMAKE_C_COMPILER_ID MATCHES "AppleClang" AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL "7.0")
@@ -406,13 +393,16 @@ if(WITH_OPENMP)
 		set(OpenMP_CXX_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
 		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -L'${LIBDIR}/openmp/lib' -lomp")
 
-    # Copy libomp.dylib to allow executables like datatoc and tests to work.
+		# Copy libomp.dylib to allow executables like datatoc to work.
+		if(CMAKE_MAKE_PROGRAM MATCHES "xcodebuild")
+			set(OPENMP_DYLIB_AUX_PATH "${CMAKE_BINARY_DIR}/bin")
+		else()
+			set(OPENMP_DYLIB_AUX_PATH "${CMAKE_BINARY_DIR}")
+		endif()
+
 		execute_process(
-        COMMAND mkdir -p ${CMAKE_BINARY_DIR}/Resources/lib
-        COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/Resources/lib/libomp.dylib)
-    execute_process(
-        COMMAND mkdir -p ${CMAKE_BINARY_DIR}/bin/Resources/lib
-        COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${CMAKE_BINARY_DIR}/bin/Resources/lib/libomp.dylib)
+				COMMAND mkdir -p ${OPENMP_DYLIB_AUX_PATH}/Resources/lib
+				COMMAND cp -p ${LIBDIR}/openmp/lib/libomp.dylib ${OPENMP_DYLIB_AUX_PATH}/Resources/lib/libomp.dylib)
 	endif()
 endif()
 

build_files/cmake/platform/platform_apple_xcode.cmake

@@ -93,14 +93,19 @@ else()
 	endif()
 endif()
 
-# 10.11 is our min. target, if you use higher sdk, weak linking happens
+if(OSX_SYSTEM MATCHES 10.9)
+	# make sure syslibs and headers are looked up in sdk ( especially for 10.9 openGL atm. )
+	set(CMAKE_FIND_ROOT_PATH ${CMAKE_OSX_SYSROOT})
+endif()
+
+# 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.11)
-    message(STATUS "Setting deployment target to 10.11, lower versions are not supported")
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "" FORCE)
+	if(${CMAKE_OSX_DEPLOYMENT_TARGET} VERSION_LESS 10.9)
+		message(STATUS "Setting deployment target to 10.9, lower versions are not supported")
+		set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "" FORCE)
 	endif()
 else()
-  set(CMAKE_OSX_DEPLOYMENT_TARGET "10.11" CACHE STRING "" FORCE)
+	set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "" FORCE)
 endif()
 
 if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")

build_files/cmake/platform/platform_unix.cmake

@@ -156,7 +156,7 @@ endif()
 # Codecs
 if(WITH_CODEC_SNDFILE)
 	find_package_wrapper(SndFile)
-  if(NOT SNDFILE_FOUND)
+	if(NOT LIBSNDFILE_FOUND)
 		set(WITH_CODEC_SNDFILE OFF)
 	endif()
 endif()
@@ -368,15 +368,6 @@ if(WITH_CYCLES_EMBREE)
 	find_package(Embree 3.2.4 REQUIRED)
 endif()
 
-if(WITH_OPENIMAGEDENOISE)
-  find_package_wrapper(OpenImageDenoise)
-
-  if(NOT OPENIMAGEDENOISE_FOUND)
-    set(WITH_OPENIMAGEDENOISE OFF)
-    message(STATUS "OpenImageDenoise not found")
-  endif()
-endif()
-
 if(WITH_LLVM)
 	if(EXISTS ${LIBDIR})
 		set(LLVM_STATIC ON)

build_files/cmake/platform/platform_win32.cmake

@@ -30,14 +30,14 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
 	set(MSVC_CLANG On)
 	set(VC_TOOLS_DIR $ENV{VCToolsRedistDir} CACHE STRING "Location of the msvc redistributables")
 	set(MSVC_REDIST_DIR ${VC_TOOLS_DIR})
-  if(DEFINED MSVC_REDIST_DIR)
+	if (DEFINED MSVC_REDIST_DIR)
 		file(TO_CMAKE_PATH ${MSVC_REDIST_DIR} MSVC_REDIST_DIR)
 	else()
 		message("Unable to detect the Visual Studio redist directory, copying of the runtime dlls will not work, try running from the visual studio developer prompt.")
 	endif()
 endif()
 
-set_property(GLOBAL PROPERTY USE_FOLDERS ${WINDOWS_USE_VISUAL_STUDIO_PROJECT_FOLDERS})
+set_property(GLOBAL PROPERTY USE_FOLDERS ${WINDOWS_USE_VISUAL_STUDIO_FOLDERS})
 
 if(NOT WITH_PYTHON_MODULE)
 	set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT blender)
@@ -131,8 +131,8 @@ if(MSVC_CLANG) # Clangs version of cl doesn't support all flags
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARN_FLAGS} /nologo /J /Gd /EHsc -Wno-unused-command-line-argument -Wno-microsoft-enum-forward-reference ")
 	set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd -Wno-unused-command-line-argument -Wno-microsoft-enum-forward-reference")
 else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /nologo /J /Gd /MP /EHsc /bigobj")
-  set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd /MP /bigobj")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /nologo /J /Gd /MP /EHsc")
+	set(CMAKE_C_FLAGS     "${CMAKE_C_FLAGS} /nologo /J /Gd /MP")
 endif()
 
 set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
@@ -144,11 +144,6 @@ set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MT")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT")
 
-#JMC is available on msvc 15.8 (1915) and up
-if(MSVC_VERSION GREATER 1914 AND NOT MSVC_CLANG)
-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /JMC")
-endif()
-
 set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO ")
 set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib ")
 
@@ -171,7 +166,8 @@ if(NOT DEFINED LIBDIR)
 		message(STATUS "64 bit compiler detected.")
 		set(LIBDIR_BASE "win64")
 	else()
-    message(FATAL_ERROR "32 bit compiler detected, blender no longer provides pre-build libraries for 32 bit windows, please set the LIBDIR cmake variable to your own library folder")
+		message(STATUS "32 bit compiler detected.")
+		set(LIBDIR_BASE "windows")
 	endif()
 	# Can be 1910..1912
 	if(MSVC_VERSION GREATER 1919)
@@ -194,12 +190,6 @@ if(NOT EXISTS "${LIBDIR}/")
 	message(FATAL_ERROR "Windows requires pre-compiled libs at: '${LIBDIR}'")
 endif()
 
-# Mark libdir as system headers with a lower warn level, to resolve some warnings
-# that we have very little control over
-if(MSVC_VERSION GREATER_EQUAL 1914 AND NOT MSVC_CLANG)
-  add_compile_options(/experimental:external /external:templates- /external:I "${LIBDIR}" /external:W0)
-endif()
-
 # Add each of our libraries to our cmake_prefix_path so find_package() could work
 file(GLOB children RELATIVE ${LIBDIR} ${LIBDIR}/*)
 foreach(child ${children})
@@ -347,16 +337,16 @@ if(WITH_PYTHON)
 	set(PYTHON_VERSION 3.7) # CACHE STRING)
 
 	string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
-  set(PYTHON_LIBRARY ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/libs/python${_PYTHON_VERSION_NO_DOTS}.lib)
-  set(PYTHON_LIBRARY_DEBUG ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/libs/python${_PYTHON_VERSION_NO_DOTS}_d.lib)
-
-  set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/include)
-  set(PYTHON_NUMPY_INCLUDE_DIRS ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/lib/site-packages/numpy/core/include)
-  set(NUMPY_FOUND On)
+	# Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
+	set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
 	unset(_PYTHON_VERSION_NO_DOTS)
+
+	# Shared includes for both vc2008 and vc2010
+	set(PYTHON_INCLUDE_DIR ${LIBDIR}/python/include/python${PYTHON_VERSION})
+
 	# uncached vars
 	set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")
-  set(PYTHON_LIBRARIES debug "${PYTHON_LIBRARY_DEBUG}" optimized "${PYTHON_LIBRARY}" )
+	set(PYTHON_LIBRARIES  "${PYTHON_LIBRARY}")
 endif()
 
 if(WITH_BOOST)
@@ -383,6 +373,9 @@ if(WITH_BOOST)
 		if(CMAKE_CL_64)
 			set(BOOST_POSTFIX "vc140-mt-s-x64-1_68.lib")
 			set(BOOST_DEBUG_POSTFIX "vc140-mt-sgd-x64-1_68.lib")
+		else()
+			set(BOOST_POSTFIX "vc140-mt-s-x32-1_68.lib")
+			set(BOOST_DEBUG_POSTFIX "vc140-mt-sgd-x32-1_68.lib")
 		endif()
 		set(BOOST_LIBRARIES
 			optimized ${BOOST_LIBPATH}/libboost_date_time-${BOOST_POSTFIX}
@@ -418,7 +411,7 @@ endif()
 
 if(WITH_OPENIMAGEIO)
 	windows_find_package(OpenImageIO)
-  set(OPENIMAGEIO ${LIBDIR}/OpenImageIO)
+	set(OPENIMAGEIO ${LIBDIR}/openimageio)
 	set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
 	set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
 	set(OIIO_OPTIMIZED optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO.lib optimized ${OPENIMAGEIO_LIBPATH}/OpenImageIO_Util.lib)
@@ -434,7 +427,6 @@ endif()
 
 if(WITH_LLVM)
 	set(LLVM_ROOT_DIR ${LIBDIR}/llvm CACHE PATH	"Path to the LLVM installation")
-  set(LLVM_INCLUDE_DIRS ${LLVM_ROOT_DIR}/$<$<CONFIG:Debug>:Debug>/include CACHE PATH  "Path to the LLVM include directory")
 	file(GLOB LLVM_LIBRARY_OPTIMIZED ${LLVM_ROOT_DIR}/lib/*.lib)
 
 	if(EXISTS ${LLVM_ROOT_DIR}/debug/lib)
@@ -459,14 +451,14 @@ if(WITH_LLVM)
 endif()
 
 if(WITH_OPENCOLORIO)
-  set(OPENCOLORIO ${LIBDIR}/OpenColorIO)
+	set(OPENCOLORIO ${LIBDIR}/opencolorio)
 	set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
-  set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
+	set(OPENCOLORIO_LIBPATH ${LIBDIR}/opencolorio/lib)
 	set(OPENCOLORIO_LIBRARIES
 		optimized ${OPENCOLORIO_LIBPATH}/OpenColorIO.lib
 		optimized ${OPENCOLORIO_LIBPATH}/tinyxml.lib
 		optimized ${OPENCOLORIO_LIBPATH}/libyaml-cpp.lib
-    debug ${OPENCOLORIO_LIBPATH}/OpencolorIO_d.lib
+		debug ${OPENCOLORIO_LIBPATH}/OpenColorIO_d.lib
 		debug ${OPENCOLORIO_LIBPATH}/tinyxml_d.lib
 		debug ${OPENCOLORIO_LIBPATH}/libyaml-cpp_d.lib
 	)
@@ -477,32 +469,19 @@ if(WITH_OPENVDB)
 	set(BLOSC_LIBRARIES optimized ${LIBDIR}/blosc/lib/libblosc.lib debug ${LIBDIR}/blosc/lib/libblosc_d.lib)
 	set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib)
 	set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
-  set(OPENVDB ${LIBDIR}/openVDB)
-  set(OPENVDB_LIBPATH ${OPENVDB}/lib)
+	set(OPENVDB ${LIBDIR}/openvdb)
+	set(OPENVDB_LIBPATH ${LIBDIR}/openvdb/lib)
 	set(OPENVDB_INCLUDE_DIRS ${OPENVDB}/include ${TBB_INCLUDE_DIR})
 	set(OPENVDB_LIBRARIES optimized ${OPENVDB_LIBPATH}/openvdb.lib debug ${OPENVDB_LIBPATH}/openvdb_d.lib ${TBB_LIBRARIES} ${BLOSC_LIBRARIES})
 	set(OPENVDB_DEFINITIONS -DNOMINMAX)
 endif()
 
-if(WITH_OPENIMAGEDENOISE)
-  set(TBB_LIBRARIES optimized ${LIBDIR}/tbb/lib/tbb.lib debug ${LIBDIR}/tbb/lib/tbb_debug.lib)
-  set(TBB_INCLUDE_DIR ${LIBDIR}/tbb/include)
-  set(OPENIMAGEDENOISE ${LIBDIR}/OpenImageDenoise)
-  set(OPENIMAGEDENOISE_LIBPATH ${LIBDIR}/OpenImageDenoise/lib)
-  set(OPENIMAGEDENOISE_INCLUDE_DIRS ${OPENIMAGEDENOISE}/include ${TBB_INCLUDE_DIR})
-  set(OPENIMAGEDENOISE_LIBRARIES
-    optimized ${OPENIMAGEDENOISE_LIBPATH}/OpenImageDenoise.lib ${OPENIMAGEDENOISE_LIBPATH}/common.lib ${OPENIMAGEDENOISE_LIBPATH}/mkldnn.lib
-    debug ${OPENIMAGEDENOISE_LIBPATH}/OpenImageDenoise_d.lib ${OPENIMAGEDENOISE_LIBPATH}/common_d.lib ${OPENIMAGEDENOISE_LIBPATH}/mkldnn_d.lib
-    ${TBB_LIBRARIES})
-  set(OPENIMAGEDENOISE_DEFINITIONS)
-endif()
-
 if(WITH_ALEMBIC)
 	set(ALEMBIC ${LIBDIR}/alembic)
 	set(ALEMBIC_INCLUDE_DIR ${ALEMBIC}/include)
 	set(ALEMBIC_INCLUDE_DIRS ${ALEMBIC_INCLUDE_DIR})
 	set(ALEMBIC_LIBPATH ${ALEMBIC}/lib)
-  set(ALEMBIC_LIBRARIES optimized ${ALEMBIC}/lib/Alembic.lib debug ${ALEMBIC}/lib/Alembic_d.lib)
+	set(ALEMBIC_LIBRARIES optimized ${ALEMBIC}/lib/alembic.lib debug ${ALEMBIC}/lib/alembic_d.lib)
 	set(ALEMBIC_FOUND 1)
 endif()
 
@@ -655,7 +634,7 @@ if(WITH_CYCLES_EMBREE)
 	endif()
 endif()
 
-if(WINDOWS_PYTHON_DEBUG)
+if (WINDOWS_PYTHON_DEBUG)
 	# Include the system scripts in the blender_python_system_scripts project.
 	FILE(GLOB_RECURSE inFiles "${CMAKE_SOURCE_DIR}/release/scripts/*.*" )
 	ADD_CUSTOM_TARGET(blender_python_system_scripts SOURCES ${inFiles})

build_files/package_spec/build_debian.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # Builds a debian package from SVN source.
 #
-# For parallel builds use:
+# For paralelle builds use:
 #  DEB_BUILD_OPTIONS="parallel=5" sh build_files/package_spec/build_debian.sh
 
 # this needs to run in the root dir.

build_files/windows/check_libraries.cmd

@@ -2,7 +2,11 @@ if "%BUILD_VS_YEAR%"=="2015" set BUILD_VS_LIBDIRPOST=vc14
 if "%BUILD_VS_YEAR%"=="2017" set BUILD_VS_LIBDIRPOST=vc14
 if "%BUILD_VS_YEAR%"=="2019" set BUILD_VS_LIBDIRPOST=vc14
 
-set BUILD_VS_SVNDIR=win64_%BUILD_VS_LIBDIRPOST%
+if "%BUILD_ARCH%"=="x64" (
+	set BUILD_VS_SVNDIR=win64_%BUILD_VS_LIBDIRPOST%
+) else if "%BUILD_ARCH%"=="x86" (
+	set BUILD_VS_SVNDIR=windows_%BUILD_VS_LIBDIRPOST%
+)
 set BUILD_VS_LIBDIR="%BLENDER_DIR%..\lib\%BUILD_VS_SVNDIR%"
 
 if NOT "%verbose%" == "" (

build_files/windows/configure_msbuild.cmd

@@ -1,6 +1,14 @@
 set BUILD_GENERATOR_POST=
 set BUILD_PLATFORM_SELECT=
-set MSBUILD_PLATFORM=x64
+if "%BUILD_ARCH%"=="x64" (
+	set MSBUILD_PLATFORM=x64
+) else if "%BUILD_ARCH%"=="x86" (
+	set MSBUILD_PLATFORM=win32
+	if "%WITH_CLANG%"=="1" (
+		echo Clang not supported for X86
+		exit /b 1
+	)
+)
 
 if "%WITH_CLANG%"=="1" (
 	set CLANG_CMAKE_ARGS=-T"llvm"

build_files/windows/detect_architecture.cmd

@@ -6,13 +6,11 @@ if "%BUILD_ARCH%"=="" (
 		set WINDOWS_ARCH= Win64
 		set BUILD_ARCH=x64
 	) else (
-		echo Error: 32 bit builds of blender are no longer supported.
-		goto ERR
+		set WINDOWS_ARCH=
+		set BUILD_ARCH=x86
 	)
 ) else if "%BUILD_ARCH%"=="x64" (
 	set WINDOWS_ARCH= Win64
+) else if "%BUILD_ARCH%"=="x86" (
+	set WINDOWS_ARCH=
 )
-:EOF
-exit /b 0
-:ERR 
-exit /b 1

build_files/windows/format.cmd

@@ -1,30 +0,0 @@
-if EXIST %BLENDER_DIR%\..\lib\win64_vc14\llvm\bin\clang-format.exe (
-    set CF_PATH=..\lib\win64_vc14\llvm\bin
-    goto detect_done
-)
-
-echo clang-format not found
-exit /b 1
-
-:detect_done
-echo found clang-format in %CF_PATH%
-
-if EXIST %BLENDER_DIR%\..\lib\win64_vc14\python\37\bin\python.exe (
-    set PYTHON=%BLENDER_DIR%\..\lib\win64_vc14\python\37\bin\python.exe
-    goto detect_python_done
-)
-
-echo python not found in lib folder
-exit /b 1
-
-:detect_python_done
-echo found python (%PYTHON%)
-
-set FORMAT_PATHS=%BLENDER_DIR%\source\tools\utils_maintenance\clang_format_paths.py
-
-REM The formatting script expects clang-format to be in the current PATH.
-set PATH=%CF_PATH%;%PATH%
-
-%PYTHON% %FORMAT_PATHS% %FORMAT_ARGS%
-
-:EOF

build_files/windows/parse_arguments.cmd

@@ -16,9 +16,7 @@ if NOT "%1" == "" (
 		set BUILD_DIR_OVERRRIDE="%BLENDER_DIR%..\%2"
 		shift /1
 	) else if "%1" == "with_tests" (
-		set TESTS_CMAKE_ARGS=%TESTS_CMAKE_ARGS% -DWITH_GTESTS=On
-	) else if "%1" == "with_opengl_tests" (
-		set TESTS_CMAKE_ARGS=%TESTS_CMAKE_ARGS% -DWITH_OPENGL_DRAW_TESTS=On -DWITH_OPENGL_RENDER_TESTS=On
+		set TESTS_CMAKE_ARGS=-DWITH_GTESTS=On
 	) else if "%1" == "full" (
 		set TARGET=Full
 		set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% ^
@@ -41,13 +39,10 @@ if NOT "%1" == "" (
 	) else if "%1" == "release" (
 		set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -C"%BLENDER_DIR%\build_files\cmake\config\blender_release.cmake"
 		set TARGET=Release
-	) else if "%1" == "developer" (
-		set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -C"%BLENDER_DIR%\build_files\cmake\config\blender_developer.cmake"
 	) else if "%1" == "asan" (
 		set WITH_ASAN=1
 	) else if "%1" == "x86" (
-		echo Error: 32 bit builds of blender are no longer supported.
-		goto ERR
+		set BUILD_ARCH=x86
 	) else if "%1" == "x64" (
 		set BUILD_ARCH=x64
 	) else if "%1" == "2017" (
@@ -73,8 +68,6 @@ if NOT "%1" == "" (
 		shift /1
 	) else if "%1" == "nobuild" (
 		set NOBUILD=1
-	) else if "%1" == "nobuildinfo" (
-		set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -DWITH_BUILDINFO=Off
 	) else if "%1" == "pydebug" (
 		set WITH_PYDEBUG=1
 	) else if "%1" == "showhash" (
@@ -82,30 +75,18 @@ if NOT "%1" == "" (
 	REM Non-Build Commands
 	) else if "%1" == "update" (
 		SET BUILD_UPDATE=1
-		set BUILD_UPDATE_SVN=1
-		set BUILD_UPDATE_GIT=1
-	) else if "%1" == "code_update" (
-		SET BUILD_UPDATE=1
-		set BUILD_UPDATE_SVN=0
-		set BUILD_UPDATE_GIT=1
 	) else if "%1" == "ninja" (
 		SET BUILD_WITH_NINJA=1
 	) else if "%1" == "clean" (
 		set MUST_CLEAN=1
 	) else if "%1" == "verbose" (
 		set VERBOSE=1
-	) else if "%1" == "format" (
-		set FORMAT=1
-		set FORMAT_ARGS=%2 %3 %4 %5 %6 %7 %8 %9
-		goto EOF
 	) else (
 		echo Command "%1" unknown, aborting!
-		goto ERR
+		exit /b 1
 	)
 	shift /1
 	goto argv_loop
 )
 :EOF
 exit /b 0
-:ERR
-exit /b 1

build_files/windows/reset_variables.cmd

@@ -7,6 +7,7 @@ set BUILD_VS_YEAR=
 set BUILD_VS_LIBDIRPOST=
 set BUILD_VS_LIBDIR=
 set BUILD_VS_SVNDIR=
+set BUILD_NGE=
 set KEY_NAME=
 set MSBUILD_PLATFORM=
 set MUST_CLEAN=
@@ -17,8 +18,6 @@ set WINDOWS_ARCH=
 set TESTS_CMAKE_ARGS=
 set VSWHERE_ARGS=
 set BUILD_UPDATE=
-set BUILD_UPDATE_GIT=
-set BUILD_UPDATE_SVN=
 set BUILD_SHOW_HASHES=
 set SHOW_HELP=
 set BUILD_WITH_NINJA=
@@ -28,4 +27,3 @@ set CLANG_CMAKE_ARGS=
 set ASAN_CMAKE_ARGS=
 set WITH_PYDEBUG=
 set PYDEBUG_CMAKE_ARGS=
-set FORMAT=

build_files/windows/set_build_dir.cmd

@@ -1,9 +1,4 @@
-if NOT "%TARGET%" == "" (
-    set BUILD_DIR=%BUILD_DIR%_%TARGET%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
-) else (
-    set BUILD_DIR=%BUILD_DIR%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
-)
-
+set BUILD_DIR=%BUILD_DIR%_%TARGET%%BUILD_NGE%_%BUILD_ARCH%_vc%BUILD_VS_VER%_%BUILD_TYPE%
 if NOT "%BUILD_DIR_OVERRRIDE%"=="" (
 	set BUILD_DIR=%BUILD_DIR_OVERRRIDE%
 )

build_files/windows/show_help.cmd

@@ -9,27 +9,25 @@ echo - bpy
 echo.
 echo Utilities ^(not associated with building^)
 echo - clean ^(Target must be set^)
-echo - update ^(Update both SVN and GIT^)
-echo - code_update ^(Update only GIT^)
+echo - update
 echo - nobuild ^(only generate project files^)
 echo - showhash ^(Show git hashes of source tree^)
-echo - format [path] ^(Format the source using clang-format, path is optional, requires python 3.x to be available^)
 echo.
 echo Configuration options
 echo - verbose ^(enable diagnostic output during configuration^)
-echo - developer ^(enable faster builds, error checking and tests, recommended for developers^)
 echo - with_tests ^(enable building unit tests^)
-echo - nobuildinfo ^(disable buildinfo^)
+echo - noge ^(disable building game engine and player^)
 echo - debug ^(Build an unoptimized debuggable build^)
 echo - packagename [newname] ^(override default cpack package name^)
 echo - buildir [newdir] ^(override default build folder^)
+echo - x86 ^(override host auto-detect and build 32 bit code^)
+echo - x64 ^(override host auto-detect and build 64 bit code^)
 echo - 2017 ^(build with visual studio 2017^)
 echo - 2017pre ^(build with visual studio 2017 pre-release^)
 echo - 2017b ^(build with visual studio 2017 Build Tools^)
 
 echo.
 echo Experimental options
-echo - with_opengl_tests ^(enable both the render and draw opengl test suites^)
 echo - 2015 ^(build with visual studio 2015^)
 echo - clang ^(enable building with clang^)
 echo - asan ^(enable asan when building with clang^)

build_files/windows/update_sources.cmd

@@ -1,18 +1,16 @@
-if "%BUILD_UPDATE_SVN%" == "1" (
-	if "%SVN%" == "" (
+if "%SVN%" == "" (
 	echo svn not found, cannot update libraries
 	goto UPDATE_GIT
-	)
-	"%SVN%" up "%BLENDER_DIR%/../lib/*"
 )
+"%SVN%" up "%BLENDER_DIR%/../lib/*"
+
 :UPDATE_GIT
 
-if "%BUILD_UPDATE_GIT%" == "1" (
-	if "%GIT%" == "" (
+if "%GIT%" == "" (
 	echo Git not found, cannot update code
 	goto EOF
-	)
-	"%GIT%" pull --rebase
-	"%GIT%" submodule foreach git pull --rebase origin master
 )
+"%GIT%" pull --rebase
+"%GIT%" submodule foreach git pull --rebase origin master
+
 :EOF

doc/blender_file_format/BlendFileDnaExporter_25.py

@@ -57,6 +57,7 @@
 
 import struct
 import sys
+import getopt                   # command line arguments handling
 from string import Template     # strings completion
 
 

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.81"
+PROJECT_NUMBER         = "V2.79"
 
 # 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

doc/doxygen/doxygen.intern.h

@@ -71,7 +71,7 @@
  *  \ingroup audaspace
  */
 /** \defgroup audsrc Audaspace SRC
- *
+
  *  \ingroup audaspace
  */
 /** \defgroup audffmpeg Audaspace FFMpeg
@@ -91,3 +91,4 @@
  * \ingroup intern GUI
  * \ref GHOSTPage
  */
+

doc/guides/interface_API.txt

@@ -177,7 +177,7 @@ font:
 With the new truetype option in Blender, this is used for all font families
 
 When a uiBlock is created, each uiButton that is defined gets the uiBlock properties.
-Changing Block properties in between will effect uiButtons defined thereafter.
+Changing Block properties in between will affact uiButtons defined thereafter.
 
 
 

doc/python_api/examples/blf.py

@@ -6,6 +6,7 @@ Example of using the blf module. For this module to work we
 need to use the OpenGL wrapper :class:`~bgl` as well.
 """
 # import stand alone modules
+import bgl
 import blf
 import bpy
 

doc/python_api/examples/bmesh.ops.1.py

@@ -99,9 +99,10 @@ bm.free()
 
 
 # Add the mesh to the scene
+scene = bpy.context.scene
 obj = bpy.data.objects.new("Object", me)
-bpy.context.collection.objects.link(obj)
+scene.objects.link(obj)
 
 # Select and make active
-bpy.context.view_layer.objects.active = obj
-obj.select_set(True)
+scene.objects.active = obj
+obj.select = True

doc/python_api/examples/bpy.data.py

@@ -19,6 +19,9 @@ if "Cube" in bpy.data.meshes:
 
 # write images into a file next to the blend
 import os
-with open(os.path.splitext(bpy.data.filepath)[0] + ".txt", 'w') as fs:
-    for image in bpy.data.images:
-        fs.write("%s %d x %d\n" % (image.filepath, image.size[0], image.size[1]))
+file = open(os.path.splitext(bpy.data.filepath)[0] + ".txt", 'w')
+
+for image in bpy.data.images:
+    file.write("%s %d x %d\n" % (image.filepath, image.size[0], image.size[1]))
+
+file.close()

doc/python_api/examples/bpy.ops.1.py

@@ -20,5 +20,5 @@ you would pass ``{'active_object': object}``.
 # remove all objects in scene rather than the selected ones
 import bpy
 override = bpy.context.copy()
-override['selected_objects'] = list(bpy.context.scene.objects)
+override['selected_bases'] = list(bpy.context.scene.object_bases)
 bpy.ops.object.delete(override)

doc/python_api/examples/bpy.props.1.py

@@ -15,15 +15,13 @@ class OBJECT_OT_property_example(bpy.types.Operator):
     bl_label = "Property Example"
     bl_options = {'REGISTER', 'UNDO'}
 
-    my_float: bpy.props.FloatProperty(name="Some Floating Point")
-    my_bool: bpy.props.BoolProperty(name="Toggle Option")
-    my_string: bpy.props.StringProperty(name="String Value")
+    my_float = bpy.props.FloatProperty(name="Some Floating Point")
+    my_bool = bpy.props.BoolProperty(name="Toggle Option")
+    my_string = bpy.props.StringProperty(name="String Value")
 
     def execute(self, context):
-        self.report(
-            {'INFO'}, 'F: %.2f  B: %s  S: %r' %
-            (self.my_float, self.my_bool, self.my_string)
-        )
+        self.report({'INFO'}, 'F: %.2f  B: %s  S: %r' %
+                    (self.my_float, self.my_bool, self.my_string))
         print('My float:', self.my_float)
         print('My bool:', self.my_bool)
         print('My string:', self.my_string)
@@ -34,8 +32,8 @@ class OBJECT_PT_property_example(bpy.types.Panel):
     bl_idname = "object_PT_property_example"
     bl_label = "Property Example"
     bl_space_type = 'VIEW_3D'
-    bl_region_type = 'UI'
-    bl_category = "Tool"
+    bl_region_type = 'TOOLS'
+    bl_category = "Tools"
 
     def draw(self, context):
         # You can set the property values that should be used when the user
@@ -55,8 +53,5 @@ bpy.utils.register_class(OBJECT_OT_property_example)
 bpy.utils.register_class(OBJECT_PT_property_example)
 
 # Demo call. Be sure to also test in the 3D Viewport.
-bpy.ops.object.property_example(
-    my_float=47,
-    my_bool=True,
-    my_string="Shouldn't that be 327?",
-)
+bpy.ops.object.property_example(my_float=47, my_bool=True,
+                                my_string="Shouldn't that be 327?")

doc/python_api/examples/bpy.props.2.py

@@ -10,14 +10,15 @@ import bpy
 
 
 class MaterialSettings(bpy.types.PropertyGroup):
-    my_int: bpy.props.IntProperty()
-    my_float: bpy.props.FloatProperty()
-    my_string: bpy.props.StringProperty()
+    my_int = bpy.props.IntProperty()
+    my_float = bpy.props.FloatProperty()
+    my_string = bpy.props.StringProperty()
 
 
 bpy.utils.register_class(MaterialSettings)
 
-bpy.types.Material.my_settings = bpy.props.PointerProperty(type=MaterialSettings)
+bpy.types.Material.my_settings = \
+    bpy.props.PointerProperty(type=MaterialSettings)
 
 # test the new settings work
 material = bpy.data.materials[0]

doc/python_api/examples/bpy.props.3.py

@@ -9,17 +9,18 @@ Custom properties can be added to any subclass of an :class:`ID`,
 import bpy
 
 
-# Assign a collection.
+# Assign a collection
 class SceneSettingItem(bpy.types.PropertyGroup):
-    name: bpy.props.StringProperty(name="Test Property", default="Unknown")
-    value: bpy.props.IntProperty(name="Test Property", default=22)
+    name = bpy.props.StringProperty(name="Test Prop", default="Unknown")
+    value = bpy.props.IntProperty(name="Test Prop", default=22)
 
 
 bpy.utils.register_class(SceneSettingItem)
 
-bpy.types.Scene.my_settings = bpy.props.CollectionProperty(type=SceneSettingItem)
+bpy.types.Scene.my_settings = \
+    bpy.props.CollectionProperty(type=SceneSettingItem)
 
-# Assume an armature object selected.
+# Assume an armature object selected
 print("Adding 2 values!")
 
 my_item = bpy.context.scene.my_settings.add()

doc/python_api/examples/bpy.props.py

@@ -12,7 +12,7 @@ like Blender's existing properties.
 import bpy
 
 # Assign a custom property to an existing type.
-bpy.types.Material.custom_float = bpy.props.FloatProperty(name="Test Property")
+bpy.types.Material.custom_float = bpy.props.FloatProperty(name="Test Prob")
 
 # Test the property is there.
 bpy.data.materials[0].custom_float = 5.0

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

@@ -22,15 +22,15 @@ class ExampleAddonPreferences(AddonPreferences):
     # when defining this in a submodule of a python package.
     bl_idname = __name__
 
-    filepath: StringProperty(
+    filepath = StringProperty(
         name="Example File Path",
         subtype='FILE_PATH',
     )
-    number: IntProperty(
+    number = IntProperty(
         name="Example Number",
         default=4,
     )
-    boolean: BoolProperty(
+    boolean = BoolProperty(
         name="Example Boolean",
         default=False,
     )

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

@@ -1,60 +0,0 @@
-"""
-Dependency graph: Evaluated ID example
-++++++++++++++++++++++++++++++++++++++
-
-This example demonstrates access to the evaluated ID (such as object, material, etc.) state from
-an original ID.
-This is needed every time one needs to access state with animation, constraints, and modifiers
-taken into account.
-"""
-import bpy
-
-
-class OBJECT_OT_evaluated_example(bpy.types.Operator):
-    """Access evaluated object state and do something with it"""
-    bl_label = "DEG Access Evaluated Object"
-    bl_idname = "object.evaluated_example"
-
-    def execute(self, context):
-        # This is an original object. Its data does not have any modifiers applied.
-        obj = context.object
-        if obj is None or obj.type != 'MESH':
-            self.report({'INFO'}, "No active mesh object to get info from")
-            return {'CANCELLED'}
-        # Evaluated object exists within a specific dependency graph.
-        # We will request evaluated object from the dependency graph which corresponds to the
-        # current scene and view layer.
-        #
-        # NOTE: This call ensure the dependency graph is fully evaluated. This might be expensive
-        # if changes were made made to the scene, but is needed to ensure no dangling or incorrect
-        # pointers are exposed.
-        depsgraph = context.evaluated_depsgraph_get()
-        # Actually request evaluated object.
-        #
-        # This object has animation and drivers applied on it, together with constraints and
-        # modifiers.
-        #
-        # For mesh objects the object.data will be a mesh with all modifiers applied.
-        # This means that in access to vertices or faces after modifier stack happens via fields of 
-        # object_eval.object.
-        #
-        # For other types of objects the object_eval.data does not have modifiers applied on it,
-        # but has animation applied.
-        #
-        # NOTE: All ID types have `evaluated_get()`, including materials, node trees, worlds.
-        object_eval = obj.evaluated_get(depsgraph)
-        mesh_eval = object_eval.data
-        self.report({'INFO'}, f"Number of evaluated vertices: {len(mesh_eval.vertices)}")
-        return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_class(OBJECT_OT_evaluated_example)
-
-
-def unregister():
-    bpy.utils.unregister_class(OBJECT_OT_evaluated_example)
-
-
-if __name__ == "__main__":
-    register()

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

@@ -1,45 +0,0 @@
-"""
-Dependency graph: Original object example
-+++++++++++++++++++++++++++++++++++++++++
-
-This example demonstrates access to the original ID.
-Such access is needed to check whether object is selected, or to compare pointers.
-"""
-import bpy
-
-
-class OBJECT_OT_original_example(bpy.types.Operator):
-    """Access original object and do something with it"""
-    bl_label = "DEG Access Original Object"
-    bl_idname = "object.original_example"
-
-    def check_object_selected(self, object_eval):
-        # Selection depends on a context and is only valid for original objects. This means we need
-        # to request the original object from the known evaluated one.
-        #
-        # NOTE: All ID types have an `original` field.
-        obj = object_eval.original
-        return obj.select_get()
-
-    def execute(self, context):
-        # NOTE: It seems redundant to iterate over original objects to request evaluated ones
-        # just to get original back. But we want to keep example as short as possible, but in real
-        # world there are cases when evaluated object is coming from a more meaningful source.
-        depsgraph = context.evaluated_depsgraph_get()
-        for obj in context.editable_objects:
-            object_eval = obj.evaluated_get(depsgraph)
-            if self.check_object_selected(object_eval):
-                self.report({'INFO'}, f"Object is selected: {object_eval.name}")
-        return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_class(OBJECT_OT_original_example)
-
-
-def unregister():
-    bpy.utils.unregister_class(OBJECT_OT_original_example)
-
-
-if __name__ == "__main__":
-    register()

doc/python_api/examples/bpy.types.Depsgraph.3.py

@@ -1,42 +0,0 @@
-"""
-Dependency graph: Iterate over all object instances
-+++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Sometimes it is needed to know all the instances with their matrices (for example, when writing an
-exporter or a custom render engine).
-This example shows how to access all objects and instances in the scene.
-"""
-import bpy
-
-
-class OBJECT_OT_object_instances(bpy.types.Operator):
-    """Access original object and do something with it"""
-    bl_label = "DEG Iterate Object Instances"
-    bl_idname = "object.object_instances"
-
-    def execute(self, context):
-        depsgraph = context.evaluated_depsgraph_get()
-        for object_instance in depsgraph.object_instances:
-            # This is an object which is being instanced.
-            obj = object_instance.object
-            # `is_instance` denotes whether the object is coming from instances (as an opposite of
-            # being an emitting object. )
-            if not object_instance.is_instance:
-                print(f"Object {obj.name} at {object_instance.matrix_world}")
-            else:
-                # Instanced will additionally have fields like uv, random_id and others which are
-                # specific for instances. See Python API for DepsgraphObjectInstance for details,
-                print(f"Instance of {obj.name} at {object_instance.matrix_world}")
-        return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_class(OBJECT_OT_object_instances)
-
-
-def unregister():
-    bpy.utils.unregister_class(OBJECT_OT_object_instances)
-
-
-if __name__ == "__main__":
-    register()

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

@@ -1,69 +0,0 @@
-"""
-Dependency graph: Object.to_mesh()
-+++++++++++++++++++++++++++++++++++
-
-Function to get a mesh from any object with geometry. It is typically used by exporters, render
-engines and tools that need to access the evaluated mesh as displayed in the viewport.
-
-Object.to_mesh() is closely interacting with dependency graph: its behavior depends on whether it
-is used on original or evaluated object.
-
-When is used on original object, the result mesh is calculated from the object without taking
-animation or modifiers into account:
-
-- For meshes this is similar to duplicating the source mesh.
-- For curves this disables own modifiers, and modifiers of objects used as bevel and taper.
-- For metaballs this produces an empty mesh since polygonization is done as a modifier evaluation.
-
-When is used on evaluated object all modifiers are taken into account.
-
-.. note:: The result mesh is owned by the object. It can be freed by calling `object.to_mesh_clear()`.
-.. note::
-   The result mesh must be treated as temporary, and can not be referenced from objects in the main
-   database. If the mesh intended to be used in a persistent manner use bpy.data.meshes.new_from_object()
-   instead.
-.. note:: If object does not have geometry (i.e. camera) the functions returns None.
-"""
-import bpy
-
-
-class OBJECT_OT_object_to_mesh(bpy.types.Operator):
-    """Convert selected object to mesh and show number of vertices"""
-    bl_label = "DEG Object to Mesh"
-    bl_idname = "object.object_to_mesh"
-
-    def execute(self, context):
-        # Access input original object.
-        obj = context.object
-        if obj is None:
-            self.report({'INFO'}, "No active mesh object to convert to mesh")
-            return {'CANCELLED'}
-        # Avoid annoying None checks later on.
-        if obj.type not in {'MESH', 'CURVE', 'SURFACE', 'FONT', 'META'}:
-            self.report({'INFO'}, "Object can not be converted to mesh")
-            return {'CANCELLED'}
-        depsgraph = context.evaluated_depsgraph_get()
-        # Invoke to_mesh() for original object.
-        mesh_from_orig = obj.to_mesh()
-        self.report({'INFO'}, f"{len(mesh_from_orig.vertices)} in new mesh without modifiers.")
-        # Remove temporary mesh.
-        obj.to_mesh_clear()
-        # Invoke to_mesh() for evaluated object.
-        object_eval = obj.evaluated_get(depsgraph)
-        mesh_from_eval = object_eval.to_mesh()
-        self.report({'INFO'}, f"{len(mesh_from_eval.vertices)} in new mesh with modifiers.")
-        # Remove temporary mesh.
-        object_eval.to_mesh_clear()
-        return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_class(OBJECT_OT_object_to_mesh)
-
-
-def unregister():
-    bpy.utils.unregister_class(OBJECT_OT_object_to_mesh)
-
-
-if __name__ == "__main__":
-    register()

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

@@ -1,57 +0,0 @@
-"""
-Dependency graph: bpy.data.meshes.new_from_object()
-+++++++++++++++++++++++++++++++++++++++++++++++++++
-
-Function to copy a new mesh from any object with geometry. The mesh is added to the main
-database and can be referenced by objects. Typically used by tools that create new objects
-or apply modifiers.
-
-When is used on original object, the result mesh is calculated from the object without taking
-animation or modifiers into account:
-
-- For meshes this is similar to duplicating the source mesh.
-- For curves this disables own modifiers, and modifiers of objects used as bevel and taper.
-- For metaballs this produces an empty mesh since polygonization is done as a modifier evaluation.
-
-When is used on evaluated object all modifiers are taken into account.
-
-All the references (such as materials) are re-mapped to original. This ensures validity and
-consistency of the main database.
-
-.. note:: If object does not have geometry (i.e. camera) the functions returns None.
-"""
-import bpy
-
-
-class OBJECT_OT_mesh_from_object(bpy.types.Operator):
-    """Convert selected object to mesh and show number of vertices"""
-    bl_label = "DEG Mesh From Object"
-    bl_idname = "object.mesh_from_object"
-
-    def execute(self, context):
-        # Access input original object.
-        obj = context.object
-        if obj is None:
-            self.report({'INFO'}, "No active mesh object to convert to mesh")
-            return {'CANCELLED'}
-        # Avoid annoying None checks later on.
-        if obj.type not in {'MESH', 'CURVE', 'SURFACE', 'FONT', 'META'}:
-            self.report({'INFO'}, "Object can not be converted to mesh")
-            return {'CANCELLED'}
-        depsgraph = context.evaluated_depsgraph_get()
-        object_eval = obj.evaluated_get(depsgraph)
-        mesh_from_eval = bpy.data.meshes.new_from_object(object_eval)
-        self.report({'INFO'}, f"{len(mesh_from_eval.vertices)} in new mesh, and is ready for use!")
-        return {'FINISHED'}
-
-
-def register():
-    bpy.utils.register_class(OBJECT_OT_mesh_from_object)
-
-
-def unregister():
-    bpy.utils.unregister_class(OBJECT_OT_mesh_from_object)
-
-
-if __name__ == "__main__":
-    register()

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

@@ -1,61 +0,0 @@
-"""
-Dependency graph: Simple exporter
-+++++++++++++++++++++++++++++++++
-
-This example is a combination of all previous ones, and shows how to write a simple exporter
-script.
-"""
-import bpy
-
-
-class OBJECT_OT_simple_exporter(bpy.types.Operator):
-    """Simple (fake) exporter of selected objects"""
-    bl_label = "DEG Export Selected"
-    bl_idname = "object.simple_exporter"
-
-    apply_modifiers: bpy.props.BoolProperty(name="Apply Modifiers")
-
-    def execute(self, context):
-        depsgraph = context.evaluated_depsgraph_get()
-        for object_instance in depsgraph.object_instances:
-            if not self.is_object_instance_from_selected(object_instance):
-                # We only export selected objects
-                continue
-            # NOTE: This will create a mesh for every instance, which is not ideal at all. In
-            # reality destination format will support some sort of instancing mechanism, so the
-            # code here will simply say "instance this object at object_instance.matrix_world".
-            mesh = self.create_mesh_for_object_instance(object_instance)
-            if mesh is None:
-                # Happens for non-geometry objects.
-                continue
-            print(f"Exporting mesh with {len(mesh.vertices)} vertices "
-                   f"at {object_instance.matrix_world}")
-            object_instace.to_mesh_clear()
-
-        return {'FINISHED'}
-
-    def is_object_instance_from_selected(self, object_instance):
-        # For instanced objects we check selection of their instancer (more accurately: check
-        # selection status of the original object corresponding to the instancer).
-        if object_instance.parent:
-            return object_instance.parent.original.select_get()
-        # For non-instanced objects we check selection state of the original object.
-        return object_instance.object.original.select_get()
-
-    def create_mesh_for_object_instance(self, object_instance):
-        if self.apply_modifiers:
-            return object_instance.object.to_mesh()
-        else:
-            return object_instance.object.original.to_mesh()
-
-
-def register():
-    bpy.utils.register_class(OBJECT_OT_simple_exporter)
-
-
-def unregister():
-    bpy.utils.unregister_class(OBJECT_OT_simple_exporter)
-
-
-if __name__ == "__main__":
-    register()

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

@@ -24,7 +24,7 @@ class SubMenu(bpy.types.Menu):
         layout.separator()
 
         # expand each operator option into this menu
-        layout.operator_enum("object.light_add", "type")
+        layout.operator_enum("object.lamp_add", "type")
 
         layout.separator()
 

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

@@ -20,7 +20,7 @@ class OBJECT_MT_display_presets(Menu):
     bl_label = "Object Display Presets"
     preset_subdir = "object/display"
     preset_operator = "script.execute_preset"
-    draw = Menu.draw_preset
+    display = Menu.display_preset
 
 
 class AddPresetObjectDisplay(AddPresetBase, Operator):
@@ -54,8 +54,8 @@ def panel_func(self, context):
 
     row = layout.row(align=True)
     row.menu(OBJECT_MT_display_presets.__name__, text=OBJECT_MT_display_presets.bl_label)
-    row.operator(AddPresetObjectDisplay.bl_idname, text="", icon='ZOOM_IN')
-    row.operator(AddPresetObjectDisplay.bl_idname, text="", icon='ZOOM_OUT').remove_active = True
+    row.operator(AddPresetObjectDisplay.bl_idname, text="", icon='ZOOMIN')
+    row.operator(AddPresetObjectDisplay.bl_idname, text="", icon='ZOOMOUT').remove_active = True
 
 
 classes = (

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

@@ -16,7 +16,6 @@ import bpy
 class CyclesNodeTree(bpy.types.NodeTree):
     """ This operator is only visible when Cycles is the selected render engine"""
     bl_label = "Cycles Node Tree"
-    bl_icon = 'NONE'
 
     @classmethod
     def poll(cls, context):

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

@@ -7,6 +7,7 @@ object, placing it into a view layer, selecting it and making it active.
 """
 
 import bpy
+from mathutils import Matrix
 
 view_layer = bpy.context.view_layer
 

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

@@ -28,8 +28,8 @@ class SimpleMouseOperator(bpy.types.Operator):
     bl_idname = "wm.mouse_position"
     bl_label = "Invoke Mouse Operator"
 
-    x: bpy.props.IntProperty()
-    y: bpy.props.IntProperty()
+    x = bpy.props.IntProperty()
+    y = bpy.props.IntProperty()
 
     def execute(self, context):
         # rather than printing, use the report function,

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

@@ -21,7 +21,7 @@ class ExportSomeData(bpy.types.Operator):
     bl_idname = "export.some_data"
     bl_label = "Export Some Data"
 
-    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
+    filepath = bpy.props.StringProperty(subtype="FILE_PATH")
 
     @classmethod
     def poll(cls, context):

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

@@ -11,15 +11,13 @@ class DialogOperator(bpy.types.Operator):
     bl_idname = "object.dialog_operator"
     bl_label = "Simple Dialog Operator"
 
-    my_float: bpy.props.FloatProperty(name="Some Floating Point")
-    my_bool: bpy.props.BoolProperty(name="Toggle Option")
-    my_string: bpy.props.StringProperty(name="String Value")
+    my_float = bpy.props.FloatProperty(name="Some Floating Point")
+    my_bool = bpy.props.BoolProperty(name="Toggle Option")
+    my_string = bpy.props.StringProperty(name="String Value")
 
     def execute(self, context):
-        message = (
-            "Popup Values: %f, %d, '%s'" %
+        message = "Popup Values: %f, %d, '%s'" % \
             (self.my_float, self.my_bool, self.my_string)
-        )
         self.report({'INFO'}, message)
         return {'FINISHED'}
 
@@ -30,5 +28,5 @@ class DialogOperator(bpy.types.Operator):
 
 bpy.utils.register_class(DialogOperator)
 
-# Test call.
+# test call
 bpy.ops.object.dialog_operator('INVOKE_DEFAULT')

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

@@ -16,11 +16,11 @@ class CustomDrawOperator(bpy.types.Operator):
     bl_idname = "object.custom_draw"
     bl_label = "Simple Modal Operator"
 
-    filepath: bpy.props.StringProperty(subtype="FILE_PATH")
+    filepath = bpy.props.StringProperty(subtype="FILE_PATH")
 
-    my_float: bpy.props.FloatProperty(name="Float")
-    my_bool: bpy.props.BoolProperty(name="Toggle Option")
-    my_string: bpy.props.StringProperty(name="String Value")
+    my_float = bpy.props.FloatProperty(name="Float")
+    my_bool = bpy.props.BoolProperty(name="Toggle Option")
+    my_string = bpy.props.StringProperty(name="String Value")
 
     def execute(self, context):
         print("Test", self)

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

@@ -11,8 +11,8 @@ 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.
 
-:class:`Operator.invoke` is used to initialize the operator as being active
-by returning ``{'RUNNING_MODAL'}``, initializing the modal loop.
+:class:`Operator.invoke` is used to initialize the operator as being by
+returning ``{'RUNNING_MODAL'}``, initializing the modal loop.
 
 Notice ``__init__()`` and ``__del__()`` are declared.
 For other operator types they are not useful but for modal operators they will

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

@@ -14,7 +14,7 @@ class SearchEnumOperator(bpy.types.Operator):
     bl_label = "Search Enum Operator"
     bl_property = "my_search"
 
-    my_search: EnumProperty(
+    my_search = EnumProperty(
         name="My Search",
         items=(
             ('FOO', "Foo", ""),

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

@@ -22,11 +22,17 @@ class ObjectSelectPanel(bpy.types.Panel):
 
     def draw_header(self, context):
         layout = self.layout
-        layout.label(text="My Select Panel")
+        obj = context.object
+        layout.prop(obj, "select", text="")
 
     def draw(self, context):
         layout = self.layout
 
+        obj = context.object
+        row = layout.row()
+        row.prop(obj, "hide_select")
+        row.prop(obj, "hide_render")
+
         box = layout.box()
         box.label(text="Selection Tools")
         box.operator("object.select_all").action = 'TOGGLE'

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

@@ -9,8 +9,7 @@ import bpy
 
 class View3DPanel:
     bl_space_type = 'VIEW_3D'
-    bl_region_type = 'UI'
-    bl_category = "Tool"
+    bl_region_type = 'TOOLS'
 
     @classmethod
     def poll(cls, context):

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

@@ -28,8 +28,8 @@ import bpy
 
 
 class MyPropertyGroup(bpy.types.PropertyGroup):
-    custom_1: bpy.props.FloatProperty(name="My Float")
-    custom_2: bpy.props.IntProperty(name="My Int")
+    custom_1 = bpy.props.FloatProperty(name="My Float")
+    custom_2 = bpy.props.IntProperty(name="My Int")
 
 
 bpy.utils.register_class(MyPropertyGroup)

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

@@ -4,216 +4,82 @@ Simple Render Engine
 """
 
 import bpy
-import bgl
 
 
 class CustomRenderEngine(bpy.types.RenderEngine):
     # These three members are used by blender to set up the
     # RenderEngine; define its internal name, visible name and capabilities.
-    bl_idname = "CUSTOM"
-    bl_label = "Custom"
+    bl_idname = "custom_renderer"
+    bl_label = "Flat Color Renderer"
     bl_use_preview = True
 
-    # Init is called whenever a new render engine instance is created. Multiple
-    # instances may exist at the same time, for example for a viewport and final
-    # render.
-    def __init__(self):
-        self.scene_data = None
-        self.draw_data = None
-
-    # When the render engine instance is destroy, this is called. Clean up any
-    # render engine data here, for example stopping running render threads.
-    def __del__(self):
-        pass
-
-    # This is the method called by Blender for both final renders (F12) and
-    # small preview for materials, world and lights.
-    def render(self, depsgraph):
-        scene = depsgraph.scene
+    # This is the only method called by blender, in this example
+    # we use it to detect preview rendering and call the implementation
+    # in another method.
+    def render(self, scene):
         scale = scene.render.resolution_percentage / 100.0
         self.size_x = int(scene.render.resolution_x * scale)
         self.size_y = int(scene.render.resolution_y * scale)
 
-        # Fill the render result with a flat color. The framebuffer is
-        # defined as a list of pixels, each pixel itself being a list of
-        # R,G,B,A values.
         if self.is_preview:
-            color = [0.1, 0.2, 0.1, 1.0]
+            self.render_preview(scene)
         else:
-            color = [0.2, 0.1, 0.1, 1.0]
+            self.render_scene(scene)
 
+    # In this example, we fill the preview renders with a flat green color.
+    def render_preview(self, scene):
         pixel_count = self.size_x * self.size_y
-        rect = [color] * pixel_count
+
+        # The framebuffer is defined as a list of pixels, each pixel
+        # itself being a list of R,G,B,A values
+        green_rect = [[0.0, 1.0, 0.0, 1.0]] * pixel_count
 
         # Here we write the pixel values to the RenderResult
         result = self.begin_result(0, 0, self.size_x, self.size_y)
         layer = result.layers[0].passes["Combined"]
-        layer.rect = rect
+        layer.rect = green_rect
         self.end_result(result)
 
-    # For viewport renders, this method gets called once at the start and
-    # whenever the scene or 3D viewport changes. This method is where data
-    # should be read from Blender in the same thread. Typically a render
-    # thread will be started to do the work while keeping Blender responsive.
-    def view_update(self, context, depsgraph):
-        region = context.region
-        view3d = context.space_data
-        scene = depsgraph.scene
+    # In this example, we fill the full renders with a flat blue color.
+    def render_scene(self, scene):
+        pixel_count = self.size_x * self.size_y
 
-        # Get viewport dimensions
-        dimensions = region.width, region.height
+        # The framebuffer is defined as a list of pixels, each pixel
+        # itself being a list of R,G,B,A values
+        blue_rect = [[0.0, 0.0, 1.0, 1.0]] * pixel_count
 
-        if not self.scene_data:
-            # First time initialization
-            self.scene_data = []
-            first_time = True
+        # Here we write the pixel values to the RenderResult
+        result = self.begin_result(0, 0, self.size_x, self.size_y)
+        layer = result.layers[0].passes["Combined"]
+        layer.rect = blue_rect
+        self.end_result(result)
 
-            # Loop over all datablocks used in the scene.
-            for datablock in depsgraph.ids:
-                pass
-        else:
-            first_time = False
-
-            # Test which datablocks changed
-            for update in depsgraph.updates:
-                print("Datablock updated: ", update.id.name)
-
-            # Test if any material was added, removed or changed.
-            if depsgraph.id_type_updated('MATERIAL'):
-                print("Materials updated")
-
-        # Loop over all object instances in the scene.
-        if first_time or depsgraph.id_type_updated('OBJECT'):
-            for instance in depsgraph.object_instances:
-                pass
-
-    # For viewport renders, this method is called whenever Blender redraws
-    # the 3D viewport. The renderer is expected to quickly draw the render
-    # with OpenGL, and not perform other expensive work.
-    # Blender will draw overlays for selection and editing on top of the
-    # rendered image automatically.
-    def view_draw(self, context, depsgraph):
-        region = context.region
-        scene = depsgraph.scene
-
-        # Get viewport dimensions
-        dimensions = region.width, region.height
-
-        # Bind shader that converts from scene linear to display space,
-        bgl.glEnable(bgl.GL_BLEND)
-        bgl.glBlendFunc(bgl.GL_ONE, bgl.GL_ONE_MINUS_SRC_ALPHA);
-        self.bind_display_space_shader(scene)
-
-        if not self.draw_data or self.draw_data.dimensions != dimensions:
-            self.draw_data = CustomDrawData(dimensions)
-
-        self.draw_data.draw()
-
-        self.unbind_display_space_shader()
-        bgl.glDisable(bgl.GL_BLEND)
-
-
-class CustomDrawData:
-    def __init__(self, dimensions):
-        # Generate dummy float image buffer
-        self.dimensions = dimensions
-        width, height = dimensions
-
-        pixels = [0.1, 0.2, 0.1, 1.0] * width * height
-        pixels = bgl.Buffer(bgl.GL_FLOAT, width * height * 4, pixels)
-
-        # Generate texture
-        self.texture = bgl.Buffer(bgl.GL_INT, 1)
-        bgl.glGenTextures(1, self.texture)
-        bgl.glActiveTexture(bgl.GL_TEXTURE0)
-        bgl.glBindTexture(bgl.GL_TEXTURE_2D, self.texture[0])
-        bgl.glTexImage2D(bgl.GL_TEXTURE_2D, 0, bgl.GL_RGBA16F, width, height, 0, bgl.GL_RGBA, bgl.GL_FLOAT, pixels)
-        bgl.glTexParameteri(bgl.GL_TEXTURE_2D, bgl.GL_TEXTURE_MIN_FILTER, bgl.GL_LINEAR)
-        bgl.glTexParameteri(bgl.GL_TEXTURE_2D, bgl.GL_TEXTURE_MAG_FILTER, bgl.GL_LINEAR)
-        bgl.glBindTexture(bgl.GL_TEXTURE_2D, 0)
-
-        # Bind shader that converts from scene linear to display space,
-        # use the scene's color management settings.
-        shader_program = bgl.Buffer(bgl.GL_INT, 1)
-        bgl.glGetIntegerv(bgl.GL_CURRENT_PROGRAM, shader_program);
-
-        # Generate vertex array
-        self.vertex_array = bgl.Buffer(bgl.GL_INT, 1)
-        bgl.glGenVertexArrays(1, self.vertex_array)
-        bgl.glBindVertexArray(self.vertex_array[0])
-
-        texturecoord_location = bgl.glGetAttribLocation(shader_program[0], "texCoord");
-        position_location = bgl.glGetAttribLocation(shader_program[0], "pos");
-
-        bgl.glEnableVertexAttribArray(texturecoord_location);
-        bgl.glEnableVertexAttribArray(position_location);
-
-        # Generate geometry buffers for drawing textured quad
-        position = [0.0, 0.0, width, 0.0, width, height, 0.0, height]
-        position = bgl.Buffer(bgl.GL_FLOAT, len(position), position)
-        texcoord = [0.0, 0.0, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0]
-        texcoord = bgl.Buffer(bgl.GL_FLOAT, len(texcoord), texcoord)
-
-        self.vertex_buffer = bgl.Buffer(bgl.GL_INT, 2)
-
-        bgl.glGenBuffers(2, self.vertex_buffer)
-        bgl.glBindBuffer(bgl.GL_ARRAY_BUFFER, self.vertex_buffer[0])
-        bgl.glBufferData(bgl.GL_ARRAY_BUFFER, 32, position, bgl.GL_STATIC_DRAW)
-        bgl.glVertexAttribPointer(position_location, 2, bgl.GL_FLOAT, bgl.GL_FALSE, 0, None)
-
-        bgl.glBindBuffer(bgl.GL_ARRAY_BUFFER, self.vertex_buffer[1])
-        bgl.glBufferData(bgl.GL_ARRAY_BUFFER, 32, texcoord, bgl.GL_STATIC_DRAW)
-        bgl.glVertexAttribPointer(texturecoord_location, 2, bgl.GL_FLOAT, bgl.GL_FALSE, 0, None)
-
-        bgl.glBindBuffer(bgl.GL_ARRAY_BUFFER, 0)
-        bgl.glBindVertexArray(0)
-
-    def __del__(self):
-        bgl.glDeleteBuffers(2, self.vertex_buffer)
-        bgl.glDeleteVertexArrays(1, self.vertex_array)
-        bgl.glBindTexture(bgl.GL_TEXTURE_2D, 0)
-        bgl.glDeleteTextures(1, self.texture)
-
-    def draw(self):
-        bgl.glActiveTexture(bgl.GL_TEXTURE0)
-        bgl.glBindTexture(bgl.GL_TEXTURE_2D, self.texture[0])
-        bgl.glBindVertexArray(self.vertex_array[0])
-        bgl.glDrawArrays(bgl.GL_TRIANGLE_FAN, 0, 4);
-        bgl.glBindVertexArray(0)
-        bgl.glBindTexture(bgl.GL_TEXTURE_2D, 0)
-
-
-# RenderEngines also need to tell UI Panels that they are compatible with.
-# We recommend to enable all panels marked as BLENDER_RENDER, and then
-# exclude any panels that are replaced by custom panels registered by the
-# render engine, or that are not supported.
-def get_panels():
-    exclude_panels = {
-        'VIEWLAYER_PT_filter',
-        'VIEWLAYER_PT_layer_passes',
-    }
-
-    panels = []
-    for panel in bpy.types.Panel.__subclasses__():
-        if hasattr(panel, 'COMPAT_ENGINES') and 'BLENDER_RENDER' in panel.COMPAT_ENGINES:
-            if panel.__name__ not in exclude_panels:
-                panels.append(panel)
-
-    return panels
 
 def register():
     # Register the RenderEngine
     bpy.utils.register_class(CustomRenderEngine)
 
-    for panel in get_panels():
-        panel.COMPAT_ENGINES.add('CUSTOM')
+    # RenderEngines also need to tell UI Panels that they are compatible
+    # Otherwise most of the UI will be empty when the engine is selected.
+    # In this example, we need to see the main render image button and
+    # the material preview panel.
+    from bl_ui import (
+        properties_render,
+        properties_material,
+    )
+    properties_render.RENDER_PT_render.COMPAT_ENGINES.add(CustomRenderEngine.bl_idname)
+    properties_material.MATERIAL_PT_preview.COMPAT_ENGINES.add(CustomRenderEngine.bl_idname)
+
 
 def unregister():
     bpy.utils.unregister_class(CustomRenderEngine)
 
-    for panel in get_panels():
-        if 'CUSTOM' in panel.COMPAT_ENGINES:
-            panel.COMPAT_ENGINES.remove('CUSTOM')
+    from bl_ui import (
+        properties_render,
+        properties_material,
+    )
+    properties_render.RENDER_PT_render.COMPAT_ENGINES.remove(CustomRenderEngine.bl_idname)
+    properties_material.MATERIAL_PT_preview.COMPAT_ENGINES.remove(CustomRenderEngine.bl_idname)
 
 
 if __name__ == "__main__":

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

@@ -40,6 +40,18 @@ class MATERIAL_UL_matslots_example(bpy.types.UIList):
                 layout.prop(ma, "name", text="", emboss=False, icon_value=icon)
             else:
                 layout.label(text="", translate=False, icon_value=icon)
+            # And now we can add other UI stuff...
+            # Here, we add nodes info if this material uses (old!) shading nodes.
+            if ma and not context.scene.render.use_shading_nodes:
+                manode = ma.active_node_material
+                if manode:
+                    # The static method UILayout.icon returns the integer value of the icon ID "computed" for the given
+                    # RNA object.
+                    layout.label(text="Node %s" % manode.name, translate=False, icon_value=layout.icon(manode))
+                elif ma.use_nodes:
+                    layout.label(text="Node <none>", translate=False)
+                else:
+                    layout.label(text="")
         # 'GRID' layout type should be as compact as possible (typically a single icon!).
         elif self.layout_type in {'GRID'}:
             layout.alignment = 'CENTER'
@@ -47,10 +59,10 @@ class MATERIAL_UL_matslots_example(bpy.types.UIList):
 
 
 # And now we can use this list everywhere in Blender. Here is a small example panel.
-class UIListPanelExample1(bpy.types.Panel):
+class UIListPanelExample(bpy.types.Panel):
     """Creates a Panel in the Object properties window"""
-    bl_label = "UIList Example 1 Panel"
-    bl_idname = "OBJECT_PT_ui_list_example_1"
+    bl_label = "UIList Panel"
+    bl_idname = "OBJECT_PT_ui_list_example"
     bl_space_type = 'PROPERTIES'
     bl_region_type = 'WINDOW'
     bl_context = "object"
@@ -73,12 +85,12 @@ class UIListPanelExample1(bpy.types.Panel):
 
 def register():
     bpy.utils.register_class(MATERIAL_UL_matslots_example)
-    bpy.utils.register_class(UIListPanelExample1)
+    bpy.utils.register_class(UIListPanelExample)
 
 
 def unregister():
-    bpy.utils.unregister_class(UIListPanelExample1)
     bpy.utils.unregister_class(MATERIAL_UL_matslots_example)
+    bpy.utils.unregister_class(UIListPanelExample)
 
 
 if __name__ == "__main__":

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

@@ -15,24 +15,12 @@ class MESH_UL_vgroups_slow(bpy.types.UIList):
     VGROUP_EMPTY = 1 << 0
 
     # Custom properties, saved with .blend file.
-    use_filter_empty: bpy.props.BoolProperty(
-        name="Filter Empty",
-        default=False,
-        options=set(),
-        description="Whether to filter empty vertex groups",
-    )
-    use_filter_empty_reverse: bpy.props.BoolProperty(
-        name="Reverse Empty",
-        default=False,
-        options=set(),
-        description="Reverse empty filtering",
-    )
-    use_filter_name_reverse: bpy.props.BoolProperty(
-        name="Reverse Name",
-        default=False,
-        options=set(),
-        description="Reverse name filtering",
-    )
+    use_filter_empty = bpy.props.BoolProperty(name="Filter Empty", default=False, options=set(),
+                                              description="Whether to filter empty vertex groups")
+    use_filter_empty_reverse = bpy.props.BoolProperty(name="Reverse Empty", default=False, options=set(),
+                                                      description="Reverse empty filtering")
+    use_filter_name_reverse = bpy.props.BoolProperty(name="Reverse Name", default=False, options=set(),
+                                                     description="Reverse name filtering")
 
     # This allows us to have mutually exclusive options, which are also all disable-able!
     def _gen_order_update(name1, name2):
@@ -40,18 +28,12 @@ class MESH_UL_vgroups_slow(bpy.types.UIList):
             if (getattr(self, name1)):
                 setattr(self, name2, False)
         return _u
-    use_order_name: bpy.props.BoolProperty(
-        name="Name", default=False, options=set(),
+    use_order_name = bpy.props.BoolProperty(name="Name", default=False, options=set(),
                                             description="Sort groups by their name (case-insensitive)",
-        update=_gen_order_update("use_order_name", "use_order_importance"),
-    )
-    use_order_importance: bpy.props.BoolProperty(
-        name="Importance",
-        default=False,
-        options=set(),
+                                            update=_gen_order_update("use_order_name", "use_order_importance"))
+    use_order_importance = bpy.props.BoolProperty(name="Importance", default=False, options=set(),
                                                   description="Sort groups by their average weight in the mesh",
-        update=_gen_order_update("use_order_importance", "use_order_name"),
-    )
+                                                  update=_gen_order_update("use_order_importance", "use_order_name"))
 
     # Usual draw item function.
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index, flt_flag):
@@ -177,37 +159,3 @@ class MESH_UL_vgroups_slow(bpy.types.UIList):
             flt_neworder = helper_funcs.sort_items_helper(_sort, lambda e: e[1], True)
 
         return flt_flags, flt_neworder
-
-
-# Minimal code to use above UIList...
-class UIListPanelExample2(bpy.types.Panel):
-    """Creates a Panel in the Object properties window"""
-    bl_label = "UIList Example 2 Panel"
-    bl_idname = "OBJECT_PT_ui_list_example_2"
-    bl_space_type = 'PROPERTIES'
-    bl_region_type = 'WINDOW'
-    bl_context = "object"
-
-    def draw(self, context):
-        layout = self.layout
-        obj = context.object
-
-        # template_list now takes two new args.
-        # The first one is the identifier of the registered UIList to use (if you want only the default list,
-        # with no custom draw code, use "UI_UL_list").
-        layout.template_list("MESH_UL_vgroups_slow", "", obj, "vertex_groups", obj.vertex_groups, "active_index")
-
-
-def register():
-    bpy.utils.register_class(MESH_UL_vgroups_slow)
-    bpy.utils.register_class(UIListPanelExample2)
-
-
-def unregister():
-    bpy.utils.unregister_class(UIListPanelExample2)
-    bpy.utils.unregister_class(MESH_UL_vgroups_slow)
-
-
-if __name__ == "__main__":
-    register()
-

doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.1.py

@@ -5,32 +5,25 @@ than the bone.
 """
 
 import bpy
-from bpy.props import (
-    FloatProperty,
-    PointerProperty,
-)
+from bpy.props import PointerProperty
 
 
-# Define a nested property.
+# define a nested property
 class MyPropGroup(bpy.types.PropertyGroup):
-    nested: FloatProperty(name="Nested", default=0.0)
+    nested = bpy.props.FloatProperty(name="Nested", default=0.0)
 
 
-# Register it so its available for all bones.
+# register it so its available for all bones
 bpy.utils.register_class(MyPropGroup)
-bpy.types.Bone.my_prop = PointerProperty(
-    type=MyPropGroup,
-    name="MyProp",
-)
+bpy.types.Bone.my_prop = PointerProperty(type=MyPropGroup,
+                                         name="MyProp")
 
-# Get a bone.
+# get a bone
 obj = bpy.data.objects["Armature"]
 arm = obj.data
 
-# Set the keyframe at frame 1.
-arm.bones["Bone"].my_prop.nested = 10
-arm.keyframe_insert(
-    data_path='bones["Bone"].my_prop.nested',
+# set the keyframe at frame 1
+arm.bones["Bone"].my_prop_group.nested = 10
+arm.keyframe_insert(data_path='bones["Bone"].my_prop.nested',
                     frame=1,
-    group="Nested Group",
-)
+                    group="Nested Group")

doc/python_api/examples/bpy.types.bpy_struct.keyframe_insert.py

@@ -7,5 +7,5 @@ import bpy
 obj = bpy.context.object
 
 # set the keyframe at frame 1
-obj.location = (3.0, 4.0, 10.0)
+obj.location = 3.0, 4.0, 10.0
 obj.keyframe_insert(data_path="location", frame=1)

doc/python_api/examples/gpu.10.py

@@ -24,7 +24,7 @@ def draw():
     view_matrix = scene.camera.matrix_world.inverted()
 
     projection_matrix = scene.camera.calc_matrix_camera(
-        context.evaluated_depsgraph_get(), x=WIDTH, y=HEIGHT)
+        context.depsgraph, x=WIDTH, y=HEIGHT)
 
     offscreen.draw_view3d(
         scene,

doc/python_api/examples/mathutils.Color.py

@@ -27,4 +27,4 @@ col += mathutils.Color((0.25, 0.0, 0.0))
 print("Color: %d, %d, %d" % (col * 255.0)[:])
 
 # This example prints the color as hexadecimal
-print("Hexadecimal: %.2x%.2x%.2x" % (int(col.r * 255), int(col.g * 255), int(col.b * 255)))
+print("Hexadecimal: %.2x%.2x%.2x" % (col * 255.0)[:])

doc/python_api/examples/mathutils.Euler.py

@@ -29,4 +29,4 @@ vec.rotate(eul)
 # transformations with more flexibility
 mat_rot = eul.to_matrix()
 mat_loc = mathutils.Matrix.Translation((2.0, 3.0, 4.0))
-mat = mat_loc @ mat_rot.to_4x4()
+mat = mat_loc * mat_rot.to_4x4()

doc/python_api/examples/mathutils.Matrix.py

@@ -11,7 +11,7 @@ mat_sca = mathutils.Matrix.Scale(0.5, 4, (0.0, 0.0, 1.0))
 mat_rot = mathutils.Matrix.Rotation(math.radians(45.0), 4, 'X')
 
 # combine transformations
-mat_out = mat_loc @ mat_rot @ mat_sca
+mat_out = mat_loc * mat_rot * mat_sca
 print(mat_out)
 
 # extract components back out of the matrix