Fix tool system integration of hair edit brushes.

This disables a bunch of topology-changing functions which will need to be replaced/removed.

.arcconfig

@@ -1,7 +1,7 @@
 {
 	"project_id" : "Blender",
 	"conduit_uri" : "https://developer.blender.org/",
-	"git.default-relative-commit" : "origin/master",
+	"git.default-relative-commit" : "origin/blender2.8",
 	"arc.land.update.default" : "rebase",
-	"arc.land.onto.default" : "master"
+	"arc.land.onto.default" : "blender2.8"
 }

.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 verison 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]

.gitignore

@@ -11,10 +11,6 @@ __pycache__/
 *.swo
 *#
 
-# Indexes for emacs, vi & others
-TAGS
-tags
-
 # QtCreator
 CMakeLists.txt.user
 

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "release/scripts/addons"]
 	path = release/scripts/addons
 	url = ../blender-addons.git
-	branch = master
+	branch = blender2.8
 	ignore = all
 [submodule "release/scripts/addons_contrib"]
 	path = release/scripts/addons_contrib
 	url = ../blender-addons-contrib.git
-	branch = master
+	branch = blender2.8
 	ignore = all
 [submodule "release/datafiles/locale"]
 	path = release/datafiles/locale

CMakeLists.txt

@@ -16,6 +16,11 @@
 #
 # The Original Code is Copyright (C) 2006, Blender Foundation
 # All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
 # ***** END GPL LICENSE BLOCK *****
 
 #-----------------------------------------------------------------------------
@@ -344,7 +349,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)
@@ -407,7 +411,7 @@ option(WITH_CYCLES_CUDA_BINARIES    "Build Cycles CUDA binaries" OFF)
 option(WITH_CYCLES_CUBIN_COMPILER	"Build cubins with nvrtc based compiler instead of nvcc" OFF)
 option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another (useful on machines with limited RAM)" OFF)
 mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
-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 "CUDA architectures to build binaries for")
+set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm_72 sm_75 CACHE STRING "CUDA architectures to build binaries for")
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
 option(WITH_CYCLES_LOGGING	"Build Cycles with logging support" ON)
@@ -544,6 +548,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)
@@ -558,24 +566,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()
 
@@ -644,12 +641,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
@@ -772,8 +763,8 @@ if(WITH_PYTHON)
 	# Do this before main 'platform_*' checks,
 	# because UNIX will search for the old Python paths which may not exist.
 	# giving errors about missing paths before this case is met.
-  if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.7")
-    message(FATAL_ERROR "At least Python 3.7 is required to build")
+	if(DEFINED PYTHON_VERSION AND "${PYTHON_VERSION}" VERSION_LESS "3.6")
+		message(FATAL_ERROR "At least Python 3.6 is required to build")
 	endif()
 
 	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/release/scripts/addons/modules")
@@ -822,12 +813,6 @@ if(NOT CMAKE_BUILD_TYPE MATCHES "Release")
 
 		set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${COMPILER_ASAN_CXXFLAGS}")
 		set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} ${COMPILER_ASAN_CXXFLAGS}")
-    if(WITH_CYCLES_OSL)
-      # With OSL, Cycles disables rtti in some modules, wich then breaks at linking
-      # when trying to use vptr sanitizer (included into 'undefined' general option).
-      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-sanitize=vptr")
-      set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -fno-sanitize=vptr")
-    endif()
 		if(MSVC)
 			set(COMPILER_ASAN_LINKER_FLAGS "/FUNCTIONPADMIN:6")
 		endif()
@@ -1072,11 +1057,8 @@ if(WITH_GL_PROFILE_ES20)
 	endif()
 
 else()
-  if(OpenGL_GL_PREFERENCE STREQUAL "LEGACY" AND OPENGL_gl_LIBRARY)
-    list(APPEND BLENDER_GL_LIBRARIES ${OPENGL_gl_LIBRARY})
-  else()
-    list(APPEND BLENDER_GL_LIBRARIES ${OPENGL_opengl_LIBRARY} ${OPENGL_glx_LIBRARY})
-  endif()
+	list(APPEND BLENDER_GL_LIBRARIES "${OPENGL_LIBRARIES}")
+
 endif()
 
 if(WITH_GL_EGL)
@@ -1137,10 +1119,7 @@ endif()
 #-----------------------------------------------------------------------------
 # Configure OpenMP.
 if(WITH_OPENMP)
-  if(NOT OPENMP_CUSTOM)
 	find_package(OpenMP)
-  endif()
-
 	if(OPENMP_FOUND)
 		if(NOT WITH_OPENMP_STATIC)
 			set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
@@ -1297,76 +1276,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
 
@@ -1464,8 +1373,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)
@@ -1518,8 +1425,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")
 
@@ -1540,7 +1445,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
@@ -1555,7 +1459,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
@@ -1703,11 +1606,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)

GNUmakefile

@@ -24,138 +24,11 @@
 #   ../build_linux_i386
 # This is for users who like to configure & build blender with a single command.
 
-define HELP_TEXT
-
-Convenience Targets
-   Provided for building Blender, (multiple at once can be used).
-
-   * debug:         Build a debug binary.
-   * full:          Enable all supported dependencies & options.
-   * lite:          Disable non essential features for a smaller binary and faster build.
-   * headless:      Build without an interface (renderfarm or server automation).
-   * cycles:        Build Cycles standalone only, without Blender.
-   * bpy:           Build as a python module which can be loaded from python directly.
-   * deps:          Build library dependencies (intended only for platform maintainers).
-
-   * config:        Run cmake configuration tool to set build options.
-
-   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 poject files for development environments.
-
-   * project_qtcreator:     QtCreator Project Files.
-   * project_netbeans:      NetBeans Project Files.
-   * project_eclipse:       Eclipse CDT4 Project Files.
-
-Package Targets
-
-   * package_debian:    Build a debian package.
-   * package_pacman:    Build an arch linux pacman package.
-   * package_archive:	Build an archive package.
-
-Testing Targets
-   Not associated with building Blender.
-
-   * test:
-     Run ctest, currently tests import/export,
-     operator execution and that python modules load
-   * test_cmake:
-     Runs our own cmake file checker
-     which detects errors in the cmake file list definitions
-   * test_pep8:
-     Checks all python script are pep8
-     which are tagged to use the stricter formatting
-   * test_deprecated:
-     Checks for deprecation tags in our code which may need to be removed
-   * test_style_c:
-     Checks C/C++ conforms with blenders style guide:
-     https://wiki.blender.org/wiki/Source/Code_Style
-   * test_style_c_qtc:
-     Same as test_style but outputs QtCreator tasks format
-   * test_style_osl:
-     Checks OpenShadingLanguage conforms with blenders style guide:
-     https://wiki.blender.org/wiki/Source/Code_Style
-   * test_style_osl_qtc:
-     Checks OpenShadingLanguage conforms with blenders style guide:
-     https://wiki.blender.org/wiki/Source/Code_Style
-
-Static Source Code Checking
-   Not associated with building Blender.
-
-   * check_cppcheck:        Run blender source through cppcheck (C & C++).
-   * check_clang_array:     Run blender source through clang array checking script (C & C++).
-   * check_splint:          Run blenders source through splint (C only).
-   * check_sparse:          Run blenders source through sparse (C only).
-   * check_smatch:          Run blenders source through smatch (C only).
-   * check_spelling_c:      Check for spelling errors (C/C++ only).
-   * check_spelling_c_qtc:  Same as check_spelling_c but outputs QtCreator tasks format.
-   * check_spelling_osl:    Check for spelling errors (OSL only).
-   * check_spelling_py:     Check for spelling errors (Python only).
-   * check_descriptions:    Check for duplicate/invalid descriptions.
-
-Utilities
-   Not associated with building Blender.
-
-   * icons:
-     Updates PNG icons from SVG files.
-
-     Optionally pass in variables: 'BLENDER_BIN', 'INKSCAPE_BIN'
-     otherwise default paths are used.
-
-     Example
-        make icons INKSCAPE_BIN=/path/to/inkscape
-
-   * icons_geom:
-     Updates Geometry icons from BLEND file.
-
-     Optionally pass in variable: 'BLENDER_BIN'
-     otherwise default paths are used.
-
-     Example
-        make icons_geom BLENDER_BIN=/path/to/blender
-
-   * tgz:
-     Create a compressed archive of the source code.
-
-   * 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.
-   * BUILD_DIR:             Override default build path.
-   * PYTHON:                Use this for the Python command (used for checking tools).
-   * NPROCS:                Number of processes to use building (auto-detect when omitted).
-
-Documentation Targets
-   Not associated with building Blender.
-
-   * doc_py:        Generate sphinx python api docs.
-   * doc_doxy:      Generate doxygen C/C++ docs.
-   * doc_dna:       Generate blender file format reference.
-   * doc_man:       Generate manpage.
-
-Information
-
-   * help:              This help message.
-   * help_features:     Show a list of optional features when building.
-
-endef
-# HELP_TEXT (end)
-
 
 # System Vars
 OS:=$(shell uname -s)
 OS_NCASE:=$(shell uname -s | tr '[A-Z]' '[a-z]')
-CPU:=$(shell uname -m)
+# CPU:=$(shell uname -m)  # UNUSED
 
 
 # Source and Build DIR's
@@ -182,7 +55,7 @@ ifndef DEPS_INSTALL_DIR
 
 	ifneq ($(OS_NCASE),darwin)
 		# Add processor type to directory name
-		DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(CPU)
+		DEPS_INSTALL_DIR:=$(DEPS_INSTALL_DIR)_$(shell uname -p)
 	endif
 endif
 
@@ -225,12 +98,10 @@ endif
 # -----------------------------------------------------------------------------
 # Blender binary path
 
-# 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"
+	BLENDER_BIN="$(BUILD_DIR)/bin/blender"
 endif
 
 
@@ -325,9 +196,87 @@ config: .FORCE
 
 # -----------------------------------------------------------------------------
 # Help for build targets
-export HELP_TEXT
 help: .FORCE
-	@echo "$$HELP_TEXT"
+	@echo ""
+	@echo "Convenience targets provided for building blender, (multiple at once can be used)"
+	@echo "  * debug     - build a debug binary"
+	@echo "  * full      - enable all supported dependencies & options"
+	@echo "  * lite      - disable non essential features for a smaller binary and faster build"
+	@echo "  * headless  - build without an interface (renderfarm or server automation)"
+	@echo "  * cycles    - build Cycles standalone only, without Blender"
+	@echo "  * bpy       - build as a python module which can be loaded from python directly"
+	@echo "  * deps      - build library dependencies (intended only for platform maintainers)"
+	@echo ""
+	@echo "  * config    - run cmake configuration tool to set build options"
+	@echo ""
+	@echo "  Note, passing the argument 'BUILD_DIR=path' when calling make will override the default build dir."
+	@echo "  Note, passing the argument 'BUILD_CMAKE_ARGS=args' lets you add cmake arguments."
+	@echo ""
+	@echo ""
+	@echo "Project Files for IDE's"
+	@echo "  * project_qtcreator - QtCreator Project Files"
+	@echo "  * project_netbeans  - NetBeans Project Files"
+	@echo "  * project_eclipse   - Eclipse CDT4 Project Files"
+	@echo ""
+	@echo "Package Targets"
+	@echo "  * package_debian  - build a debian package"
+	@echo "  * package_pacman  - build an arch linux pacman package"
+	@echo "  * package_archive - build an archive package"
+	@echo ""
+	@echo "Testing Targets (not associated with building blender)"
+	@echo "  * test               - run ctest, currently tests import/export,"
+	@echo "                         operator execution and that python modules load"
+	@echo "  * test_cmake         - runs our own cmake file checker"
+	@echo "                         which detects errors in the cmake file list definitions"
+	@echo "  * test_pep8          - checks all python script are pep8"
+	@echo "                         which are tagged to use the stricter formatting"
+	@echo "  * test_deprecated    - checks for deprecation tags in our code which may need to be removed"
+	@echo "  * test_style_c       - checks C/C++ conforms with blenders style guide:"
+	@echo "                         https://wiki.blender.org/wiki/Source/Code_Style"
+	@echo "  * test_style_c_qtc   - same as test_style but outputs QtCreator tasks format"
+	@echo "  * test_style_osl     - checks OpenShadingLanguage conforms with blenders style guide:"
+	@echo "                         https://wiki.blender.org/wiki/Source/Code_Style"
+	@echo "  * test_style_osl_qtc - checks OpenShadingLanguage conforms with blenders style guide:"
+	@echo "                         https://wiki.blender.org/wiki/Source/Code_Style"
+	@echo ""
+	@echo "Static Source Code Checking (not associated with building blender)"
+	@echo "  * check_cppcheck       - run blender source through cppcheck (C & C++)"
+	@echo "  * check_clang_array    - run blender source through clang array checking script (C & C++)"
+	@echo "  * check_splint         - run blenders source through splint (C only)"
+	@echo "  * check_sparse         - run blenders source through sparse (C only)"
+	@echo "  * check_smatch         - run blenders source through smatch (C only)"
+	@echo "  * check_spelling_c     - check for spelling errors (C/C++ only)"
+	@echo "  * check_spelling_c_qtc - same as check_spelling_c but outputs QtCreator tasks format"
+	@echo "  * check_spelling_osl   - check for spelling errors (OSL only)"
+	@echo "  * check_spelling_py    - check for spelling errors (Python only)"
+	@echo "  * check_descriptions   - check for duplicate/invalid descriptions"
+	@echo ""
+	@echo "Utilities (not associated with building blender)"
+	@echo "  * icons    - Updates PNG icons from SVG files."
+	@echo "               Set environment variables 'BLENDER_BIN' and 'INKSCAPE_BIN'"
+	@echo "               to define your own commands."
+	@echo "  * icons_geom - Updates Geometry icons from BLEND file."
+	@echo "                 Set environment variable 'BLENDER_BIN'"
+	@echo "                 to define your own command."
+	@echo "  * tgz        - create a compressed archive of the source code."
+	@echo "  * update     - updates git and all submodules"
+	@echo ""
+	@echo "Environment Variables"
+	@echo "  * BUILD_CMAKE_ARGS    - arguments passed to CMake."
+	@echo "  * BUILD_DIR           - override default build path."
+	@echo "  * PYTHON              - use this for the Python command (used for checking tools)."
+	@echo "  * NPROCS              - number of processes to use building (auto-detect when omitted)."
+	@echo ""
+	@echo "Documentation Targets (not associated with building blender)"
+	@echo "  * doc_py   - generate sphinx python api docs"
+	@echo "  * doc_doxy - generate doxygen C/C++ docs"
+	@echo "  * doc_dna  - generate blender file format reference"
+	@echo "  * doc_man  - generate manpage"
+	@echo ""
+	@echo "Information"
+	@echo "  * help          - this help message"
+	@echo "  * help_features - show a list of optional features when building"
+	@echo ""
 
 # -----------------------------------------------------------------------------
 # Packages
@@ -408,7 +357,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)"
@@ -491,11 +440,8 @@ check_descriptions: .FORCE
 tgz: .FORCE
 	./build_files/utils/build_tgz.sh
 
-INKSCAPE_BIN?="inkscape"
 icons: .FORCE
-	BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
 	"$(BLENDER_DIR)/release/datafiles/blender_icons_update.py"
-	BLENDER_BIN=$(BLENDER_BIN) INKSCAPE_BIN=$(INKSCAPE_BIN) \
 	"$(BLENDER_DIR)/release/datafiles/prvicons_update.py"
 
 icons_geom: .FORCE
@@ -512,12 +458,9 @@ update: .FORCE
 	fi
 	git pull --rebase
 	git submodule update --init --recursive
-	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)
+	# Use blender2.8 branch for submodules that have it.
+	git submodule foreach "git checkout blender2.8 || git checkout master"
+	git submodule foreach git pull --rebase origin
 
 
 # -----------------------------------------------------------------------------

build_files/build_environment/CMakeLists.txt

@@ -30,11 +30,11 @@
 #   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
 #
 ####################################################################################################
@@ -91,11 +91,7 @@ include(cmake/openvdb.cmake)
 include(cmake/python.cmake)
 include(cmake/python_site_packages.cmake)
 include(cmake/numpy.cmake)
-if(UNIX AND NOT APPLE)
-  # Rely on PugiXML compiled with OpenImageIO
-else()
 include(cmake/pugixml.cmake)
-endif()
 
 if(WITH_WEBP)
 	include(cmake/webp.cmake)
@@ -118,7 +114,7 @@ endif()
 
 if(NOT WIN32 OR ENABLE_MINGW64)
 	include(cmake/openjpeg.cmake)
-  if(NOT WIN32 OR BUILD_MODE STREQUAL Release)
+	if(BUILD_MODE STREQUAL Release)
 		if(WIN32)
 			include(cmake/zlib_mingw.cmake)
 		endif()

build_files/build_environment/cmake/harvest.cmake

@@ -102,6 +102,7 @@ function(harvest from to)
 			FILES_MATCHING PATTERN ${pattern}
 			PATTERN "pkgconfig" EXCLUDE
 			PATTERN "cmake" EXCLUDE
+			PATTERN "clang" EXCLUDE
 			PATTERN "__pycache__" EXCLUDE
 			PATTERN "tests" EXCLUDE)
 	endif()
@@ -128,15 +129,8 @@ harvest(jemalloc/lib jemalloc/lib "*.a")
 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)
-  harvest(openmp/lib openmp/lib "*")
-  harvest(openmp/include openmp/include "*.h")
-endif()
 harvest(ogg/lib ffmpeg/lib "*.a")
 harvest(openal/include openal/include "*.h")
 if(UNIX AND NOT APPLE)

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/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/openmp.cmake

@@ -23,8 +23,7 @@ ExternalProject_Add(external_openmp
 	URL_HASH MD5=${OPENMP_HASH}
 	PREFIX ${BUILD_DIR}/openmp
 	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${LIBDIR}/openmp ${DEFAULT_CMAKE_FLAGS}
-  INSTALL_COMMAND cd ${BUILD_DIR}/openmp/src/external_openmp-build && install_name_tool -id @executable_path/../Resources/lib/libomp.dylib runtime/src/libomp.dylib && make install
-  INSTALL_DIR ${LIBDIR}/openmp
+	INSTALL_DIR ${LIBDIR}/clang
 )
 
 add_dependencies(

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,14 @@ else()
 			OUTPUT_VARIABLE XCODE_DEV_PATH OUTPUT_STRIP_TRAILING_WHITESPACE
 		)
 		set(OSX_ARCHITECTURES x86_64)
-    set(OSX_DEPLOYMENT_TARGET 10.11)
-    set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk)
+		set(OSX_DEPLOYMENT_TARGET 10.9)
+		set(OSX_SDK_VERSION 10.13)
+		set(OSX_SYSROOT ${XCODE_DEV_PATH}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX${OSX_SDK_VERSION}.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

@@ -81,6 +81,11 @@ if(WIN32)
 		${OSL_EXTRA_ARGS}
 		-DPUGIXML_HOME=${LIBDIR}/pugixml
 	)
+elseif(UNIX AND NOT APPLE)
+	set(OSL_EXTRA_ARGS
+		${OSL_EXTRA_ARGS}
+		-DPUGIXML_HOME=${LIBDIR}/pugixml
+	)
 elseif(APPLE)
 	# Make symbol hiding consistent with OIIO which defaults to OFF,
 	# avoids linker warnings on macOS
@@ -111,16 +116,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/png.cmake

@@ -36,7 +36,7 @@ add_dependencies(
 	external_zlib
 )
 
-if(WIN32 AND BUILD_MODE STREQUAL Debug)
+if(BUILD_MODE STREQUAL Debug)
 	ExternalProject_Add_Step(external_png after_install
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/png/lib/libpng16_staticd${LIBEXT} ${LIBDIR}/png/lib/libpng16${LIBEXT}
 		DEPENDEES install

build_files/build_environment/cmake/pthreads.cmake

@@ -17,6 +17,7 @@
 # ***** END GPL LICENSE BLOCK *****
 
 if(WIN32)
+		set(PTHREAD_XCFLAGS /MD)
 
 		if(MSVC14) # vs2015 has timespec
 			set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H /D_TIMESPEC_DEFINED ")
@@ -24,7 +25,7 @@ if(WIN32)
 			set(PTHREAD_CPPFLAGS "/I. /DHAVE_CONFIG_H ")
 		endif()
 
-    set(PTHREADS_BUILD cd ${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC-static /e CPPFLAGS=${PTHREAD_CPPFLAGS} /e XLIBS=/NODEFAULTLIB:msvcr)
+		set(PTHREADS_BUILD cd ${BUILD_DIR}/pthreads/src/external_pthreads/ && cd && nmake VC /e CPPFLAGS=${PTHREAD_CPPFLAGS} /e XCFLAGS=${PTHREAD_XCFLAGS} /e XLIBS=/NODEFAULTLIB:msvcr)
 
 		ExternalProject_Add(external_pthreads
 			URL ${PTHREADS_URI}
@@ -34,7 +35,8 @@ if(WIN32)
 			CONFIGURE_COMMAND echo .
 			BUILD_COMMAND ${PTHREADS_BUILD}
 			INSTALL_COMMAND COMMAND
-        ${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/libpthreadVC3${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC3${LIBEXT} &&
+				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthreadVC3.dll ${LIBDIR}/pthreads/lib/pthreadVC3.dll &&
+				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthreadVC3${LIBEXT} ${LIBDIR}/pthreads/lib/pthreadVC3${LIBEXT} &&
 				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/pthread.h ${LIBDIR}/pthreads/inc/pthread.h &&
 				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/sched.h ${LIBDIR}/pthreads/inc/sched.h &&
 				${CMAKE_COMMAND} -E copy ${BUILD_DIR}/pthreads/src/external_pthreads/semaphore.h ${LIBDIR}/pthreads/inc/semaphore.h &&

build_files/build_environment/cmake/tiff.cmake

@@ -39,7 +39,7 @@ add_dependencies(
 	external_zlib
 )
 
-if(WIN32 AND BUILD_MODE STREQUAL Debug)
+if(BUILD_MODE STREQUAL Debug)
 	ExternalProject_Add_Step(external_tiff after_install
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/tiff/lib/tiffd${LIBEXT} ${LIBDIR}/tiff/lib/tiff${LIBEXT}
 		DEPENDEES install

build_files/build_environment/cmake/versions.cmake

@@ -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)
@@ -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)

build_files/build_environment/cmake/zlib.cmake

@@ -40,8 +40,16 @@ if(WIN32)
 		)
 	endif()
 else()
+	if(BUILD_MODE STREQUAL Debug)
+		ExternalProject_Add_Step(external_zlib after_install
+			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/zlibstaticd${LIBEXT} ${LIBDIR}/zlib/lib/${ZLIB_LIBRARY}
+			DEPENDEES install
+		)
+	endif()
+	if (UNIX)
 		ExternalProject_Add_Step(external_zlib after_install
 			COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR}/zlib/lib/libz.a ${LIBDIR}/zlib/lib/libz_pic.a
 			DEPENDEES install
 		)
 	endif()
+endif()

build_files/build_environment/install_deps.sh

@@ -301,8 +301,6 @@ NO_BUILD=false
 NO_CONFIRM=false
 USE_CXX11=true
 
-CLANG_FORMAT_VERSION_MIN="6.0"
-
 PYTHON_VERSION="3.7.0"
 PYTHON_VERSION_MIN="3.7"
 PYTHON_FORCE_BUILD=false
@@ -358,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
@@ -385,6 +383,7 @@ OPENCOLLADA_FORCE_BUILD=false
 OPENCOLLADA_FORCE_REBUILD=false
 OPENCOLLADA_SKIP=false
 
+
 EMBREE_VERSION="3.2.4"
 EMBREE_FORCE_BUILD=false
 EMBREE_FORCE_REBUILD=false
@@ -2629,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 \
@@ -2789,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!
@@ -3451,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
@@ -3908,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
@@ -4558,33 +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_JACK" = true ]; then

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 runnign 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

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

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/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/RpmBuild.cmake

@@ -1,3 +1,4 @@
+#
 # VLMC RPM Finder
 # Authors: Rohit Yadav <rohityadav89@gmail.com>
 #

build_files/cmake/buildinfo.cmake

@@ -22,7 +22,7 @@ if(EXISTS ${SOURCE_DIR}/.git)
 	if(MY_WC_BRANCH STREQUAL "HEAD")
 		# Detached HEAD, check whether commit hash is reachable
 		# in the master branch
-    execute_process(COMMAND git rev-parse --short=12 HEAD
+		execute_process(COMMAND git rev-parse --short HEAD
 		                WORKING_DIRECTORY ${SOURCE_DIR}
 		                OUTPUT_VARIABLE MY_WC_HASH
 		                OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -80,12 +80,12 @@ if(EXISTS ${SOURCE_DIR}/.git)
 		if(NOT _git_below_check STREQUAL "")
 			# If there're commits between HEAD and upstream this means
 			# that we're reset-ed to older revision. Use it's hash then.
-      execute_process(COMMAND git rev-parse --short=12 HEAD
+			execute_process(COMMAND git rev-parse --short HEAD
 			                WORKING_DIRECTORY ${SOURCE_DIR}
 			                OUTPUT_VARIABLE MY_WC_HASH
 			                OUTPUT_STRIP_TRAILING_WHITESPACE)
 		else()
-      execute_process(COMMAND git rev-parse --short=12 @{u}
+			execute_process(COMMAND git rev-parse --short @{u}
 			                WORKING_DIRECTORY ${SOURCE_DIR}
 			                OUTPUT_VARIABLE MY_WC_HASH
 			                OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -94,7 +94,7 @@ if(EXISTS ${SOURCE_DIR}/.git)
 			if(MY_WC_HASH STREQUAL "")
 				# Local branch, not set to upstream.
 				# Well, let's use HEAD for now
-        execute_process(COMMAND git rev-parse --short=12 HEAD
+				execute_process(COMMAND git rev-parse --short HEAD
 				                WORKING_DIRECTORY ${SOURCE_DIR}
 				                OUTPUT_VARIABLE MY_WC_HASH
 				                OUTPUT_STRIP_TRAILING_WHITESPACE)

build_files/cmake/cmake_consistency_check.py

@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
+# Contributor(s): Campbell Barton
+#
 # ***** END GPL LICENSE BLOCK *****
 
 # <pep8 compliant>

build_files/cmake/cmake_netbeans_project.py

@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
+# Contributor(s): Campbell Barton, M.G. Kishalmi
+#
 # ***** END GPL LICENSE BLOCK *****
 
 # <pep8 compliant>

build_files/cmake/cmake_qtcreator_project.py

@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
+# Contributor(s): Campbell Barton, M.G. Kishalmi
+#
 # ***** END GPL LICENSE BLOCK *****
 
 # <pep8 compliant>

build_files/cmake/cmake_static_check_clang_array.py

@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
+# Contributor(s): Campbell Barton
+#
 # ***** END GPL LICENSE BLOCK *****
 
 # <pep8 compliant>

build_files/cmake/cmake_static_check_cppcheck.py

@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
+# Contributor(s): Campbell Barton
+#
 # ***** END GPL LICENSE BLOCK *****
 
 # <pep8 compliant>

build_files/cmake/cmake_static_check_smatch.py

@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
+# Contributor(s): Campbell Barton
+#
 # ***** END GPL LICENSE BLOCK *****
 
 # <pep8 compliant>

build_files/cmake/cmake_static_check_sparse.py

@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
+# Contributor(s): Campbell Barton
+#
 # ***** END GPL LICENSE BLOCK *****
 
 # <pep8 compliant>

build_files/cmake/cmake_static_check_splint.py

@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
+# Contributor(s): Campbell Barton
+#
 # ***** END GPL LICENSE BLOCK *****
 
 # <pep8 compliant>

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)

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)

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)
@@ -53,8 +52,7 @@ 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)
+set(CYCLES_CUDA_BINARIES_ARCH sm_30;sm_35;sm_37;sm_50;sm_52;sm_60;sm_61;sm_70;sm_72;sm_75 CACHE STRING "" FORCE)
 
 # platform dependent options
 if(UNIX AND NOT APPLE)

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/example_scripts/make_quiet.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+# filters CMake output to be more like nan-makefiles
+
+FILTER="^\[ *[0-9]*%] \|^Built target \|^Scanning "
+make $@ | \
+		sed -u -e 's/^Linking .*\//Linking /' | \
+		sed -u -e 's/^.*\//  /' | \
+		grep --line-buffered -v "$FILTER"
+
+echo "Build Done"

build_files/cmake/macros.cmake

@@ -16,6 +16,11 @@
 #
 # The Original Code is Copyright (C) 2006, Blender Foundation
 # All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Jacques Beaurain.
+#
 # ***** END GPL LICENSE BLOCK *****
 
 macro(list_insert_after
@@ -173,23 +178,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 +188,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 +227,6 @@ function(blender_add_lib__impl
 	sources
 	includes
 	includes_sys
-  library_deps
 	)
 
 	# message(STATUS "Configuring library ${name}")
@@ -251,16 +238,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 +262,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 +274,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)
 
@@ -420,11 +381,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})
@@ -453,11 +422,8 @@ 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})
@@ -468,6 +434,12 @@ function(setup_liblinks
 	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()
@@ -481,9 +453,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()
@@ -568,6 +537,267 @@ 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_editor_hair
+
+		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)
@@ -713,7 +943,7 @@ macro(remove_strict_flags)
 	endif()
 
 	if(MSVC)
-    remove_cc_flag(/w34189) # Restore warn C4189 (unused variable) back to w4 
+		# TODO
 	endif()
 
 endmacro()
@@ -955,7 +1185,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
@@ -1238,26 +1467,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

@@ -26,7 +26,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.git/)
 	find_package(Git)
 	if(GIT_FOUND)
 		# message(STATUS "Found Git: ${GIT_EXECUTABLE}")
-    execute_process(COMMAND git rev-parse --short=12 HEAD
+		execute_process(COMMAND git rev-parse --short HEAD
 		                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 		                OUTPUT_VARIABLE MY_WC_HASH
 		                OUTPUT_STRIP_TRAILING_WHITESPACE
@@ -86,7 +86,7 @@ if(WIN32)
 	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(CPACK_WIX_UPGRADE_GUID "B767E4FD-7DE7-4094-B051-3AE62E13A17A")
 

build_files/cmake/platform/platform_apple.cmake

@@ -16,11 +16,14 @@
 #
 # The Original Code is Copyright (C) 2016, Blender Foundation
 # All rights reserved.
+#
+# Contributor(s): Sergey Sharybin.
+#
 # ***** END GPL LICENSE BLOCK *****
 
 # 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 +184,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,24 +385,13 @@ if(WITH_CYCLES_EMBREE)
 	set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -Xlinker -stack_size -Xlinker 0x100000")
 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")
-    # Use OpenMP from our precompiled libraries.
-    message(STATUS "Using ${LIBDIR}/openmp for OpenMP")
-    set(OPENMP_CUSTOM ON)
-    set(OPENMP_FOUND ON)
-    set(OpenMP_C_FLAGS "-Xclang -fopenmp -I'${LIBDIR}/openmp/include'")
-    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.
-    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)
+	execute_process(COMMAND ${CMAKE_C_COMPILER} --version OUTPUT_VARIABLE COMPILER_VENDOR)
+	string(SUBSTRING "${COMPILER_VENDOR}" 0 5 VENDOR_NAME) # truncate output
+	if(${VENDOR_NAME} MATCHES "Apple") # Apple does not support OpenMP reliable with gcc and not with clang
+		set(WITH_OPENMP OFF)
+	else() # vanilla gcc or clang_omp support OpenMP
+		message(STATUS "Using special OpenMP enabled compiler !") # letting find_package(OpenMP) module work for gcc
 	endif()
 endif()
 

build_files/cmake/platform/platform_apple_xcode.cmake

@@ -16,6 +16,9 @@
 #
 # The Original Code is Copyright (C) 2016, Blender Foundation
 # All rights reserved.
+#
+# Contributor(s): Jacques Beaurain.
+#
 # ***** END GPL LICENSE BLOCK *****
 
 # Xcode and system configuration for Apple.
@@ -93,14 +96,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

@@ -16,6 +16,9 @@
 #
 # The Original Code is Copyright (C) 2016, Blender Foundation
 # All rights reserved.
+#
+# Contributor(s): Sergey Sharybin.
+#
 # ***** END GPL LICENSE BLOCK *****
 
 # Libraries configuration for any *nix system including Linux and Unix.
@@ -39,10 +42,6 @@ if(EXISTS ${LIBDIR})
 	set(WITH_OPENMP_STATIC ON)
 endif()
 
-if(WITH_STATIC_LIBS)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libstdc++")
-endif()
-
 # Wrapper to prefer static libraries
 macro(find_package_wrapper)
 	if(WITH_STATIC_LIBS)
@@ -156,7 +155,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()
@@ -246,17 +245,13 @@ if(WITH_OPENVDB)
 	find_package_wrapper(OpenVDB)
 	find_package_wrapper(TBB)
 	find_package_wrapper(Blosc)
-  if(NOT TBB_FOUND)
-    set(WITH_OPENVDB OFF)
-    set(WITH_OPENVDB_BLOSC OFF)
-    message(STATUS "TBB not found, disabling OpenVDB")
-  elseif(NOT OPENVDB_FOUND)
+	if(NOT OPENVDB_FOUND OR NOT TBB_FOUND)
 		set(WITH_OPENVDB OFF)
 		set(WITH_OPENVDB_BLOSC OFF)
 		message(STATUS "OpenVDB not found, disabling it")
 	elseif(NOT BLOSC_FOUND)
 		set(WITH_OPENVDB_BLOSC OFF)
-    message(STATUS "Blosc not found, disabling it for OpenVBD")
+		message(STATUS "Blosc not found, disabling it")
 	endif()
 endif()
 

build_files/cmake/platform/platform_win32.cmake

@@ -16,6 +16,9 @@
 #
 # The Original Code is Copyright (C) 2016, Blender Foundation
 # All rights reserved.
+#
+# Contributor(s): Sergey Sharybin.
+#
 # ***** END GPL LICENSE BLOCK *****
 
 # Libraries configuration for Windows.
@@ -37,7 +40,7 @@ if(CMAKE_C_COMPILER_ID MATCHES "Clang")
 	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)
@@ -170,10 +173,7 @@ if(NOT DEFINED LIBDIR)
 		set(LIBDIR_BASE "windows")
 	endif()
 	# Can be 1910..1912
-  if(MSVC_VERSION GREATER 1919)
-    message(STATUS "Visual Studio 2019 detected.")
-    set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
-  elseif(MSVC_VERSION GREATER 1909)
+	if(MSVC_VERSION GREATER 1909)
 		message(STATUS "Visual Studio 2017 detected.")
 		set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/${LIBDIR_BASE}_vc14)
 	elseif(MSVC_VERSION EQUAL 1900)
@@ -190,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})
@@ -345,8 +339,6 @@ if(WITH_PYTHON)
 	string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
 	# 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)
-  set(PYTHON_LIBRARY_DEBUG ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}_d.lib)
-
 	unset(_PYTHON_VERSION_NO_DOTS)
 
 	# Shared includes for both vc2008 and vc2010
@@ -354,7 +346,7 @@ if(WITH_PYTHON)
 
 	# 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)
@@ -435,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)

build_files/cmake/project_info.py

@@ -16,6 +16,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
+# Contributor(s): Campbell Barton, M.G. Kishalmi
+#
 # ***** END GPL LICENSE BLOCK *****
 
 # <pep8 compliant>

build_files/cmake/project_source_info.py

@@ -14,6 +14,8 @@
 # along with this program; if not, write to the Free Software Foundation,
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
+# Contributor(s): Campbell Barton
+#
 # ***** END GPL LICENSE BLOCK *****
 
 # <pep8 compliant>

build_files/package_spec/build_archive.py

@@ -29,7 +29,7 @@ try:
         os.remove(package_archive)
     if os.path.exists(package_dir):
         shutil.rmtree(package_dir)
-except Exception as ex:
+except Exception, ex:
     sys.stderr.write('Failed to clean up old package files: ' + str(ex) + '\n')
     sys.exit(1)
 
@@ -40,7 +40,7 @@ try:
     for f in os.listdir(package_dir):
         if f.startswith('makes'):
             os.remove(os.path.join(package_dir, f))
-except Exception as ex:
+except Exception, ex:
     sys.stderr.write('Failed to copy install directory: ' + str(ex) + '\n')
     sys.exit(1)
 
@@ -58,13 +58,13 @@ try:
         sys.exit(-1)
 
     subprocess.call(archive_cmd)
-except Exception as ex:
+except Exception, ex:
     sys.stderr.write('Failed to create package archive: ' + str(ex) + '\n')
     sys.exit(1)
 
 # empty temporary package dir
 try:
     shutil.rmtree(package_dir)
-except Exception as ex:
+except Exception, ex:
     sys.stderr.write('Failed to clean up package directory: ' + str(ex) + '\n')
     sys.exit(1)

build_files/windows/autodetect_msvc.cmd

@@ -3,9 +3,6 @@ echo No explicit msvc version requested, autodetecting version.
 call "%~dp0\detect_msvc2017.cmd"
 if %ERRORLEVEL% EQU 0 goto DetectionComplete
 
-call "%~dp0\detect_msvc2019.cmd"
-if %ERRORLEVEL% EQU 0 goto DetectionComplete
-
 call "%~dp0\detect_msvc2015.cmd"
 if %ERRORLEVEL% EQU 0 goto DetectionComplete
 

build_files/windows/check_libraries.cmd

@@ -1,6 +1,5 @@
 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
 
 if "%BUILD_ARCH%"=="x64" (
 	set BUILD_VS_SVNDIR=win64_%BUILD_VS_LIBDIRPOST%

build_files/windows/check_submodules.cmd

@@ -1,4 +1,4 @@
-if NOT exist "%BLENDER_DIR%\source\tools\.git" (
+if NOT exist "%BLENDER_DIR%/source/tools" (
 	echo Checking out sub-modules 
 	if not "%GIT%" == "" (
 		"%GIT%" submodule update --init --recursive --progress

build_files/windows/configure_msbuild.cmd

@@ -1,5 +1,3 @@
-set BUILD_GENERATOR_POST=
-set BUILD_PLATFORM_SELECT=
 if "%BUILD_ARCH%"=="x64" (
 	set MSBUILD_PLATFORM=x64
 ) else if "%BUILD_ARCH%"=="x86" (
@@ -11,7 +9,7 @@ if "%BUILD_ARCH%"=="x64" (
 )
 
 if "%WITH_CLANG%"=="1" (
-	set CLANG_CMAKE_ARGS=-T"llvm"
+	set CLANG_CMAKE_ARGS=-T"LLVM-vs2017"
 	if "%WITH_ASAN%"=="1" (
 		set ASAN_CMAKE_ARGS=-DWITH_COMPILER_ASAN=On
 	)
@@ -25,14 +23,7 @@ if "%WITH_CLANG%"=="1" (
 if "%WITH_PYDEBUG%"=="1" (
 	set PYDEBUG_CMAKE_ARGS=-DWINDOWS_PYTHON_DEBUG=On
 )
-
-if "%BUILD_VS_YEAR%"=="2019" (
-	set BUILD_PLATFORM_SELECT=-A %MSBUILD_PLATFORM%
-) else (
-	set BUILD_GENERATOR_POST=%WINDOWS_ARCH%
-)
-
-set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Visual Studio %BUILD_VS_VER% %BUILD_VS_YEAR%%BUILD_GENERATOR_POST%" %BUILD_PLATFORM_SELECT% %TESTS_CMAKE_ARGS% %CLANG_CMAKE_ARGS% %ASAN_CMAKE_ARGS% %PYDEBUG_CMAKE_ARGS%
+set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -G "Visual Studio %BUILD_VS_VER% %BUILD_VS_YEAR%%WINDOWS_ARCH%" %TESTS_CMAKE_ARGS% %CLANG_CMAKE_ARGS% %ASAN_CMAKE_ARGS% %PYDEBUG_CMAKE_ARGS%
 
 if NOT EXIST %BUILD_DIR%\nul (
 	mkdir %BUILD_DIR%
@@ -62,7 +53,7 @@ if "%MUST_CONFIGURE%"=="1" (
 		-H%BLENDER_DIR% ^
 		-B%BUILD_DIR% 
 
-	if errorlevel 1 (
+	if %ERRORLEVEL% NEQ 0 (
 		echo "Configuration Failed"
 		exit /b 1
 	)

build_files/windows/detect_msvc2017.cmd

@@ -1,3 +1,76 @@
+if NOT "%verbose%" == "" (
+	echo Detecting msvc 2017
+)
 set BUILD_VS_VER=15
 set BUILD_VS_YEAR=2017
-call "%~dp0\detect_msvc_vswhere.cmd"
+set ProgramFilesX86=%ProgramFiles(x86)%
+if not exist "%ProgramFilesX86%" set ProgramFilesX86=%ProgramFiles%
+
+set vs_where=%ProgramFilesX86%\Microsoft Visual Studio\Installer\vswhere.exe
+if not exist "%vs_where%" (
+	if NOT "%verbose%" == "" (
+		echo Visual Studio 2017 ^(15.2 or newer^) is not detected
+	)
+	goto FAIL
+)
+
+if NOT "%verbose%" == "" (
+		echo "%vs_where%" -latest %VSWHERE_ARGS% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64`
+	)
+
+for /f "usebackq tokens=1* delims=: " %%i in (`"%vs_where%" -latest %VSWHERE_ARGS% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64`) do (
+	if /i "%%i"=="installationPath" set VS_InstallDir=%%j
+)
+
+if "%VS_InstallDir%"=="" (
+	if NOT "%verbose%" == "" (
+		echo Visual Studio is detected but the "Desktop development with C++" workload has not been instlled
+		goto FAIL
+	)
+)
+
+set VCVARS=%VS_InstallDir%\VC\Auxiliary\Build\vcvarsall.bat
+if exist "%VCVARS%" (
+	call "%VCVARS%" %BUILD_ARCH%
+) else (
+	if NOT "%verbose%" == "" (
+		echo "%VCVARS%" not found
+	)
+	goto FAIL
+)
+
+rem try msbuild
+msbuild /version > NUL 
+if errorlevel 1 (
+	if NOT "%verbose%" == "" (
+		echo Visual Studio %BUILD_VS_YEAR% msbuild not found
+	)
+	goto FAIL
+)
+
+if NOT "%verbose%" == "" (
+		echo Visual Studio %BUILD_VS_YEAR% msbuild found 
+)
+
+REM try the c++ compiler
+cl 2> NUL 1>&2
+if errorlevel 1 (
+	if NOT "%verbose%" == "" (
+		echo Visual Studio %BUILD_VS_YEAR% C/C++ Compiler not found
+	)
+	goto FAIL
+)
+
+if NOT "%verbose%" == "" (
+		echo Visual Studio %BUILD_VS_YEAR% C/C++ Compiler found
+)
+
+if NOT "%verbose%" == "" (
+	echo Visual Studio 2017 is detected successfully  
+)
+goto EOF
+
+:FAIL
+exit /b 1 
+
+:EOF

build_files/windows/detect_msvc2019.cmd

@@ -1,3 +0,0 @@
-set BUILD_VS_VER=16
-set BUILD_VS_YEAR=2019
-call "%~dp0\detect_msvc_vswhere.cmd"

build_files/windows/detect_msvc_vswhere.cmd

@@ -1,79 +0,0 @@
-if NOT "%verbose%" == "" (
-	echo Detecting msvc %BUILD_VS_YEAR%
-)
-
-set ProgramFilesX86=%ProgramFiles(x86)%
-if not exist "%ProgramFilesX86%" set ProgramFilesX86=%ProgramFiles%
-
-set vs_where=%ProgramFilesX86%\Microsoft Visual Studio\Installer\vswhere.exe
-if not exist "%vs_where%" (
-	if NOT "%verbose%" == "" (
-		echo Visual Studio %BUILD_VS_YEAR% is not detected
-	)
-	goto FAIL
-)
-
-if NOT "%verbose%" == "" (
-		echo "%vs_where%" -latest %VSWHERE_ARGS% -version ^[%BUILD_VS_VER%.0^,%BUILD_VS_VER%.99^) -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64
-	)
-
-for /f "usebackq tokens=1* delims=: " %%i in (`"%vs_where%" -latest -version ^[%BUILD_VS_VER%.0^,%BUILD_VS_VER%.99^) %VSWHERE_ARGS% -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64`) do (
-	if /i "%%i"=="installationPath" set VS_InstallDir=%%j
-)
-
-if NOT "%verbose%" == "" (
-	echo VS_Installdir="%VS_InstallDir%"
-)
-
-if "%VS_InstallDir%"=="" (
-	if NOT "%verbose%" == "" (
-		echo Visual Studio is detected but the "Desktop development with C++" workload has not been instlled
-		goto FAIL
-	)
-)
-
-set VCVARS=%VS_InstallDir%\VC\Auxiliary\Build\vcvarsall.bat
-if exist "%VCVARS%" (
-	call "%VCVARS%" %BUILD_ARCH%
-) else (
-	if NOT "%verbose%" == "" (
-		echo "%VCVARS%" not found
-	)
-	goto FAIL
-)
-
-rem try msbuild
-msbuild /version > NUL 
-if errorlevel 1 (
-	if NOT "%verbose%" == "" (
-		echo Visual Studio %BUILD_VS_YEAR% msbuild not found
-	)
-	goto FAIL
-)
-
-if NOT "%verbose%" == "" (
-		echo Visual Studio %BUILD_VS_YEAR% msbuild found 
-)
-
-REM try the c++ compiler
-cl 2> NUL 1>&2
-if errorlevel 1 (
-	if NOT "%verbose%" == "" (
-		echo Visual Studio %BUILD_VS_YEAR% C/C++ Compiler not found
-	)
-	goto FAIL
-)
-
-if NOT "%verbose%" == "" (
-		echo Visual Studio %BUILD_VS_YEAR% C/C++ Compiler found
-)
-
-if NOT "%verbose%" == "" (
-	echo Visual Studio %BUILD_VS_YEAR% is detected successfully  
-)
-goto EOF
-
-:FAIL
-exit /b 1 
-
-:EOF

build_files/windows/format.cmd

@@ -1,25 +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
-)
-if EXIST %BLENDER_DIR%\..\lib\windows_vc14\llvm\bin\clang-format.exe (
-    set CF_PATH=..\lib\windows_vc14\llvm\bin
-    goto detect_done
-)
-
-echo clang-format not found
-exit /b 1
-
-:detect_done
-echo found clang-format in %CF_PATH%
-
-REM TODO(sergey): Switch to Python from libraries when available.
-set PYTHON="python.exe"
-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% ^
@@ -52,17 +50,10 @@ if NOT "%1" == "" (
 	) else if "%1" == "2017pre" (
 		set BUILD_VS_YEAR=2017
 		set VSWHERE_ARGS=-prerelease
+		set BUILD_VS_YEAR=2017
 	) else if "%1" == "2017b" (
 		set BUILD_VS_YEAR=2017
 		set VSWHERE_ARGS=-products Microsoft.VisualStudio.Product.BuildTools
-	) else if "%1" == "2019" (
-		set BUILD_VS_YEAR=2019
-	) else if "%1" == "2019pre" (
-		set BUILD_VS_YEAR=2019
-		set VSWHERE_ARGS=-prerelease
-	) else if "%1" == "2019b" (
-		set BUILD_VS_YEAR=2019
-		set VSWHERE_ARGS=-products Microsoft.VisualStudio.Product.BuildTools
 	) else if "%1" == "2015" (
 		set BUILD_VS_YEAR=2015
 	) else if "%1" == "packagename" (
@@ -70,8 +61,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" (
@@ -79,22 +68,12 @@ 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!
 		exit /b 1

build_files/windows/reset_variables.cmd

@@ -18,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=
@@ -29,4 +27,3 @@ set CLANG_CMAKE_ARGS=
 set ASAN_CMAKE_ARGS=
 set WITH_PYDEBUG=
 set PYDEBUG_CMAKE_ARGS=
-set FORMAT=

build_files/windows/show_help.cmd

@@ -9,16 +9,14 @@ 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 - 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^)
@@ -30,7 +28,6 @@ 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,20 @@
-if "%BUILD_UPDATE_SVN%" == "1" (
 if "%SVN%" == "" (
 	echo svn not found, cannot update libraries
 	goto UPDATE_GIT
 )
 "%SVN%" up "%BLENDER_DIR%/../lib/*"
-)
+
 :UPDATE_GIT
 
-if "%BUILD_UPDATE_GIT%" == "1" (
 if "%GIT%" == "" (
 	echo Git not found, cannot update code
 	goto EOF
 )
 "%GIT%" pull --rebase
-	"%GIT%" submodule foreach git pull --rebase origin master
-)
+"%GIT%" submodule update --init --recursive
+rem Use blender2.8 branch for submodules that have it.
+"%GIT%" submodule foreach "git checkout blender2.8 || git checkout master"
+"%GIT%" submodule foreach git pull --rebase origin
+
+
 :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

@@ -1,4 +1,4 @@
-# Doxyfile 1.8.15
+# Doxyfile 1.8.11
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -17,11 +17,11 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 
-# This tag specifies the encoding used for all characters in the configuration
-# file that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
 # The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
@@ -93,14 +93,6 @@ ALLOW_UNICODE_NAMES    = NO
 
 OUTPUT_LANGUAGE        = English
 
-# The OUTPUT_TEXT_DIRECTION tag is used to specify the direction in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all generated output in the proper direction.
-# Possible values are: None, LTR, RTL and Context.
-# The default value is: None.
-
-OUTPUT_TEXT_DIRECTION  = None
-
 # If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
 # descriptions after the members that are listed in the file and class
 # documentation (similar to Javadoc). Set to NO to disable this.
@@ -244,12 +236,7 @@ TAB_SIZE               = 4
 # will allow you to put the command \sideeffect (or @sideeffect) in the
 # documentation, which will result in a user-defined paragraph with heading
 # "Side Effects:". You can put \n's in the value part of an alias to insert
-# newlines (in the resulting output). You can put ^^ in the value part of an
-# alias to insert a newline as if a physical newline was in the original file.
-# When you need a literal { or } or , in the value part of an alias you have to
-# escape them by means of a backslash (\), this can lead to conflicts with the
-# commands \{ and \} for these it is advised to use the version @{ and @} or use
-# a double escape (\\{ and \\})
+# newlines.
 
 ALIASES                =
 
@@ -287,26 +274,17 @@ OPTIMIZE_FOR_FORTRAN   = NO
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
-# Set the OPTIMIZE_OUTPUT_SLICE tag to YES if your project consists of Slice
-# sources only. Doxygen will then generate output that is more tailored for that
-# language. For instance, namespaces will be presented as modules, types will be
-# separated into more groups, etc.
-# The default value is: NO.
-
-OPTIMIZE_OUTPUT_SLICE  = NO
-
 # Doxygen selects the parser to use depending on the extension of the files it
 # parses. With this tag you can assign which parser to use for a given
 # extension. Doxygen has a built-in mapping, but you can override or extend it
 # using this tag. The format is ext=language, where ext is a file extension, and
 # language is one of the parsers supported by doxygen: IDL, Java, Javascript,
-# Csharp (C#), C, C++, D, PHP, md (Markdown), Objective-C, Python, Slice,
-# Fortran (fixed format Fortran: FortranFixed, free formatted Fortran:
-# FortranFree, unknown formatted Fortran: Fortran. In the later case the parser
-# tries to guess whether the code is fixed or free formatted code, this is the
-# default for Fortran type files), VHDL, tcl. For instance to make doxygen treat
-# .inc files as Fortran files (default is PHP), and .f files as C (default is
-# Fortran), use: inc=Fortran f=C.
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
 #
 # Note: For files without extension you can use no_extension as a placeholder.
 #
@@ -317,7 +295,7 @@ EXTENSION_MAPPING      =
 
 # If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
 # according to the Markdown format, which allows for more readable
-# documentation. See https://daringfireball.net/projects/markdown/ for details.
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
 # The output of markdown processing is further processed by doxygen, so you can
 # mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
 # case of backward compatibilities issues.
@@ -325,15 +303,6 @@ EXTENSION_MAPPING      =
 
 MARKDOWN_SUPPORT       = YES
 
-# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
-# to that level are automatically included in the table of contents, even if
-# they do not have an id attribute.
-# Note: This feature currently applies only to Markdown headings.
-# Minimum value: 0, maximum value: 99, default value: 0.
-# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
-
-TOC_INCLUDE_HEADINGS   = 0
-
 # When enabled doxygen tries to link words that correspond to documented
 # classes, or namespaces to their corresponding documentation. Such a link can
 # be prevented in individual cases by putting a % sign in front of the word or
@@ -359,7 +328,7 @@ BUILTIN_STL_SUPPORT    = NO
 CPP_CLI_SUPPORT        = NO
 
 # Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
-# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
 # will parse them like normal C++ but will assume all classes use public instead
 # of private inheritance when no explicit protection keyword is present.
 # The default value is: NO.
@@ -762,7 +731,7 @@ WARNINGS               = YES
 # will automatically be disabled.
 # The default value is: YES.
 
-WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_UNDOCUMENTED   = YES
 
 # If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
 # potential errors in the documentation, such as not documenting some parameters
@@ -775,8 +744,7 @@ WARN_IF_DOC_ERROR      = YES
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
 # value. If set to NO, doxygen will only warn about wrong or incomplete
-# parameter documentation, but not about the absence of documentation. If
-# EXTRACT_ALL is set to YES then this flag will automatically be disabled.
+# parameter documentation, but not about the absence of documentation.
 # The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
@@ -824,7 +792,7 @@ INPUT                  = doxygen.main.h \
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
 # libiconv (or the iconv built into libc) for the transcoding. See the libiconv
-# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
 # possible encodings.
 # The default value is: UTF-8.
 
@@ -841,8 +809,8 @@ INPUT_ENCODING         = UTF-8
 # If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
 # *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
 # *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
-# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
-# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, *.qsf and *.ice.
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f, *.for, *.tcl,
+# *.vhd, *.vhdl, *.ucf, *.qsf, *.as and *.js.
 
 FILE_PATTERNS          =
 
@@ -859,7 +827,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = ../../build_files \
+EXCLUDE                = ../../build_files, \
                          ../../release
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
@@ -1000,7 +968,7 @@ INLINE_SOURCES         = NO
 STRIP_CODE_COMMENTS    = YES
 
 # If the REFERENCED_BY_RELATION tag is set to YES then for each documented
-# entity all documented functions referencing it will be listed.
+# function all documented functions referencing it will be listed.
 # The default value is: NO.
 
 REFERENCED_BY_RELATION = YES
@@ -1032,12 +1000,12 @@ SOURCE_TOOLTIPS        = YES
 # If the USE_HTAGS tag is set to YES then the references to source code will
 # point to the HTML generated by the htags(1) tool instead of doxygen built-in
 # source browser. The htags tool is part of GNU's global source tagging system
-# (see https://www.gnu.org/software/global/global.html). You will need version
+# (see http://www.gnu.org/software/global/global.html). You will need version
 # 4.8.6 or higher.
 #
 # To use it do the following:
 # - Install the latest version of global
-# - Enable SOURCE_BROWSER and USE_HTAGS in the configuration file
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
 # - Make sure the INPUT points to the root of the source tree
 # - Run doxygen as normal
 #
@@ -1213,17 +1181,6 @@ HTML_COLORSTYLE_GAMMA  = 79
 
 HTML_TIMESTAMP         = YES
 
-# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
-# documentation will contain a main index with vertical navigation menus that
-# are dynamically created via Javascript. If disabled, the navigation index will
-# consists of multiple levels of tabs that are statically embedded in every HTML
-# page. Disable this option to support browsers that do not have Javascript,
-# like the Qt help browser.
-# The default value is: YES.
-# This tag requires that the tag GENERATE_HTML is set to YES.
-
-HTML_DYNAMIC_MENUS     = YES
-
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
 # page has loaded.
@@ -1247,13 +1204,13 @@ HTML_INDEX_NUM_ENTRIES = 100
 
 # If the GENERATE_DOCSET tag is set to YES, additional index files will be
 # generated that can be used as input for Apple's Xcode 3 integrated development
-# environment (see: https://developer.apple.com/xcode/), introduced with OSX
-# 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
 # Makefile in the HTML output directory. Running make will produce the docset in
 # that directory and running make install will install the docset in
 # ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
-# startup. See https://developer.apple.com/library/archive/featuredarticles/Doxy
-# genXcode/_index.html for more information.
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
 # The default value is: NO.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
@@ -1292,7 +1249,7 @@ DOCSET_PUBLISHER_NAME  = Publisher
 # If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
 # additional HTML index files: index.hhp, index.hhc, and index.hhk. The
 # index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
-# (see: https://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
 # Windows.
 #
 # The HTML Help Workshop contains a compiler that can convert all HTML output
@@ -1368,7 +1325,7 @@ QCH_FILE               =
 
 # The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
 # Project output. For more information please see Qt Help Project / Namespace
-# (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#namespace).
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
 # The default value is: org.doxygen.Project.
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1376,7 +1333,7 @@ QHP_NAMESPACE          = org.doxygen.Project
 
 # The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
 # Help Project output. For more information please see Qt Help Project / Virtual
-# Folders (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#virtual-
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
 # folders).
 # The default value is: doc.
 # This tag requires that the tag GENERATE_QHP is set to YES.
@@ -1385,7 +1342,7 @@ QHP_VIRTUAL_FOLDER     = doc
 
 # If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
 # filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
 # filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1393,7 +1350,7 @@ QHP_CUST_FILTER_NAME   =
 
 # The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
 # custom filter to add. For more information please see Qt Help Project / Custom
-# Filters (see: http://doc.qt.io/archives/qt-4.8/qthelpproject.html#custom-
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
 # filters).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
@@ -1401,7 +1358,7 @@ QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
 # project's filter section matches. Qt Help Project / Filter Attributes (see:
-# http://doc.qt.io/archives/qt-4.8/qthelpproject.html#filter-attributes).
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
 # This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
@@ -1494,7 +1451,7 @@ EXT_LINKS_IN_WINDOW    = NO
 
 FORMULA_FONTSIZE       = 10
 
-# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
 # generated for formulas are transparent PNGs. Transparent PNGs are not
 # supported properly for IE 6.0, but are supported on all modern browsers.
 #
@@ -1506,7 +1463,7 @@ FORMULA_FONTSIZE       = 10
 FORMULA_TRANSPARENT    = YES
 
 # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
-# https://www.mathjax.org) which uses client side Javascript for the rendering
+# http://www.mathjax.org) which uses client side Javascript for the rendering
 # instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
 # installed or if you want to formulas look prettier in the HTML output. When
 # enabled you may also need to install MathJax separately and configure the path
@@ -1533,8 +1490,8 @@ MATHJAX_FORMAT         = HTML-CSS
 # MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
 # Content Delivery Network so you can quickly see the result without installing
 # MathJax. However, it is strongly recommended to install a local copy of
-# MathJax from https://www.mathjax.org before deployment.
-# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/.
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
 # This tag requires that the tag USE_MATHJAX is set to YES.
 
 MATHJAX_RELPATH        = http://www.mathjax.org/mathjax
@@ -1595,7 +1552,7 @@ SERVER_BASED_SEARCH    = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: https://xapian.org/).
+# Xapian (see: http://xapian.org/).
 #
 # See the section "External Indexing and Searching" for details.
 # The default value is: NO.
@@ -1608,7 +1565,7 @@ EXTERNAL_SEARCH        = NO
 #
 # Doxygen ships with an example indexer (doxyindexer) and search engine
 # (doxysearch.cgi) which are based on the open source search engine library
-# Xapian (see: https://xapian.org/). See the section "External Indexing and
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
 # Searching" for details.
 # This tag requires that the tag SEARCHENGINE is set to YES.
 
@@ -1660,34 +1617,21 @@ LATEX_OUTPUT           = latex
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
 # invoked.
 #
-# Note that when not enabling USE_PDFLATEX the default is latex when enabling
-# USE_PDFLATEX the default is pdflatex and when in the later case latex is
-# chosen this is overwritten by pdflatex. For specific output languages the
-# default can have been set differently, this depends on the implementation of
-# the output language.
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
 # The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
 # index for LaTeX.
-# Note: This tag is used in the Makefile / make.bat.
-# See also: LATEX_MAKEINDEX_CMD for the part in the generated output file
-# (.tex).
 # The default file is: makeindex.
 # This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# The LATEX_MAKEINDEX_CMD tag can be used to specify the command name to
-# generate index for LaTeX.
-# Note: This tag is used in the generated output file (.tex).
-# See also: MAKEINDEX_CMD_NAME for the part in the Makefile / make.bat.
-# The default value is: \makeindex.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_MAKEINDEX_CMD    = \makeindex
-
 # If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
 # documents. This may be useful for small projects and may help to save some
 # trees in general.
@@ -1822,14 +1766,6 @@ LATEX_BIB_STYLE        = plain
 
 LATEX_TIMESTAMP        = NO
 
-# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
-# path from which the emoji images will be read. If a relative path is entered,
-# it will be relative to the LATEX_OUTPUT directory. If left blank the
-# LATEX_OUTPUT directory will be used.
-# This tag requires that the tag GENERATE_LATEX is set to YES.
-
-LATEX_EMOJI_DIRECTORY  =
-
 #---------------------------------------------------------------------------
 # Configuration options related to the RTF output
 #---------------------------------------------------------------------------
@@ -1869,9 +1805,9 @@ COMPACT_RTF            = NO
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# configuration file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
 #
 # See also section "Doxygen usage" for information on how to generate the
 # default style sheet that doxygen normally uses.
@@ -1880,8 +1816,8 @@ RTF_HYPERLINKS         = NO
 RTF_STYLESHEET_FILE    =
 
 # Set optional variables used in the generation of an RTF document. Syntax is
-# similar to doxygen's configuration file. A template extensions file can be
-# generated using doxygen -e rtf extensionFile.
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
 # This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
@@ -1967,13 +1903,6 @@ XML_OUTPUT             = xml
 
 XML_PROGRAMLISTING     = YES
 
-# If the XML_NS_MEMB_FILE_SCOPE tag is set to YES, doxygen will include
-# namespace members in file scope as well, matching the HTML output.
-# The default value is: NO.
-# This tag requires that the tag GENERATE_XML is set to YES.
-
-XML_NS_MEMB_FILE_SCOPE = NO
-
 #---------------------------------------------------------------------------
 # Configuration options related to the DOCBOOK output
 #---------------------------------------------------------------------------
@@ -2006,9 +1935,9 @@ DOCBOOK_PROGRAMLISTING = NO
 #---------------------------------------------------------------------------
 
 # If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
-# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
-# the structure of the code including all documentation. Note that this feature
-# is still experimental and incomplete at the moment.
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
 # The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
@@ -2431,11 +2360,6 @@ DIAFILE_DIRS           =
 
 PLANTUML_JAR_PATH      =
 
-# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
-# configuration file for plantuml.
-
-PLANTUML_CFG_FILE      =
-
 # When using plantuml, the specified paths are searched for files specified by
 # the !include statement in a plantuml block.
 

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/doxygen/doxygen.source.h

@@ -1,4 +1,10 @@
 
+/** \defgroup blenderplayer Blender Player */
+
+/** \defgroup blc bad level calls
+ *  \ingroup blenderplayer
+ */
+
 /** \defgroup render Rendering
  *  \ingroup blender
  */
@@ -23,14 +29,15 @@
  *  \ingroup python
  */
 
+/** \defgroup blpluginapi Blender pluginapi
+ *  \ingroup blender
+ *  \attention not in use currently
+ */
+
 /* ================================ */
 
 /** \defgroup blender Blender */
 
-/** \defgroup balembic BlenderAlembic
- *  \ingroup blender
- */
-
 /** \defgroup blt BlenTranslation
  *  \ingroup blender
  */
@@ -74,10 +81,6 @@
  *  \ingroup blender
  */
 
-/** \defgroup shader_fx Shader Effects
- *  \ingroup blender
- */
-
 /** \defgroup data DNA, RNA and .blend access*/
 
 /** \defgroup gpu GPU

doc/manpage/blender.1.py

@@ -65,7 +65,7 @@ fw('.TH "BLENDER" "1" "%s" "Blender %s"\n' % (date_string, blender_version.repla
 
 fw('''
 .SH NAME
-blender \- a full-featured 3D application''')
+blender \- a 3D modelling and rendering package''')
 
 fw('''
 .SH SYNOPSIS
@@ -76,9 +76,9 @@ fw('''
 .SH DESCRIPTION
 .PP
 .B blender
-is a full-featured 3D application. It supports the entirety of the 3D pipeline - modeling, rigging, animation, simulation, rendering, compositing, motion tracking, and video editing.
+is a 3D modelling and rendering package. Originating as the in-house software of a high quality animation studio, Blender has proven to be an extremely fast and versatile design instrument. The software has a personal touch, offering a unique approach to the world of Three Dimensions.
 
-Use Blender to create 3D images and animations, films and commercials, content for games, architectural and industrial visualizatons, and scientific visualizations.
+Use Blender to create TV commercials, to make technical visualizations, business graphics, to create content for games, or design user interfaces. You can easy build and manage complex environments. The renderer is versatile and extremely fast. All basic animation principles (curves & keys) are well implemented.
 
 http://www.blender.org''')
 

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:
+file = open(os.path.splitext(bpy.data.filepath)[0] + ".txt", 'w')
+
 for image in bpy.data.images:
-        fs.write("%s %d x %d\n" % (image.filepath, image.size[0], image.size[1]))
+    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,
     )
@@ -50,8 +50,8 @@ class OBJECT_OT_addon_prefs_example(Operator):
     bl_options = {'REGISTER', 'UNDO'}
 
     def execute(self, context):
-        preferences = context.preferences
-        addon_prefs = preferences.addons[__name__].preferences
+        user_preferences = context.user_preferences
+        addon_prefs = user_preferences.addons[__name__].preferences
 
         info = ("Path: %s, Number: %d, Boolean %r" %
                 (addon_prefs.filepath, addon_prefs.number, addon_prefs.boolean))

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()
-