Merge branch 'temp-openxr-blenderside' into soc-2019-openxr

Extends Ghost to include an abstraction for OpenXR, which I refer to as
Ghost-XR. Such an API is the base for the following commit, which introduces VR
support to Blender.

Main features:
* Simple and high-level interface for Blender specific code to call.
* Extensible for muliple graphics backends, currently OpenGL and a DirectX
  compatibility layer are supported.
* Carefully designed error handling strategy allowing Blender to handle errors
  gracefully and with useful error messages.
* OpenXR extension and API-layer management.
* OpenXR session management.
* Basic OpenXR event management.
* Debug utilities for Ghost-XR and OpenXR

For more information on this API, check
https://wiki.blender.org/wiki/Source/Interface/XR.

Reviewed by: Brecht Van Lommel

Differential Revision: https://developer.blender.org/D6188

.clang-format

@@ -132,7 +132,9 @@ PenaltyBreakAssignment: 100
 
 AllowShortFunctionsOnASingleLine: None
 
-SortIncludes: true
+# 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
@@ -191,7 +193,6 @@ ForEachMacros:
   - FOREACH_MAIN_ID_BEGIN
   - FOREACH_MAIN_LISTBASE_BEGIN
   - FOREACH_MAIN_LISTBASE_ID_BEGIN
-  - FOREACH_MESH_BUFFER_CACHE
   - FOREACH_NODETREE_BEGIN
   - FOREACH_OBJECT_BEGIN
   - FOREACH_OBJECT_FLAG_BEGIN
@@ -214,7 +215,6 @@ ForEachMacros:
   - GHASH_ITER_INDEX
   - GPU_SELECT_LOAD_IF_PICKSEL_LIST
   - GP_EDITABLE_STROKES_BEGIN
-  - GP_EVALUATED_STROKES_BEGIN
   - GSET_FOREACH_BEGIN
   - GSET_ITER
   - GSET_ITER_INDEX
@@ -238,6 +238,7 @@ ForEachMacros:
   - LISTBASE_FOREACH_BACKWARD
   - LISTBASE_FOREACH_MUTABLE
   - LISTBASE_FOREACH_BACKWARD_MUTABLE
+  - MAN2D_ITER_AXES_BEGIN
   - MAN_ITER_AXES_BEGIN
   - NODE_INSTANCE_HASH_ITER
   - NODE_SOCKET_TYPES_BEGIN
@@ -245,16 +246,12 @@ ForEachMacros:
   - NODE_TYPES_BEGIN
   - PIXEL_LOOPER_BEGIN
   - PIXEL_LOOPER_BEGIN_CHANNELS
-  - RENDER_PASS_ITER_BEGIN
   - RNA_BEGIN
   - RNA_PROP_BEGIN
   - RNA_STRUCT_BEGIN
   - RNA_STRUCT_BEGIN_SKIP_RNA_TYPE
-  - SCULPT_VERTEX_DUPLICATES_AND_NEIGHBORS_ITER_BEGIN
-  - SCULPT_VERTEX_NEIGHBORS_ITER_BEGIN
   - SEQP_BEGIN
   - SEQ_BEGIN
-  - SURFACE_QUAD_ITER_BEGIN
   - foreach
 
 # Use once we bump the minimum version to version 8.

CMakeLists.txt

@@ -186,7 +186,8 @@ if(APPLE)
   option(WITH_XR_OPENXR   "Enable VR features through the OpenXR specification" OFF)
   mark_as_advanced(WITH_XR_OPENXR)
 else()
-  option(WITH_XR_OPENXR   "Enable VR features through the OpenXR specification" ON)
+  # Disabled until there's more than just the build system stuff. Should be enabled soon.
+  option(WITH_XR_OPENXR   "Enable VR features through the OpenXR specification" OFF)
 endif()
 
 # Compositor
@@ -319,10 +320,6 @@ mark_as_advanced(WITH_SYSTEM_GLOG)
 # Freestyle
 option(WITH_FREESTYLE     "Enable Freestyle (advanced edges rendering)" ON)
 
-# New object types
-option(WITH_NEW_OBJECT_TYPES "Enable new hair and pointcloud objects (use for development only, don't save in files)" OFF)
-mark_as_advanced(WITH_NEW_OBJECT_TYPES)
-
 # Misc
 if(WIN32)
   option(WITH_INPUT_IME "Enable Input Method Editor (IME) for complex Asian character input" ON)
@@ -633,10 +630,9 @@ set_and_warn_dependency(WITH_BOOST WITH_OPENVDB        OFF)
 set_and_warn_dependency(WITH_BOOST WITH_OPENCOLORIO    OFF)
 set_and_warn_dependency(WITH_BOOST WITH_QUADRIFLOW     OFF)
 set_and_warn_dependency(WITH_BOOST WITH_USD            OFF)
-set_and_warn_dependency(WITH_BOOST WITH_ALEMBIC        OFF)
 
 if(WITH_BOOST AND NOT (WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR
-   WITH_OPENVDB OR WITH_OPENCOLORIO OR WITH_USD OR WITH_ALEMBIC))
+   WITH_OPENVDB OR WITH_OPENCOLORIO OR WITH_USD))
   message(STATUS "No dependencies need 'WITH_BOOST' forcing WITH_BOOST=OFF")
   set(WITH_BOOST OFF)
 endif()
@@ -685,7 +681,6 @@ if(WITH_GHOST_SDL OR WITH_HEADLESS)
   set(WITH_X11_ALPHA     OFF)
   set(WITH_GHOST_XDND    OFF)
   set(WITH_INPUT_IME     OFF)
-  set(WITH_XR_OPENXR     OFF)
 endif()
 
 if(WITH_CPU_SSE)

build_files/build_environment/cmake/versions.cmake

@@ -146,8 +146,8 @@ set(PYTHON_URI https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTH
 set(PYTHON_HASH d33e4aae66097051c2eca45ee3604803)
 
 set(TBB_VERSION 2019_U9)
-set(TBB_URI https://github.com/oneapi-src/oneTBB/archive/${TBB_VERSION}.tar.gz)
-set(TBB_HASH 26263622e9187212ec240dcf01b66207)
+set(TBB_URI https://github.com/01org/tbb/archive/${TBB_VERSION}.tar.gz)
+set(TBB_HASH 584edbec127c508f2cd5b6e79ad200fc)
 
 set(OPENVDB_VERSION 7.0.0)
 set(OPENVDB_URI https://github.com/dreamworksanimation/openvdb/archive/v${OPENVDB_VERSION}.tar.gz)

build_files/build_environment/cmake/xr_openxr.cmake

@@ -29,7 +29,6 @@ if(UNIX AND NOT APPLE)
     -DBUILD_WITH_WAYLAND_HEADERS=OFF
     -DBUILD_WITH_XCB_HEADERS=OFF
     -DBUILD_WITH_XLIB_HEADERS=ON
-    -DBUILD_WITH_SYSTEM_JSONCPP=OFF
     -DCMAKE_CXX_FLAGS=-DDISABLE_STD_FILESYSTEM=1
   )
 endif()

build_files/build_environment/install_deps.sh

@@ -63,8 +63,8 @@ build-ffmpeg,build-opencollada,build-alembic,build-embree,build-oidn,build-usd,\
 build-xr-openxr,\
 skip-python,skip-numpy,skip-boost,\
 skip-ocio,skip-openexr,skip-oiio,skip-llvm,skip-osl,skip-osd,skip-openvdb,\
-skip-ffmpeg,skip-opencollada,skip-alembic,skip-embree,skip-oidn,skip-usd,\
-skip-xr-openxr \
+skip-ffmpeg,skip-opencollada,skip-alembic,skip-embree,skip-oidn,skip-usd, \
+skip-xr-openxr\
 -- "$@" \
 )
 
@@ -1289,7 +1289,7 @@ compile_Python() {
 
     ./configure --prefix=$_inst --libdir=$_inst/lib --enable-ipv6 \
         --enable-loadable-sqlite-extensions --with-dbmliborder=bdb \
-        --with-computed-gotos --with-pymalloc --enable-shared
+        --with-computed-gotos --with-pymalloc
 
     make -j$THREADS && make install
     make clean
@@ -1310,8 +1310,6 @@ compile_Python() {
     INFO "Own Python-$PYTHON_VERSION is up to date, nothing to do!"
     INFO "If you want to force rebuild of this lib, use the --force-python option."
   fi
-
-  run_ldconfig "python-$PYTHON_VERSION_MIN"
 }
 
 # ----------------------------------------------------------------------------
@@ -3130,7 +3128,7 @@ compile_XR_OpenXR_SDK() {
   fi
 
   # To be changed each time we make edits that would modify the compiled result!
-  xr_openxr_magic=2
+  xr_openxr_magic=0
   _init_xr_openxr_sdk
 
   # Clean install if needed!
@@ -3187,9 +3185,8 @@ compile_XR_OpenXR_SDK() {
     cmake_d="$cmake_d -D BUILD_WITH_WAYLAND_HEADERS=OFF"
     cmake_d="$cmake_d -D BUILD_WITH_XCB_HEADERS=OFF"
     cmake_d="$cmake_d -D BUILD_WITH_XLIB_HEADERS=ON"
-    cmake_d="$cmake_d -D BUILD_WITH_SYSTEM_JSONCPP=OFF"
 
-    cmake $cmake_d "-DCMAKE_CXX_FLAGS=-DDISABLE_STD_FILESYSTEM=1" ..
+    cmake $cmake_d ..
 
     make -j$THREADS && make install
     make clean
@@ -5191,7 +5188,7 @@ print_info() {
   PRINT ""
   PRINT "If you're using CMake add this to your configuration flags:"
 
-  _buildargs="-U *SNDFILE* -U PYTHON* -U *BOOST* -U *Boost*"
+  _buildargs="-U *SNDFILE* -U *PYTHON* -U *BOOST* -U *Boost*"
   _buildargs="$_buildargs -U *OPENCOLORIO* -U *OPENEXR* -U *OPENIMAGEIO* -U *LLVM* -U *CYCLES*"
   _buildargs="$_buildargs -U *OPENSUBDIV* -U *OPENVDB* -U *COLLADA* -U *FFMPEG* -U *ALEMBIC* -U *USD*"
 

build_files/buildbot/config/blender_linux.cmake

@@ -7,6 +7,9 @@ message(STATUS "Building in CentOS 7 64bit environment")
 set(LIBDIR_NAME "linux_centos7_x86_64")
 set(WITH_CXX11_ABI           OFF CACHE BOOL "" FORCE)
 
+# Default to only build Blender
+set(WITH_BLENDER             ON  CACHE BOOL "" FORCE)
+
 # ######## Linux-specific build options ########
 # Options which are specific to Linux-only platforms
 
@@ -17,6 +20,12 @@ set(WITH_DOC_MANPAGE         OFF CACHE BOOL "" FORCE)
 
 set(WITH_JACK_DYNLOAD        ON  CACHE BOOL "" FORCE)
 set(WITH_SDL_DYNLOAD         ON  CACHE BOOL "" FORCE)
+set(WITH_SYSTEM_GLEW         OFF CACHE BOOL "" FORCE)
+
+set(WITH_OPENMP_STATIC       ON  CACHE BOOL "" FORCE)
+
+set(WITH_PYTHON_INSTALL_NUMPY    ON CACHE BOOL "" FORCE)
+set(WITH_PYTHON_INSTALL_REQUESTS ON CACHE BOOL "" FORCE)
 
 # ######## Release environment specific settings ########
 
@@ -24,5 +33,13 @@ set(LIBDIR "${CMAKE_CURRENT_LIST_DIR}/../../../../lib/${LIBDIR_NAME}" CACHE STRI
 
 # Platform specific configuration, to ensure static linking against everything.
 
+set(Boost_USE_STATIC_LIBS    ON CACHE BOOL "" FORCE)
+
+# We need to link OpenCOLLADA against PCRE library. Even though it is not installed
+# on /usr, we do not really care -- all we care is PCRE_FOUND be TRUE and its
+# library pointing to a valid one.
+set(PCRE_INCLUDE_DIR          "/usr/include"                        CACHE STRING "" FORCE)
+set(PCRE_LIBRARY              "${LIBDIR}/opencollada/lib/libpcre.a" CACHE STRING "" FORCE)
+
 # Additional linking libraries
 set(CMAKE_EXE_LINKER_FLAGS   "-lrt -static-libstdc++ -no-pie"  CACHE STRING "" FORCE)

build_files/cmake/Modules/FindLLVM.cmake

@@ -49,7 +49,6 @@ if(NOT LLVM_ROOT_DIR)
           OUTPUT_VARIABLE LLVM_ROOT_DIR
           OUTPUT_STRIP_TRAILING_WHITESPACE)
   set(LLVM_ROOT_DIR ${LLVM_ROOT_DIR} CACHE PATH "Path to the LLVM installation")
-  set(LLVM_INCLUDE_DIRS ${LLVM_ROOT_DIR}/include CACHE PATH "Path to the LLVM include directory")
 endif()
 if(NOT LLVM_LIBPATH)
   execute_process(COMMAND ${LLVM_CONFIG} --libdir

build_files/cmake/Modules/FindOpenImageDenoise.cmake

@@ -95,7 +95,7 @@ FIND_LIBRARY(OPENIMAGEDENOISE_LIBRARY
 # handle the QUIETLY and REQUIRED arguments and set OPENIMAGEDENOISE_FOUND to TRUE if
 # all listed variables are TRUE
 INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageDenoise DEFAULT_MSG
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OPENIMAGEDENOISE DEFAULT_MSG
     OPENIMAGEDENOISE_LIBRARY OPENIMAGEDENOISE_INCLUDE_DIR)
 
 IF(OPENIMAGEDENOISE_FOUND)

build_files/cmake/platform/platform_apple.cmake

@@ -222,10 +222,12 @@ if(WITH_OPENCOLLADA)
     -lMathMLSolver
     -lGeneratedSaxParser
     -lbuffer -lftoa -lUTF
+    ${OPENCOLLADA_LIBPATH}/libxml2.a
   )
-  # PCRE and XML2 are bundled with OpenCollada.
+  # PCRE is bundled with openCollada
+  # set(PCRE ${LIBDIR}/pcre)
+  # set(PCRE_LIBPATH ${PCRE}/lib)
   set(PCRE_LIBRARIES pcre)
-  set(XML2_LIBRARIES xml2)
 endif()
 
 if(WITH_SDL)
@@ -447,9 +449,7 @@ if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
   # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
 endif()
-
-# Avoid conflicts with Luxrender, and other plug-ins that may use the same
-# libraries as Blender with a different version or build options.
+# Get rid of eventually clashes, we export some symbols explicitly as local
 set(PLATFORM_LINKFLAGS
   "${PLATFORM_LINKFLAGS} -Xlinker -unexported_symbols_list -Xlinker '${CMAKE_SOURCE_DIR}/source/creator/osx_locals.map'"
 )

build_files/cmake/platform/platform_apple_xcode.cmake

@@ -20,6 +20,10 @@
 
 # Xcode and system configuration for Apple.
 
+# require newer cmake on osx because of version handling,
+# older cmake cannot handle 2 digit subversion!
+cmake_minimum_required(VERSION 3.0.0)
+
 if(NOT CMAKE_OSX_ARCHITECTURES)
   set(CMAKE_OSX_ARCHITECTURES x86_64 CACHE STRING
     "Choose the architecture you want to build Blender for: i386, x86_64 or ppc"
@@ -41,98 +45,54 @@ execute_process(
     OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE)
 string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) # truncate to bundlepath in any case
 
-if(NOT ${CMAKE_GENERATOR} MATCHES "Xcode")
-  # Unix makefile generator does not fill XCODE_VERSION var, so we get it with a command.
-  # Note that `xcodebuild -version` gives output in two lines: first line will include
-  # Xcode version, second one will include build number. We are only interested in the
-  # former one. Here is an example of the output:
-  #   Xcode 11.4
-  #   Build version 11E146
-  # The expected XCODE_VERSION in this case is 11.4.
+if(${CMAKE_GENERATOR} MATCHES "Xcode")
 
+  # earlier xcode has no bundled developer dir, no sense in getting xcode path from
+  if(${XCODE_VERSION} VERSION_GREATER 4.2)
+    # reduce to XCode name without dp extension
+    string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME)
+    if(${DP_NAME} MATCHES Xcode5)
+      set(XCODE_VERSION 5)
+    endif()
+  endif()
+
+  ##### cmake incompatibility with xcode  4.3 and higher #####
+  if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var
+    message(FATAL_ERROR "Xcode 4.3 and higher must be used with cmake 2.8-8 or higher")
+  endif()
+  ### end cmake incompatibility with xcode 4.3 and higher ###
+
+  if(${XCODE_VERSION} VERSION_EQUAL 4 OR ${XCODE_VERSION} VERSION_GREATER 4 AND ${XCODE_VERSION} VERSION_LESS 4.3)
+    # Xcode 4 defaults to the Apple LLVM Compiler.
+    # Override the default compiler selection because Blender only compiles with gcc up to xcode 4.2
+    set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
+    message(STATUS "Setting compiler to: " ${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION})
+  endif()
+else() # unix makefile generator does not fill XCODE_VERSION var, so we get it with a command
   execute_process(COMMAND xcodebuild -version OUTPUT_VARIABLE XCODE_VERS_BUILD_NR)
-
-  # Convert output to a single line by replacling newlines with spaces.
-  # This is needed because regex replace can not operate through the newline character
-  # and applies substitutions for each individual lines.
-  string(REPLACE "\n" " " XCODE_VERS_BUILD_NR_SINGLE_LINE "${XCODE_VERS_BUILD_NR}")
-
-  string(REGEX REPLACE "(.*)Xcode ([0-9\\.]+).*" "\\2" XCODE_VERSION "${XCODE_VERS_BUILD_NR_SINGLE_LINE}")
-
+  string(SUBSTRING "${XCODE_VERS_BUILD_NR}" 6 3 XCODE_VERSION) # truncate away build-nr
   unset(XCODE_VERS_BUILD_NR)
-  unset(XCODE_VERS_BUILD_NR_SINGLE_LINE)
 endif()
 
 message(STATUS "Detected OS X ${OSX_SYSTEM} and Xcode ${XCODE_VERSION} at ${XCODE_BUNDLE}")
 
-# Older Xcode versions had different approach to the directory hiearchy.
-# Require newer Xcode which is also have better chances of being able to compile with the
-# required deployment target.
-#
-# NOTE: Xcode version 8.2 is the latest one which runs on macOS 10.11.
-if(${XCODE_VERSION} VERSION_LESS 8.2)
-  message(FATAL_ERROR "Only Xcode version 8.2 and newer is supported")
-endif()
-
-# note: xcode-select path could be ambiguous,
-# cause /Applications/Xcode.app/Contents/Developer or /Applications/Xcode.app would be allowed
-# so i use a selfcomposed bundlepath here
-set(OSX_SYSROOT_PREFIX ${XCODE_BUNDLE}/Contents/Developer/Platforms/MacOSX.platform)
-message(STATUS "OSX_SYSROOT_PREFIX: " ${OSX_SYSROOT_PREFIX})
-
-# Collect list of OSX system versions which will be used to detect path to corresponding SDK.
-# Start with macOS SDK version reported by xcodebuild and include possible extra ones.
-#
-# The reason for need of extra ones is because it's possible that xcodebuild will report
-# SDK version in the full manner (aka major.minor.patch), but the actual path will only
-# include major.minor.
-#
-# This happens, for example, on macOS Catalina 10.15.4 and Xcode 11.4: xcodebuild on this
-# system outputs "10.15.4", but the actual SDK path is MacOSX10.15.sdk.
-#
-# This should be safe from picking wrong SDK version because (a) xcodebuild reports full semantic
-# SDK version, so such SDK does exist on the system. And if it doesn't exist with full version
-# in the path, what SDK is in the major.minor folder then.
-set(OSX_SDK_TEST_VERSIONS ${OSX_SYSTEM})
-if(OSX_SYSTEM MATCHES "([0-9]+)\\.([0-9]+)\\.([0-9]+)")
-  string(REGEX REPLACE "([0-9]+)\\.([0-9]+)\\.([0-9]+)" "\\1.\\2" OSX_SYSTEM_NO_PATCH "${OSX_SYSTEM}")
-  list(APPEND OSX_SDK_TEST_VERSIONS ${OSX_SYSTEM_NO_PATCH})
-  unset(OSX_SYSTEM_NO_PATCH)
-endif()
-
-# Loop through all possible versions and pick the first one which resolves to a valid SDK path.
-set(OSX_SDK_PATH)
-set(OSX_SDK_FOUND FALSE)
-set(OSX_SDK_PREFIX ${OSX_SYSROOT_PREFIX}/Developer/SDKs)
-set(OSX_SDKROOT)
-foreach(OSX_SDK_VERSION ${OSX_SDK_TEST_VERSIONS})
-  set(CURRENT_OSX_SDK_PATH "${OSX_SDK_PREFIX}/MacOSX${OSX_SDK_VERSION}.sdk")
-  if(EXISTS ${CURRENT_OSX_SDK_PATH})
-    set(OSX_SDK_PATH "${CURRENT_OSX_SDK_PATH}")
-    set(OSX_SDKROOT macosx${OSX_SDK_VERSION})
-    set(OSX_SDK_FOUND TRUE)
-    break()
+if(${XCODE_VERSION} VERSION_LESS 4.3)
+  # use guaranteed existing sdk
+  set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE)
+else()
+  # note: xcode-select path could be ambiguous,
+  # cause /Applications/Xcode.app/Contents/Developer or /Applications/Xcode.app would be allowed
+  # so i use a selfcomposed bundlepath here
+  set(OSX_SYSROOT_PREFIX ${XCODE_BUNDLE}/Contents/Developer/Platforms/MacOSX.platform)
+  message(STATUS "OSX_SYSROOT_PREFIX: " ${OSX_SYSROOT_PREFIX})
+  set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
+  set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
+  if(${CMAKE_GENERATOR} MATCHES "Xcode")
+    # to silence sdk not found warning, just overrides CMAKE_OSX_SYSROOT
+    set(CMAKE_XCODE_ATTRIBUTE_SDKROOT macosx${OSX_SYSTEM})
   endif()
-endforeach()
-unset(OSX_SDK_PREFIX)
-unset(OSX_SDK_TEST_VERSIONS)
-
-if(NOT OSX_SDK_FOUND)
-  message(FATAL_ERROR "Unable to find SDK for macOS version ${OSX_SYSTEM}")
 endif()
 
-message(STATUS "Detected OSX_SYSROOT: ${OSX_SDK_PATH}")
-
-set(CMAKE_OSX_SYSROOT ${OSX_SDK_PATH} CACHE PATH "" FORCE)
-unset(OSX_SDK_PATH)
-unset(OSX_SDK_FOUND)
-
-if(${CMAKE_GENERATOR} MATCHES "Xcode")
-  # to silence sdk not found warning, just overrides CMAKE_OSX_SYSROOT
-  set(CMAKE_XCODE_ATTRIBUTE_SDKROOT ${OSX_SDKROOT})
-endif()
-unset(OSX_SDKROOT)
-
 # 10.11 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)

build_files/cmake/platform/platform_unix.cmake

@@ -195,14 +195,8 @@ endif()
 if(WITH_OPENCOLLADA)
   find_package_wrapper(OpenCOLLADA)
   if(OPENCOLLADA_FOUND)
-    if(WITH_STATIC_LIBS)
-      # PCRE is bundled with OpenCollada without headers, so can't use
-      # find_package reliably to detect it.
-      set(PCRE_LIBRARIES ${LIBDIR}/opencollada/lib/libpcre.a)
-    else()
-      find_package_wrapper(PCRE)
-    endif()
     find_package_wrapper(XML2)
+    find_package_wrapper(PCRE)
   else()
     set(WITH_OPENCOLLADA OFF)
   endif()
@@ -411,6 +405,13 @@ if(WITH_LLVM)
   endif()
 endif()
 
+if(WITH_LLVM OR WITH_SDL_DYNLOAD)
+  # Fix for conflict with Mesa llvmpipe
+  set(PLATFORM_LINKFLAGS
+    "${PLATFORM_LINKFLAGS} -Wl,--version-script='${CMAKE_SOURCE_DIR}/source/creator/blender.map'"
+  )
+endif()
+
 if(WITH_OPENSUBDIV)
   find_package_wrapper(OpenSubdiv)
 
@@ -600,16 +601,3 @@ elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
   set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
   set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-intel")
 endif()
-
-# Avoid conflicts with Mesa llvmpipe, Luxrender, and other plug-ins that may
-# use the same libraries as Blender with a different version or build options.
-set(PLATFORM_LINKFLAGS
-  "${PLATFORM_LINKFLAGS} -Wl,--version-script='${CMAKE_SOURCE_DIR}/source/creator/blender.map'"
-)
-
-# Don't use position independent executable for portable install since file
-# browsers can't properly detect blender as an executable then. Still enabled
-# for non-portable installs as typically used by Linux distributions.
-if(WITH_INSTALL_PORTABLE)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -no-pie")
-endif()

build_files/cmake/platform/platform_win32.cmake

@@ -669,7 +669,7 @@ if(WITH_USD)
     set(USD_INCLUDE_DIRS ${LIBDIR}/usd/include)
     set(USD_RELEASE_LIB ${LIBDIR}/usd/lib/libusd_m.lib)
     set(USD_DEBUG_LIB ${LIBDIR}/usd/lib/libusd_m_d.lib)
-    set(USD_LIBRARY_DIR ${LIBDIR}/usd/lib)
+    set(USD_LIBRARY_DIR ${LIBDIR}/usd/lib/usd)
     set(USD_LIBRARIES
       debug ${USD_DEBUG_LIB}
       optimized ${USD_RELEASE_LIB}

build_files/windows/autodetect_msvc.cmd

@@ -6,6 +6,9 @@ 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
+
 echo Compiler Detection failed. Use verbose switch for more information. 
 exit /b 1
 

build_files/windows/detect_msvc2015.cmd

@@ -0,0 +1,3 @@
+set BUILD_VS_VER=14
+set BUILD_VS_YEAR=2015
+call "%~dp0\detect_msvc_classic.cmd"

build_files/windows/detect_msvc_classic.cmd

@@ -0,0 +1,69 @@
+if NOT "%verbose%" == "" (
+	echo Detecting msvc %BUILD_VS_YEAR%
+)
+set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\%BUILD_VS_VER%.0\Setup\VC"
+for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY %KEY_NAME% /v ProductDir 2^>nul`) DO set MSVC_VC_DIR=%%C
+if DEFINED MSVC_VC_DIR (
+	if NOT "%verbose%" == "" (
+		echo Visual Studio %BUILD_VS_YEAR% on Win64 detected at "%MSVC_VC_DIR%"
+	)
+	goto msvc_detect_finally
+)
+
+REM Check 32 bits
+set KEY_NAME="HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\%BUILD_VS_VER%.0\Setup\VC"
+for /F "usebackq skip=2 tokens=1-2*" %%A IN (`REG QUERY %KEY_NAME% /v ProductDir 2^>nul`) DO set MSVC_VC_DIR=%%C
+if DEFINED MSVC_VC_DIR (
+	if NOT "%verbose%" == "" (
+		echo Visual Studio %BUILD_VS_YEAR% on Win32 detected at "%MSVC_VC_DIR%"
+	)
+	goto msvc_detect_finally
+)
+if NOT "%verbose%" == "" (
+	echo Visual Studio %BUILD_VS_YEAR% not found. 
+)
+goto FAIL
+:msvc_detect_finally
+set VCVARS=%MSVC_VC_DIR%\vcvarsall.bat
+if not exist "%VCVARS%" (
+	echo "%VCVARS%" not found.
+	goto FAIL
+)
+
+call "%vcvars%" %BUILD_ARCH%
+
+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
+)
+goto DetectionComplete
+
+:FAIL
+exit /b 1
+
+:DetectionComplete
+if NOT "%verbose%" == "" (
+		echo Visual Studio %BUILD_VS_YEAR% Detected successfully 
+)
+exit /b 0

build_files/windows/detect_msvc_vswhere.cmd

@@ -27,13 +27,7 @@ if NOT "%verbose%" == "" (
 
 if "%VS_InstallDir%"=="" (
 	if NOT "%verbose%" == "" (
-		echo.
-		echo Visual Studio is detected but no suitable installation was found. 
-		echo.
-		echo Check the "Desktop development with C++" workload has been installed. 
-		echo. 
-		echo If you are attempting to use either Visual Studio Preview version or the Visual C++ Build tools, Please see 'make help' on how to opt in to those toolsets.
-		echo. 
+		echo Visual Studio is detected but the "Desktop development with C++" workload has not been instlled
 		goto FAIL
 	)
 )

build_files/windows/parse_arguments.cmd

@@ -66,6 +66,8 @@ if NOT "%1" == "" (
 	) 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" (
 		set BUILD_CMAKE_ARGS=%BUILD_CMAKE_ARGS% -DCPACK_OVERRIDE_PACKAGENAME="%2"
 		shift /1

build_files/windows/show_help.cmd

@@ -23,17 +23,15 @@ echo - with_tests ^(enable building unit tests^)
 echo - nobuildinfo ^(disable buildinfo^)
 echo - debug ^(Build an unoptimized debuggable build^)
 echo - packagename [newname] ^(override default cpack package name^)
-echo - builddir [newdir] ^(override default build folder^)
+echo - buildir [newdir] ^(override default build folder^)
 echo - 2017 ^(build with visual studio 2017^)
 echo - 2017pre ^(build with visual studio 2017 pre-release^)
 echo - 2017b ^(build with visual studio 2017 Build Tools^)
-echo - 2019 ^(build with visual studio 2019^)
-echo - 2019pre ^(build with visual studio 2019 pre-release^)
-echo - 2019b ^(build with visual studio 2019 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^)
 echo - ninja ^(enable building with ninja instead of msbuild^)

doc/python_api/examples/aud.py

@@ -2,20 +2,20 @@
 Basic Sound Playback
 ++++++++++++++++++++
 
-This script shows how to use the classes: :class:`Device`, :class:`Sound` and
+This script shows how to use the classes: :class:`Device`, :class:`Factory` and
 :class:`Handle`.
 """
 import aud
 
-device = aud.Device()
+device = aud.device()
 # load sound file (it can be a video file with audio)
-sound = aud.Sound('music.ogg')
+factory = aud.Factory('music.ogg')
 
 # play the audio, this return a handle to control play/pause
-handle = device.play(sound)
+handle = device.play(factory)
 # if the audio is not too big and will be used often you can buffer it
-sound_buffered = aud.Sound.buffer(sound)
-handle_buffered = device.play(sound_buffered)
+factory_buffered = aud.Factory.buffer(factory)
+handle_buffered = device.play(factory_buffered)
 
 # stop the sounds (otherwise they play until their ends)
 handle.stop()

doc/python_api/rst/info_gotcha.rst

@@ -205,15 +205,15 @@ Support Overview
 
    * - Usage
      - :class:`bpy.types.MeshPolygon`
-     - :class:`bpy.types.MeshLoopTriangle`
+     - :class:`bpy.types.MeshTessFace`
      - :class:`bmesh.types.BMFace`
    * - Import/Create
      - Poor *(inflexible)*
-     - Unusable *(read-only)*.
+     - Good *(supported as upgrade path)*
      - Best
    * - Manipulate
      - Poor *(inflexible)*
-     - Unusable *(read-only)*.
+     - Poor *(loses ngons)*
      - Best
    * - Export/Output
      - Good *(ngon support)*

doc/python_api/sphinx_doc_gen.py

@@ -1052,7 +1052,6 @@ context_type_map = {
     "selected_editable_fcurves": ("FCurve", True),
     "selected_editable_objects": ("Object", True),
     "selected_editable_sequences": ("Sequence", True),
-    "selected_nla_strips": ("NlaStrip", True),
     "selected_nodes": ("Node", True),
     "selected_objects": ("Object", True),
     "selected_pose_bones": ("PoseBone", True),
@@ -1074,7 +1073,6 @@ context_type_map = {
     "visible_pose_bones": ("PoseBone", True),
     "visible_fcurves": ("FCurve", True),
     "weight_paint_object": ("Object", False),
-    "volume": ("Volume", False),
     "world": ("World", False),
 }
 

extern/audaspace/bindings/doc/tutorials.rst

@@ -4,51 +4,35 @@ Tutorials
 Introduction
 ------------
 
-The C and Python binding for audaspace were designed with simplicity in mind.
-This means however that to use the full capabilities of audaspace,
-there is no way around the C++ library.
+The C and Python binding for audaspace were designed with simplicity in mind. This means however that to use the full capabilities of audaspace, there is no way around the C++ library.
 
 Simple Demo
 -----------
 
-The **simple.py** example program contains all the basic
-building blocks for an application using audaspace.
-These building blocks are basically the classes :class:`aud.Device`,
-:class:`aud.Sound` and :class:`aud.Handle`.
+The **simple.py** example program contains all the basic building blocks for an application using audaspace. These building blocks are basically the classes :class:`aud.Device`, :class:`aud.Sound` and :class:`aud.Handle`.
 
-We start with importing :mod:`aud` and :mod:`time`
-as the modules we need for our simple example.
+We start with importing :mod:`aud` and :mod:`time` as the modules we need for our simple example.
 
 .. code-block:: python
 
    #!/usr/bin/python
    import aud, time
 
-The first step now is to open an output device and this
-can simply be done by allocating a :class:`aud.Device` object.
+The first step now is to open an output device and this can simply be done by allocating a :class:`aud.Device` object.
 
 .. code-block:: python
 
    device = aud.Device()
 
-To create a sound we can choose to load one from a :func:`aud.Sound.file`,
-or we use one of our signal generators. We decide to do the latter
-and create a :func:`aud.Sound.sine` signal with a frequency of 440 Hz.
+To create a sound we can choose to load one from a :func:`aud.Sound.file`, or we use one of our signal generators. We decide to do the latter and create a :func:`aud.Sound.sine` signal with a frequency of 440 Hz.
 
 .. code-block:: python
 
    sine = aud.Sound.sine(440)
 
-.. note:: At this point nothing is playing back yet,
-:class:`aud.Sound` objects are just descriptions of sounds.
+.. note:: At this point nothing is playing back yet, :class:`aud.Sound` objects are just descriptions of sounds.
 
-However instead of a sine wave, we would like to have a square wave
-to produce a more retro gaming sound. We could of course use the
-:func:`aud.Sound.square` generator instead of sine,
-but we want to show how to apply effects,
-so we apply a :func:`aud.Sound.threshold`
-which makes a square wave out of our sine too,
-even if less efficient than directly generating the square wave.
+However instead of a sine wave, we would like to have a square wave to produce a more retro gaming sound. We could of course use the :func:`aud.Sound.square` generator instead of sine, but we want to show how to apply effects, so we apply a :func:`aud.Sound.threshold` which makes a square wave out of our sine too, even if less efficient than directly generating the square wave.
 
 .. code-block:: python
 
@@ -56,19 +40,13 @@ even if less efficient than directly generating the square wave.
 
 .. note:: The :class:`aud.Sound` class offers generator and effect functions.
 
-The we can play our sound by calling the
-:func:`aud.Device.play` method of our device.
-This method returns a :class:`aud.Handle`
-which is used to control the playback of the sound.
+The we can play our sound by calling the :func:`aud.Device.play` method of our device. This method returns a :class:`aud.Handle` which is used to control the playback of the sound.
 
 .. code-block:: python
 
    handle = device.play(square)
 
-Now if we do nothing else anymore the application will quit immediately,
-so we won't hear much of our square wave,
-so we decide to wait for three seconds before
-quitting the application by calling :func:`time.sleep`.
+Now if we do nothing else anymore the application will quit immediately, so we won't hear much of our square wave, so we decide to wait for three seconds before quitting the application by calling :func:`time.sleep`.
 
 .. code-block:: python
 
@@ -77,47 +55,29 @@ quitting the application by calling :func:`time.sleep`.
 Audioplayer
 -----------
 
-Now that we know the basics of audaspace,
-we can build our own music player easily
-by just slightly changing the previous program.
-The **player.py** example does exactly that,
-let's have a short look at the differences:
+Now that we know the basics of audaspace, we can build our own music player easily by just slightly changing the previous program. The **player.py** example does exactly that, let's have a short look at the differences:
 
-Instead of creating a sine signal and thresholding it,
-we in fact use the :func:`aud.Sound.file` function to load a sound from a file.
-The filename we pass is the first command line argument our application got.
+Instead of creating a sine signal and thresholding it, we in fact use the :func:`aud.Sound.file` function to load a sound from a file. The filename we pass is the first command line argument our application got.
 
 .. code-block:: python
 
    sound = aud.Sound.file(sys.argv[1])
 
-When the sound gets played back we now want to wait until
-the whole file has been played, so we use the :data:`aud.Handle.status`
-property to determine whether the sound finished playing.
+When the sound gets played back we now want to wait until the whole file has been played, so we use the :data:`aud.Handle.status` property to determine whether the sound finished playing.
 
 .. code-block:: python
 
    while handle.status:
    	time.sleep(0.1)
 
-We don't make any error checks if the user actually added a command
-line argument. As an exercise you could extend this program to play
-any number of command line supplied files in sequence.
+We don't make any error checks if the user actually added a command line argument. As an exercise you could extend this program to play any number of command line supplied files in sequence.
 
 Siren
 -----
 
-Let's get a little bit more complex. The **siren.py** example
-plays a generated siren sound that circles around your head.
-Depending on how many speakers you have and if the output
-device used supports the speaker setup, you will hear this effect.
-With stereo speakers you should at least hear some left-right-panning.
+Let's get a little bit more complex. The **siren.py** example plays a generated siren sound that circles around your head. Depending on how many speakers you have and if the output device used supports the speaker setup, you will hear this effect. With stereo speakers you should at least hear some left-right-panning.
 
-We start off again with importing the modules we need and
-we also define some properties of our siren sound.
-We want it to consist of two sine sounds with different frequencies.
-We define a length for the sine sounds and how long a fade in/out should take.
-We also know already how to open a device.
+We start off again with importing the modules we need and we also define some properties of our siren sound. We want it to consist of two sine sounds with different frequencies. We define a length for the sine sounds and how long a fade in/out should take. We also know already how to open a device.
 
 .. code-block:: python
 
@@ -128,35 +88,27 @@ We also know already how to open a device.
 
    device = aud.Device()
 
-The next thing to do is to define our sine waves and apply all the required effects.
-As each of the effect functions returns the corresponding sound,
-we can easily chain those calls together.
+The next thing to do is to define our sine waves and apply all the required effects. As each of the effect functions returns the corresponding sound, we can easily chain those calls together.
 
 .. code-block:: python
 
    high = aud.Sound.sine(880).limit(0, length).fadein(0, fadelength).fadeout(length - fadelength, length)
    low = aud.Sound.sine(700).limit(0, length).fadein(0, fadelength).fadeout(length - fadelength, length).volume(0.6)
 
-The next step is to connect the two sines,
-which we do using the :func:`aud.Sound.join` function.
+The next step is to connect the two sines, which we do using the :func:`aud.Sound.join` function.
 
 .. code-block:: python
 
    sound = high.join(low)
 
-The generated siren sound can now be played back and what we also do is to loop it.
-Therefore we set the :data:`aud.Handle.loop_count` to a negative value to loop forever.
+The generated siren sound can now be played back and what we also do is to loop it. Therefore we set the :data:`aud.Handle.loop_count` to a negative value to loop forever.
 
 .. code-block:: python
 
    handle = device.play(sound)
    handle.loop_count = -1
 
-Now we use some timing code to make sure our demo runs for 10 seconds,
-but we also use the time to update the location of our playing sound,
-with the :data:`aud.Handle.location` property, which is a three dimensional vector.
-The trigonometic calculation based on the running time of the program keeps
-the sound on the XZ plane letting it follow a circle around us.
+Now we use some timing code to make sure our demo runs for 10 seconds, but we also use the time to update the location of our playing sound, with the :data:`aud.Handle.location` property, which is a three dimensional vector. The trigonometic calculation based on the running time of the program keeps the sound on the XZ plane letting it follow a circle around us.
 
 .. code-block:: python
 
@@ -167,54 +119,33 @@ the sound on the XZ plane letting it follow a circle around us.
 
    	handle.location = [math.sin(angle), 0, -math.cos(angle)]
 
-As an exercise you could try to let the sound come from the far left
-and go to the far right and a little bit in front of you within the
-10 second runtime of the program. With this change you should be able
-to hear the volume of the sound change, depending on how far it is away from you.
-Updating the :data:`aud.Handle.velocity` property properly also enables the doppler effect.
-Compare your solution to the **siren2.py** demo.
+As an exercise you could try to let the sound come from the far left and go to the far right and a little bit in front of you within the 10 second runtime of the program. With this change you should be able to hear the volume of the sound change, depending on how far it is away from you. Updating the :data:`aud.Handle.velocity` property properly also enables the doppler effect. Compare your solution to the **siren2.py** demo.
 
 Tetris
 ------
 
-The **tetris.py** demo application shows an even more
-complex application which generates retro tetris music.
-Looking at the source code there should be nothing new here,
-again the functions used from audaspace are the same as in the previous examples.
-In the :func:`parseNote` function all single notes get joined which leads
-to a very long chain of sounds. If you think of :func:`aud.Sound.join`
-as a function that creates a binary tree with the two joined sounds as
-leaves then the :func:`parseNote` function creates a very unbalanced tree.
+The **tetris.py** demo application shows an even more complex application which generates retro tetris music. Looking at the source code there should be nothing new here, again the functions used from audaspace are the same as in the previous examples. In the :func:`parseNote` function all single notes get joined which leads to a very long chain of sounds. If you think of :func:`aud.Sound.join` as a function that creates a binary tree with the two joined sounds as leaves then the :func:`parseNote` function creates a very unbalanced tree.
 
-Insted we could rewrite the code to use two other classes:
-:class:`aud.Sequence` and :class:`aud.SequenceEntry` to sequence the notes.
-The **tetris2.py** application does exactly that.
-Before the while loop we add a variable that stores the current position
-in the score and create a new :class:`aud.Sequence` object.
+Insted we could rewrite the code to use two other classes: :class:`aud.Sequence` and :class:`aud.SequenceEntry` to sequence the notes. The **tetris2.py** application does exactly that. Before the while loop we add a variable that stores the current position in the score and create a new :class:`aud.Sequence` object.
 
 .. code-block:: python
 
    position = 0
    sequence = aud.Sequence()
 
-Then in the loop we can create the note simply by chaining the
-:func:`aud.Sound.square` generator and :func:`aud.Sound.fadein`
-and :func:`aud.Sound.fadeout` effects.
+Then in the loop we can create the note simply by chaining the :func:`aud.Sound.square` generator and :func:`aud.Sound.fadein` and :func:`aud.Sound.fadeout` effects.
 
 .. code-block:: python
 
    note = aud.Sound.square(freq, rate).fadein(0, fadelength).fadeout(length - fadelength, fadelength)
 
-Now instead of using :func:`aud.Sound.limit` and :func:`aud.Sound.join`
-we simply add the sound to the sequence.
+Now instead of using :func:`aud.Sound.limit` and :func:`aud.Sound.join` we simply add the sound to the sequence.
 
 .. code-block:: python
 
    entry = sequence.add(note, position, position + length, 0)
 
-The entry returned from the :func:`aud.Sequence.add`
-function is an object of the :class:`aud.SequenceEntry` class.
-We can use this entry to mute the note in case it's actually a pause.
+The entry returned from the :func:`aud.Sequence.add` function is an object of the :class:`aud.SequenceEntry` class. We can use this entry to mute the note in case it's actually a pause.
 
 .. code-block:: python
 
@@ -227,14 +158,9 @@ Lastly we have to update our position variable.
 
    position += length
 
-Now in **tetris2.py** we used the :data:`aud.SequenceEntry.muted`
-property to show how the :class:`aud.SequenceEntry` class can be used,
-but it would actually be smarter to not even create a note for pauses and just skip them.
-You can try to implement this as an exercise and then check out the solution in **tetris3.py**.
+Now in **tetris2.py** we used the :data:`aud.SequenceEntry.muted` property to show how the :class:`aud.SequenceEntry` class can be used, but it would actually be smarter to not even create a note for pauses and just skip them. You can try to implement this as an exercise and then check out the solution in **tetris3.py**.
 
 Conclusion
 ----------
 
-We introduced all five currently available classes in the audaspace Python API.
-Of course all classes offer a lot more functions than have been used in these demo applications,
-check out the specific class documentation for more details.
+We introduced all five currently available classes in the audaspace Python API. Of course all classes offer a lot more functions than have been used in these demo applications, check out the specific class documentation for more details.

extern/audaspace/bindings/python/PyDevice.cpp

@@ -124,17 +124,15 @@ Device_new(PyTypeObject* type, PyObject* args, PyObject* kwds)
 }
 
 PyDoc_STRVAR(M_aud_Device_lock_doc,
-			 ".. classmethod:: lock()\n\n"
-			 "   Locks the device so that it's guaranteed, that no samples are\n"
-			 "   read from the streams until :meth:`unlock` is called.\n"
-			 "   This is useful if you want to do start/stop/pause/resume some\n"
-			 "   sounds at the same time.\n\n"
-			 "   .. note::\n\n"
-			 "      The device has to be unlocked as often as locked to be\n"
-			 "      able to continue playback.\n\n"
-			 "   .. warning::\n\n"
-			 "      Make sure the time between locking and unlocking is\n"
-			 "      as short as possible to avoid clicks.");
+			 "lock()\n\n"
+			 "Locks the device so that it's guaranteed, that no samples are "
+			 "read from the streams until :meth:`unlock` is called.\n"
+			 "This is useful if you want to do start/stop/pause/resume some "
+			 "sounds at the same time.\n\n"
+			 ".. note:: The device has to be unlocked as often as locked to be "
+			 "able to continue playback.\n\n"
+			 ".. warning:: Make sure the time between locking and unlocking is "
+			 "as short as possible to avoid clicks.");
 
 static PyObject *
 Device_lock(Device* self)
@@ -152,15 +150,15 @@ Device_lock(Device* self)
 }
 
 PyDoc_STRVAR(M_aud_Device_play_doc,
-			 ".. classmethod:: play(sound, keep=False)\n\n"
-			 "   Plays a sound.\n\n"
-			 "   :arg sound: The sound to play.\n"
-			 "   :type sound: :class:`Sound`\n"
-			 "   :arg keep: See :attr:`Handle.keep`.\n"
-			 "   :type keep: bool\n"
-			 "   :return: The playback handle with which playback can be\n"
-			 "      controlled with.\n"
-			 "   :rtype: :class:`Handle`");
+			 "play(sound, keep=False)\n\n"
+			 "Plays a sound.\n\n"
+			 ":arg sound: The sound to play.\n"
+			 ":type sound: :class:`Sound`\n"
+			 ":arg keep: See :attr:`Handle.keep`.\n"
+			 ":type keep: bool\n"
+			 ":return: The playback handle with which playback can be "
+			 "controlled with.\n"
+			 ":rtype: :class:`Handle`");
 
 static PyObject *
 Device_play(Device* self, PyObject* args, PyObject* kwds)
@@ -212,8 +210,8 @@ Device_play(Device* self, PyObject* args, PyObject* kwds)
 }
 
 PyDoc_STRVAR(M_aud_Device_stopAll_doc,
-			 ".. classmethod:: stopAll()\n\n"
-			 "   Stops all playing and paused sounds.");
+			 "stopAll()\n\n"
+			 "Stops all playing and paused sounds.");
 
 static PyObject *
 Device_stopAll(Device* self)
@@ -231,9 +229,9 @@ Device_stopAll(Device* self)
 }
 
 PyDoc_STRVAR(M_aud_Device_unlock_doc,
-			 ".. classmethod:: unlock()\n\n"
-			 "   Unlocks the device after a lock call, see :meth:`lock` for\n"
-			 "   details.");
+			 "unlock()\n\n"
+			 "Unlocks the device after a lock call, see :meth:`lock` for "
+			 "details.");
 
 static PyObject *
 Device_unlock(Device* self)
@@ -286,7 +284,7 @@ Device_get_channels(Device* self, void* nothing)
 
 PyDoc_STRVAR(M_aud_Device_distance_model_doc,
 			 "The distance model of the device.\n\n"
-			 ".. seealso:: `OpenAL Documentation <https://www.openal.org/documentation/>`__");
+			 ".. seealso:: http://connect.creativelabs.com/openal/Documentation/OpenAL%201.1%20Specification.htm#_Toc199835864");
 
 static PyObject *
 Device_get_distance_model(Device* self, void* nothing)

extern/audaspace/bindings/python/PyDynamicMusic.cpp

@@ -60,12 +60,12 @@ DynamicMusic_dealloc(DynamicMusicP* self)
 }
 
 PyDoc_STRVAR(M_aud_DynamicMusic_addScene_doc,
-	".. classmethod:: addScene(scene)\n\n"
-	"   Adds a new scene.\n\n"
-	"   :arg scene: The scene sound.\n"
-	"   :type scene: :class:`Sound`\n"
-	"   :return: The new scene id.\n"
-	"   :rtype: int");
+	"addScene(scene)\n\n"
+	"Adds a new scene.\n\n"
+	":arg scene: The scene sound.\n"
+	":type scene: :class:`Sound`\n"
+	":return: The new scene id.\n"
+	":rtype: int");
 
 static PyObject *
 DynamicMusic_addScene(DynamicMusicP* self, PyObject* args)
@@ -90,16 +90,16 @@ DynamicMusic_addScene(DynamicMusicP* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_DynamicMusic_addTransition_doc,
-	".. classmethod:: addTransition(ini, end, transition)\n\n"
-	"   Adds a new scene.\n\n"
-	"   :arg ini: the initial scene foor the transition.\n"
-	"   :type ini: int\n"
-	"   :arg end: The final scene for the transition.\n"
-	"   :type end: int\n"
-	"   :arg transition: The transition sound.\n"
-	"   :type transition: :class:`Sound`\n"
-	"   :return: false if the ini or end scenes don't exist, true othrwise.\n"
-	"   :rtype: bool");
+	"addTransition(ini, end, transition)\n\n"
+	"Adds a new scene.\n\n"
+	":arg ini: the initial scene foor the transition.\n"
+	":type ini: int\n"
+	":arg end: The final scene for the transition.\n"
+	":type end: int\n"
+	":arg transition: The transition sound.\n"
+	":type transition: :class:`Sound`\n"
+	":return: false if the ini or end scenes don't exist, true othrwise.\n"
+	":rtype: bool");
 
 static PyObject *
 DynamicMusic_addTransition(DynamicMusicP* self, PyObject* args)
@@ -125,10 +125,10 @@ DynamicMusic_addTransition(DynamicMusicP* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_DynamicMusic_resume_doc,
-	".. classmethod:: resume()\n\n"
-	"   Resumes playback of the scene.\n\n"
-	"   :return: Whether the action succeeded.\n"
-	"   :rtype: bool");
+	"resume()\n\n"
+	"Resumes playback of the scene.\n\n"
+	":return: Whether the action succeeded.\n"
+	":rtype: bool");
 
 static PyObject *
 DynamicMusic_resume(DynamicMusicP* self)
@@ -145,10 +145,10 @@ DynamicMusic_resume(DynamicMusicP* self)
 }
 
 PyDoc_STRVAR(M_aud_DynamicMusic_pause_doc,
-	".. classmethod:: pause()\n\n"
-	"   Pauses playback of the scene.\n\n"
-	"   :return: Whether the action succeeded.\n"
-	"   :rtype: bool");
+	"pause()\n\n"
+	"Pauses playback of the scene.\n\n"
+	":return: Whether the action succeeded.\n"
+	":rtype: bool");
 
 static PyObject *
 DynamicMusic_pause(DynamicMusicP* self)
@@ -165,10 +165,10 @@ DynamicMusic_pause(DynamicMusicP* self)
 }
 
 PyDoc_STRVAR(M_aud_DynamicMusic_stop_doc,
-	".. classmethod:: stop()\n\n"
-	"   Stops playback of the scene.\n\n"
-	"   :return: Whether the action succeeded.\n"
-	"   :rtype: bool\n\n");
+	"stop()\n\n"
+	"Stops playback of the scene.\n\n"
+	":return: Whether the action succeeded.\n"
+	":rtype: bool\n\n");
 
 static PyObject *
 DynamicMusic_stop(DynamicMusicP* self)
@@ -464,4 +464,4 @@ void addDynamicMusicToModule(PyObject* module)
 {
 	Py_INCREF(&DynamicMusicType);
 	PyModule_AddObject(module, "DynamicMusic", (PyObject *)&DynamicMusicType);
-}
+}

extern/audaspace/bindings/python/PyHRTF.cpp

@@ -54,16 +54,16 @@ HRTF_dealloc(HRTFP* self)
 }
 
 PyDoc_STRVAR(M_aud_HRTF_addImpulseResponse_doc,
-	".. classmethod:: addImpulseResponseFromSound(sound, azimuth, elevation)\n\n"
-	"   Adds a new hrtf to the HRTF object\n\n"
-	"   :arg sound: The sound that contains the hrtf.\n"
-	"   :type sound: :class:`Sound`\n"
-	"   :arg azimuth: The azimuth angle of the hrtf.\n"
-	"   :type azimuth: float\n"
-	"   :arg elevation: The elevation angle of the hrtf.\n"
-	"   :type elevation: float\n"
-	"   :return: Whether the action succeeded.\n"
-	"   :rtype: bool");
+	"addImpulseResponseFromSound(sound, azimuth, elevation)\n\n"
+	"Adds a new hrtf to the HRTF object\n\n"
+	":arg sound: The sound that contains the hrtf.\n"
+	":type sound: :class:`Sound`\n"
+	":arg azimuth: The azimuth angle of the hrtf.\n"
+	":type azimuth: float\n"
+	":arg elevation: The elevation angle of the hrtf.\n"
+	":type elevation: float\n"
+	":return: Whether the action succeeded.\n"
+	":rtype: bool");
 
 static PyObject *
 HRTF_addImpulseResponseFromSound(HRTFP* self, PyObject* args)
@@ -90,14 +90,14 @@ HRTF_addImpulseResponseFromSound(HRTFP* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_HRTF_loadLeftHrtfSet_doc,
-	".. classmethod:: loadLeftHrtfSet(extension, directory)\n\n"
-	"   Loads all HRTFs from a directory.\n\n"
-	"   :arg extension: The file extension of the hrtfs.\n"
-	"   :type extension: string\n"
-	"   :arg directory: The path to where the HRTF files are located.\n"
-	"   :type extension: string\n"
-	"   :return: The loaded :class:`HRTF` object.\n"
-	"   :rtype: :class:`HRTF`\n\n");
+	"loadLeftHrtfSet(extension, directory)\n\n"
+	"Loads all HRTFs from a directory.\n\n"
+	":arg extension: The file extension of the hrtfs.\n"
+	":type extension: string\n"
+	":arg directory: The path to where the HRTF files are located.\n"
+	":type extension: string\n"
+	":return: The loaded :class:`HRTF` object.\n"
+	":rtype: :class:`HRTF`\n\n");
 
 static PyObject *
 HRTF_loadLeftHrtfSet(PyTypeObject* type, PyObject* args)
@@ -125,14 +125,14 @@ HRTF_loadLeftHrtfSet(PyTypeObject* type, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_HRTF_loadRightHrtfSet_doc,
-	".. classmethod:: loadLeftHrtfSet(extension, directory)\n\n"
-	"   Loads all HRTFs from a directory.\n\n"
-	"   :arg extension: The file extension of the hrtfs.\n"
-	"   :type extension: string\n"
-	"   :arg directory: The path to where the HRTF files are located.\n"
-	"   :type extension: string\n"
-	"   :return: The loaded :class:`HRTF` object.\n"
-	"   :rtype: :class:`HRTF`\n\n");
+	"loadLeftHrtfSet(extension, directory)\n\n"
+	"Loads all HRTFs from a directory.\n\n"
+	":arg extension: The file extension of the hrtfs.\n"
+	":type extension: string\n"
+	":arg directory: The path to where the HRTF files are located.\n"
+	":type extension: string\n"
+	":return: The loaded :class:`HRTF` object.\n"
+	":rtype: :class:`HRTF`\n\n");
 
 static PyObject *
 HRTF_loadRightHrtfSet(PyTypeObject* type, PyObject* args)

extern/audaspace/bindings/python/PyHandle.cpp

@@ -38,10 +38,10 @@ Handle_dealloc(Handle* self)
 }
 
 PyDoc_STRVAR(M_aud_Handle_pause_doc,
-			 ".. classmethod:: pause()\n\n"
-			 "   Pauses playback.\n\n"
-			 "   :return: Whether the action succeeded.\n"
-			 "   :rtype: bool");
+			 "pause()\n\n"
+			 "Pauses playback.\n\n"
+			 ":return: Whether the action succeeded.\n"
+			 ":rtype: bool");
 
 static PyObject *
 Handle_pause(Handle* self)
@@ -58,10 +58,10 @@ Handle_pause(Handle* self)
 }
 
 PyDoc_STRVAR(M_aud_Handle_resume_doc,
-			 ".. classmethod:: resume()\n\n"
-			 "   Resumes playback.\n\n"
-			 "   :return: Whether the action succeeded.\n"
-			 "   :rtype: bool");
+			 "resume()\n\n"
+			 "Resumes playback.\n\n"
+			 ":return: Whether the action succeeded.\n"
+			 ":rtype: bool");
 
 static PyObject *
 Handle_resume(Handle* self)
@@ -78,11 +78,11 @@ Handle_resume(Handle* self)
 }
 
 PyDoc_STRVAR(M_aud_Handle_stop_doc,
-			 ".. classmethod:: stop()\n\n"
-			 "   Stops playback.\n\n"
-			 "   :return: Whether the action succeeded.\n"
-			 "   :rtype: bool\n\n"
-			 "   .. note:: This makes the handle invalid.");
+			 "stop()\n\n"
+			 "Stops playback.\n\n"
+			 ":return: Whether the action succeeded.\n"
+			 ":rtype: bool\n\n"
+			 ".. note:: This makes the handle invalid.");
 
 static PyObject *
 Handle_stop(Handle* self)
@@ -1122,3 +1122,5 @@ void addHandleToModule(PyObject* module)
 	Py_INCREF(&HandleType);
 	PyModule_AddObject(module, "Handle", (PyObject *)&HandleType);
 }
+
+

extern/audaspace/bindings/python/PyPlaybackManager.cpp

@@ -60,15 +60,14 @@ PlaybackManager_dealloc(PlaybackManagerP* self)
 }
 
 PyDoc_STRVAR(M_aud_PlaybackManager_play_doc,
-	".. classmethod:: setVolume(sound, catKey)\n\n"
-	"   Plays a sound through the playback manager and assigns it to a category.\n\n"
-	"   :arg sound: The sound to play.\n"
-	"   :type sound: :class:`Sound`\n"
-	"   :arg catKey: the key of the category in which the sound will be added,\n"
-	"      if it doesn't exist, a new one will be created.\n"
-	"   :type catKey: int\n"
-	"   :return: The playback handle with which playback can be controlled with.\n"
-	"   :rtype: :class:`Handle`");
+	"setVolume(sound, catKey)\n\n"
+	"Plays a sound through the playback manager and assigns it to a category.\n\n"
+	":arg sound: The sound to play.\n"
+	":type sound: :class:`Sound`\n"
+	":arg catKey: the key of the category in which the sound will be added, if it doesn't exist, a new one will be created.\n"
+	":type catKey: int\n"
+	":return: The playback handle with which playback can be controlled with.\n"
+	":rtype: :class:`Handle`");
 
 static PyObject *
 PlaybackManager_play(PlaybackManagerP* self, PyObject* args)
@@ -104,12 +103,12 @@ PlaybackManager_play(PlaybackManagerP* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_PlaybackManager_resume_doc,
-	".. classmethod:: resume(catKey)\n\n"
-	"   Resumes playback of the catgory.\n\n"
-	"   :arg catKey: the key of the category.\n"
-	"   :type catKey: int\n"
-	"   :return: Whether the action succeeded.\n"
-	"   :rtype: bool");
+	"resume(catKey)\n\n"
+	"Resumes playback of the catgory.\n\n"
+	":arg catKey: the key of the category.\n"
+	":type catKey: int\n"
+	":return: Whether the action succeeded.\n"
+	":rtype: bool");
 
 static PyObject *
 PlaybackManager_resume(PlaybackManagerP* self, PyObject* args)
@@ -131,12 +130,12 @@ PlaybackManager_resume(PlaybackManagerP* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_PlaybackManager_pause_doc,
-	".. classmethod:: pause(catKey)\n\n"
-	"   Pauses playback of the category.\n\n"
-	"   :arg catKey: the key of the category.\n"
-	"   :type catKey: int\n"
-	"   :return: Whether the action succeeded.\n"
-	"   :rtype: bool");
+	"pause(catKey)\n\n"
+	"Pauses playback of the category.\n\n"
+	":arg catKey: the key of the category.\n"
+	":type catKey: int\n"
+	":return: Whether the action succeeded.\n"
+	":rtype: bool");
 
 static PyObject *
 PlaybackManager_pause(PlaybackManagerP* self, PyObject* args)
@@ -158,12 +157,12 @@ PlaybackManager_pause(PlaybackManagerP* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_PlaybackManager_add_category_doc,
-	".. classmethod:: addCategory(volume)\n\n"
-	"   Adds a category with a custom volume.\n\n"
-	"   :arg volume: The volume for ther new category.\n"
-	"   :type volume: float\n"
-	"   :return: The key of the new category.\n"
-	"   :rtype: int\n\n");
+	"addCategory(volume)\n\n"
+	"Adds a category with a custom volume.\n\n"
+	":arg volume: The volume for ther new category.\n"
+	":type volume: float\n"
+	":return: The key of the new category.\n"
+	":rtype: int\n\n");
 
 static PyObject *
 PlaybackManager_add_category(PlaybackManagerP* self, PyObject* args)
@@ -185,12 +184,12 @@ PlaybackManager_add_category(PlaybackManagerP* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_PlaybackManager_get_volume_doc,
-	".. classmethod:: getVolume(catKey)\n\n"
-	"   Retrieves the volume of a category.\n\n"
-	"   :arg catKey: the key of the category.\n"
-	"   :type catKey: int\n"
-	"   :return: The volume of the cateogry.\n"
-	"   :rtype: float\n\n");
+	"getVolume(catKey)\n\n"
+	"Retrieves the volume of a category.\n\n"
+	":arg catKey: the key of the category.\n"
+	":type catKey: int\n"
+	":return: The volume of the cateogry.\n"
+	":rtype: float\n\n");
 
 static PyObject *
 PlaybackManager_get_volume(PlaybackManagerP* self, PyObject* args)
@@ -212,14 +211,14 @@ PlaybackManager_get_volume(PlaybackManagerP* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_PlaybackManager_set_volume_doc,
-	".. classmethod:: setVolume(volume, catKey)\n\n"
-	"   Changes the volume of a category.\n\n"
-	"   :arg volume: the new volume value.\n"
-	"   :type volume: float\n"
-	"   :arg catKey: the key of the category.\n"
-	"   :type catKey: int\n"
-	"   :return: Whether the action succeeded.\n"
-	"   :rtype: int\n\n");
+	"setVolume(volume, catKey)\n\n"
+	"Changes the volume of a category.\n\n"
+	":arg volume: the new volume value.\n"
+	":type volume: float\n"
+	":arg catKey: the key of the category.\n"
+	":type catKey: int\n"
+	":return: Whether the action succeeded.\n"
+	":rtype: int\n\n");
 
 static PyObject *
 PlaybackManager_set_volume(PlaybackManagerP* self, PyObject* args)
@@ -242,12 +241,12 @@ PlaybackManager_set_volume(PlaybackManagerP* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_PlaybackManager_stop_doc,
-	".. classmethod:: stop(catKey)\n\n"
-	"   Stops playback of the category.\n\n"
-	"   :arg catKey: the key of the category.\n"
-	"   :type catKey: int\n"
-	"   :return: Whether the action succeeded.\n"
-	"   :rtype: bool\n\n");
+	"stop(catKey)\n\n"
+	"Stops playback of the category.\n\n"
+	":arg catKey: the key of the category.\n"
+	":type catKey: int\n"
+	":return: Whether the action succeeded.\n"
+	":rtype: bool\n\n");
 
 static PyObject *
 PlaybackManager_stop(PlaybackManagerP* self, PyObject* args)
@@ -269,8 +268,8 @@ PlaybackManager_stop(PlaybackManagerP* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_PlaybackManager_clean_doc,
-	".. classmethod:: clean()\n\n"
-	"   Cleans all the invalid and finished sound from the playback manager.\n\n");
+	"clean()\n\n"
+	"Cleans all the invalid and finished sound from the playback manager.\n\n");
 
 static PyObject *
 PlaybackManager_clean(PlaybackManagerP* self)

extern/audaspace/bindings/python/PySequence.cpp

@@ -99,18 +99,18 @@ Sequence_new(PyTypeObject* type, PyObject* args, PyObject* kwds)
 }
 
 PyDoc_STRVAR(M_aud_Sequence_add_doc,
-			 ".. classmethod:: add()\n\n"
-			 "   Adds a new entry to the sequence.\n\n"
-			 "   :arg sound: The sound this entry should play.\n"
-			 "   :type sound: :class:`Sound`\n"
-			 "   :arg begin: The start time.\n"
-			 "   :type begin: float\n"
-			 "   :arg end: The end time or a negative value if determined by the sound.\n"
-			 "   :type end: float\n"
-			 "   :arg skip: How much seconds should be skipped at the beginning.\n"
-			 "   :type skip: float\n"
-			 "   :return: The entry added.\n"
-			 "   :rtype: :class:`SequenceEntry`");
+			 "add()\n\n"
+			 "Adds a new entry to the sequence.\n\n"
+			 ":arg sound: The sound this entry should play.\n"
+			 ":type sound: :class:`Sound`\n"
+			 ":arg begin: The start time.\n"
+			 ":type begin: float\n"
+			 ":arg end: The end time or a negative value if determined by the sound.\n"
+			 ":type end: float\n"
+			 ":arg skip: How much seconds should be skipped at the beginning.\n"
+			 ":type skip: float\n"
+			 ":return: The entry added.\n"
+			 ":rtype: :class:`SequenceEntry`");
 
 static PyObject *
 Sequence_add(Sequence* self, PyObject* args, PyObject* kwds)
@@ -151,10 +151,10 @@ Sequence_add(Sequence* self, PyObject* args, PyObject* kwds)
 }
 
 PyDoc_STRVAR(M_aud_Sequence_remove_doc,
-			 ".. classmethod:: remove()\n\n"
-			 "   Removes an entry from the sequence.\n\n"
-			 "   :arg entry: The entry to remove.\n"
-			 "   :type entry: :class:`SequenceEntry`\n");
+			 "remove()\n\n"
+			 "Removes an entry from the sequence.\n\n"
+			 ":arg entry: The entry to remove.\n"
+			 ":type entry: :class:`SequenceEntry`\n");
 
 static PyObject *
 Sequence_remove(Sequence* self, PyObject* args)
@@ -183,16 +183,16 @@ Sequence_remove(Sequence* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sequence_setAnimationData_doc,
-			 ".. classmethod:: setAnimationData()\n\n"
-			 "   Writes animation data to a sequence.\n\n"
-			 "   :arg type: The type of animation data.\n"
-			 "   :type type: int\n"
-			 "   :arg frame: The frame this data is for.\n"
-			 "   :type frame: int\n"
-			 "   :arg data: The data to write.\n"
-			 "   :type data: sequence of float\n"
-			 "   :arg animated: Whether the attribute is animated.\n"
-			 "   :type animated: bool");
+			 "setAnimationData()\n\n"
+			 "Writes animation data to a sequence.\n\n"
+			 ":arg type: The type of animation data.\n"
+			 ":type type: int\n"
+			 ":arg frame: The frame this data is for.\n"
+			 ":type frame: int\n"
+			 ":arg data: The data to write.\n"
+			 ":type data: sequence of float\n"
+			 ":arg animated: Whether the attribute is animated.\n"
+			 ":type animated: bool");
 
 static PyObject *
 Sequence_setAnimationData(Sequence* self, PyObject* args)
@@ -325,7 +325,7 @@ Sequence_set_channels(Sequence* self, PyObject* args, void* nothing)
 
 PyDoc_STRVAR(M_aud_Sequence_distance_model_doc,
 			 "The distance model of the sequence.\n\n"
-			  ".. seealso:: `OpenAL Documentation <https://www.openal.org/documentation/>`__");
+			 ".. seealso:: http://connect.creativelabs.com/openal/Documentation/OpenAL%201.1%20Specification.htm#_Toc199835864");
 
 static PyObject *
 Sequence_get_distance_model(Sequence* self, void* nothing)

extern/audaspace/bindings/python/PySequenceEntry.cpp

@@ -43,14 +43,14 @@ SequenceEntry_dealloc(SequenceEntry* self)
 }
 
 PyDoc_STRVAR(M_aud_SequenceEntry_move_doc,
-			 ".. classmethod:: move()\n\n"
-			 "   Moves the entry.\n\n"
-			 "   :arg begin: The new start time.\n"
-			 "   :type begin: float\n"
-			 "   :arg end: The new end time or a negative value if unknown.\n"
-			 "   :type end: float\n"
-			 "   :arg skip: How many seconds to skip at the beginning.\n"
-			 "   :type skip: float\n");
+			 "move()\n\n"
+			 "Moves the entry.\n\n"
+			 ":arg begin: The new start time.\n"
+			 ":type begin: float\n"
+			 ":arg end: The new end time or a negative value if unknown.\n"
+			 ":type end: float\n"
+			 ":arg skip: How many seconds to skip at the beginning.\n"
+			 ":type skip: float\n");
 
 static PyObject *
 SequenceEntry_move(SequenceEntry* self, PyObject* args)
@@ -73,16 +73,16 @@ SequenceEntry_move(SequenceEntry* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_SequenceEntry_setAnimationData_doc,
-			 ".. classmethod:: setAnimationData()\n\n"
-			 "   Writes animation data to a sequenced entry.\n\n"
-			 "   :arg type: The type of animation data.\n"
-			 "   :type type: int\n"
-			 "   :arg frame: The frame this data is for.\n"
-			 "   :type frame: int\n"
-			 "   :arg data: The data to write.\n"
-			 "   :type data: sequence of float\n"
-			 "   :arg animated: Whether the attribute is animated.\n"
-			 "   :type animated: bool");
+			 "setAnimationData()\n\n"
+			 "Writes animation data to a sequenced entry.\n\n"
+			 ":arg type: The type of animation data.\n"
+			 ":type type: int\n"
+			 ":arg frame: The frame this data is for.\n"
+			 ":type frame: int\n"
+			 ":arg data: The data to write.\n"
+			 ":type data: sequence of float\n"
+			 ":arg animated: Whether the attribute is animated.\n"
+			 ":type animated: bool");
 
 static PyObject *
 SequenceEntry_setAnimationData(SequenceEntry* self, PyObject* args)

extern/audaspace/bindings/python/PySound.cpp

@@ -114,11 +114,11 @@ Sound_new(PyTypeObject* type, PyObject* args, PyObject* kwds)
 }
 
 PyDoc_STRVAR(M_aud_Sound_data_doc,
-			 ".. classmethod:: data()\n\n"
-			 "   Retrieves the data of the sound as numpy array.\n\n"
-			 "   :return: A two dimensional numpy float array.\n"
-			 "   :rtype: :class:`numpy.ndarray`\n\n"
-			 "   .. note:: Best efficiency with cached sounds.");
+			 "data()\n\n"
+			 "Retrieves the data of the sound as numpy array.\n\n"
+			 ":return: A two dimensional numpy float array.\n"
+			 ":rtype: :class:`numpy.ndarray`\n\n"
+			 ".. note:: Best efficiency with cached sounds.");
 
 static PyObject *
 Sound_data(Sound* self)
@@ -145,24 +145,24 @@ Sound_data(Sound* self)
 }
 
 PyDoc_STRVAR(M_aud_Sound_write_doc,
-			 ".. classmethod:: write(filename, rate, channels, format, container, codec, bitrate, buffersize)\n\n"
-			 "   Writes the sound to a file.\n\n"
-			 "   :arg filename: The path to write to.\n"
-			 "   :type filename: string\n"
-			 "   :arg rate: The sample rate to write with.\n"
-			 "   :type rate: int\n"
-			 "   :arg channels: The number of channels to write with.\n"
-			 "   :type channels: int\n"
-			 "   :arg format: The sample format to write with.\n"
-			 "   :type format: int\n"
-			 "   :arg container: The container format for the file.\n"
-			 "   :type container: int\n"
-			 "   :arg codec: The codec to use in the file.\n"
-			 "   :type codec: int\n"
-			 "   :arg bitrate: The bitrate to write with.\n"
-			 "   :type bitrate: int\n"
-			 "   :arg buffersize: The size of the writing buffer.\n"
-			 "   :type buffersize: int");
+			 "write(filename, rate, channels, format, container, codec, bitrate, buffersize)\n\n"
+			 "Writes the sound to a file.\n\n"
+			 ":arg filename: The path to write to.\n"
+			 ":type filename: string\n"
+			 ":arg rate: The sample rate to write with.\n"
+			 ":type rate: int\n"
+			 ":arg channels: The number of channels to write with.\n"
+			 ":type channels: int\n"
+			 ":arg format: The sample format to write with.\n"
+			 ":type format: int\n"
+			 ":arg container: The container format for the file.\n"
+			 ":type container: int\n"
+			 ":arg codec: The codec to use in the file.\n"
+			 ":type codec: int\n"
+			 ":arg bitrate: The bitrate to write with.\n"
+			 ":type bitrate: int\n"
+			 ":arg buffersize: The size of the writing buffer.\n"
+			 ":type buffersize: int\n");
 
 static PyObject *
 Sound_write(Sound* self, PyObject* args, PyObject* kwds)
@@ -286,14 +286,14 @@ Sound_write(Sound* self, PyObject* args, PyObject* kwds)
 }
 
 PyDoc_STRVAR(M_aud_Sound_buffer_doc,
-			 ".. classmethod:: buffer(data, rate)\n\n"
-			 "   Creates a sound from a data buffer.\n\n"
-			 "   :arg data: The data as two dimensional numpy array.\n"
-			 "   :type data: numpy.ndarray\n"
-			 "   :arg rate: The sample rate.\n"
-			 "   :type rate: double\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "buffer(data, rate)\n\n"
+			 "Creates a sound from a data buffer.\n\n"
+			 ":arg data: The data as two dimensional numpy array.\n"
+			 ":type data: numpy.ndarray\n"
+			 ":arg rate: The sample rate.\n"
+			 ":type rate: double\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_buffer(PyTypeObject* type, PyObject* args)
@@ -356,17 +356,16 @@ Sound_buffer(PyTypeObject* type, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_cache_doc,
-			 ".. classmethod:: cache()\n\n"
-			 "   Caches a sound into RAM.\n\n"
-			 "   This saves CPU usage needed for decoding and file access if the\n"
-			 "   underlying sound reads from a file on the harddisk,\n"
-			 "   but it consumes a lot of memory.\n\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`\n\n"
-			 "   .. note:: Only known-length factories can be buffered.\n\n"
-			 "   .. warning::\n\n"
-			 "      Raw PCM data needs a lot of space, only buffer\n"
-			 "      short factories.");
+			 "cache()\n\n"
+			 "Caches a sound into RAM.\n"
+			 "This saves CPU usage needed for decoding and file access if the "
+			 "underlying sound reads from a file on the harddisk, but it "
+			 "consumes a lot of memory.\n\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`\n\n"
+			 ".. note:: Only known-length factories can be buffered.\n\n"
+			 ".. warning:: Raw PCM data needs a lot of space, only buffer "
+			 "short factories.");
 
 static PyObject *
 Sound_cache(Sound* self)
@@ -392,16 +391,15 @@ Sound_cache(Sound* self)
 }
 
 PyDoc_STRVAR(M_aud_Sound_file_doc,
-			 ".. classmethod:: file(filename)\n\n"
-			 "   Creates a sound object of a sound file.\n\n"
-			 "   :arg filename: Path of the file.\n"
-			 "   :type filename: string\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`\n\n"
-			 "   .. warning::\n\n"
-			 "      If the file doesn't exist or can't be read you will\n"
-			 "      not get an exception immediately, but when you try to start\n"
-			 "      playback of that sound.\n");
+			 "file(filename)\n\n"
+			 "Creates a sound object of a sound file.\n\n"
+			 ":arg filename: Path of the file.\n"
+			 ":type filename: string\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`\n\n"
+			 ".. warning:: If the file doesn't exist or can't be read you will "
+			 "not get an exception immediately, but when you try to start "
+			 "playback of that sound.");
 
 static PyObject *
 Sound_file(PyTypeObject* type, PyObject* args)
@@ -432,15 +430,15 @@ Sound_file(PyTypeObject* type, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_sawtooth_doc,
-			 ".. classmethod:: sawtooth(frequency, rate=48000)\n\n"
-			 "   Creates a sawtooth sound which plays a sawtooth wave.\n\n"
-			 "   :arg frequency: The frequency of the sawtooth wave in Hz.\n"
-			 "   :type frequency: float\n"
-			 "   :arg rate: The sampling rate in Hz. It's recommended to set this\n"
-			 "      value to the playback device's samling rate to avoid resamping.\n"
-			 "   :type rate: int\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "sawtooth(frequency, rate=48000)\n\n"
+			 "Creates a sawtooth sound which plays a sawtooth wave.\n\n"
+			 ":arg frequency: The frequency of the sawtooth wave in Hz.\n"
+			 ":type frequency: float\n"
+			 ":arg rate: The sampling rate in Hz. It's recommended to set this "
+			 "value to the playback device's samling rate to avoid resamping.\n"
+			 ":type rate: int\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_sawtooth(PyTypeObject* type, PyObject* args)
@@ -472,13 +470,13 @@ Sound_sawtooth(PyTypeObject* type, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_silence_doc,
-			 ".. classmethod:: silence(rate=48000)\n\n"
-			 "   Creates a silence sound which plays simple silence.\n\n"
-			 "   :arg rate: The sampling rate in Hz. It's recommended to set this\n"
-			 "      value to the playback device's samling rate to avoid resamping.\n"
-			 "   :type rate: int\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "silence(rate=48000)\n\n"
+			 "Creates a silence sound which plays simple silence.\n\n"
+			 ":arg rate: The sampling rate in Hz. It's recommended to set this "
+			 "value to the playback device's samling rate to avoid resamping.\n"
+			 ":type rate: int\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_silence(PyTypeObject* type, PyObject* args)
@@ -509,15 +507,15 @@ Sound_silence(PyTypeObject* type, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_sine_doc,
-			 ".. classmethod:: sine(frequency, rate=48000)\n\n"
-			 "   Creates a sine sound which plays a sine wave.\n\n"
-			 "   :arg frequency: The frequency of the sine wave in Hz.\n"
-			 "   :type frequency: float\n"
-			 "   :arg rate: The sampling rate in Hz. It's recommended to set this\n"
-			 "      value to the playback device's samling rate to avoid resamping.\n"
-			 "   :type rate: int\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "sine(frequency, rate=48000)\n\n"
+			 "Creates a sine sound which plays a sine wave.\n\n"
+			 ":arg frequency: The frequency of the sine wave in Hz.\n"
+			 ":type frequency: float\n"
+			 ":arg rate: The sampling rate in Hz. It's recommended to set this "
+			 "value to the playback device's samling rate to avoid resamping.\n"
+			 ":type rate: int\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_sine(PyTypeObject* type, PyObject* args)
@@ -549,15 +547,15 @@ Sound_sine(PyTypeObject* type, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_square_doc,
-			 ".. classmethod:: square(frequency, rate=48000)\n\n"
-			 "   Creates a square sound which plays a square wave.\n\n"
-			 "   :arg frequency: The frequency of the square wave in Hz.\n"
-			 "   :type frequency: float\n"
-			 "   :arg rate: The sampling rate in Hz. It's recommended to set this\n"
-			 "      value to the playback device's samling rate to avoid resamping.\n"
-			 "   :type rate: int\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "square(frequency, rate=48000)\n\n"
+			 "Creates a square sound which plays a square wave.\n\n"
+			 ":arg frequency: The frequency of the square wave in Hz.\n"
+			 ":type frequency: float\n"
+			 ":arg rate: The sampling rate in Hz. It's recommended to set this "
+			 "value to the playback device's samling rate to avoid resamping.\n"
+			 ":type rate: int\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_square(PyTypeObject* type, PyObject* args)
@@ -589,15 +587,15 @@ Sound_square(PyTypeObject* type, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_triangle_doc,
-			 ".. classmethod:: triangle(frequency, rate=48000)\n\n"
-			 "   Creates a triangle sound which plays a triangle wave.\n\n"
-			 "   :arg frequency: The frequency of the triangle wave in Hz.\n"
-			 "   :type frequency: float\n"
-			 "   :arg rate: The sampling rate in Hz. It's recommended to set this\n"
-			 "      value to the playback device's samling rate to avoid resamping.\n"
-			 "   :type rate: int\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "triangle(frequency, rate=48000)\n\n"
+			 "Creates a triangle sound which plays a triangle wave.\n\n"
+			 ":arg frequency: The frequency of the triangle wave in Hz.\n"
+			 ":type frequency: float\n"
+			 ":arg rate: The sampling rate in Hz. It's recommended to set this "
+			 "value to the playback device's samling rate to avoid resamping.\n"
+			 ":type rate: int\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_triangle(PyTypeObject* type, PyObject* args)
@@ -629,16 +627,14 @@ Sound_triangle(PyTypeObject* type, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_accumulate_doc,
-			 ".. classmethod:: accumulate(additive=False)\n\n"
-			 "   Accumulates a sound by summing over positive input\n"
-			 "   differences thus generating a monotonic sigal.\n"
-			 "   If additivity is set to true negative input differences get added too,\n"
-			 "   but positive ones with a factor of two.\n\n"
-			 "   Note that with additivity the signal is not monotonic anymore.\n\n"
-			 "   :arg additive: Whether the accumulation should be additive or not.\n"
-			 "   :type time: bool\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "accumulate(additive=False)\n\n"
+			 "Accumulates a sound by summing over positive input differences thus generating a monotonic sigal. "
+			 "If additivity is set to true negative input differences get added too, but positive ones with a factor of two. "
+			 "Note that with additivity the signal is not monotonic anymore.\n\n"
+			 ":arg additive: Whether the accumulation should be additive or not.\n"
+			 ":type time: bool\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_accumulate(Sound* self, PyObject* args)
@@ -681,19 +677,19 @@ Sound_accumulate(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_ADSR_doc,
-			 ".. classmethod:: ADSR(attack, decay, sustain, release)\n\n"
-			 "   Attack-Decay-Sustain-Release envelopes the volume of a sound.\n"
-			 "   Note: there is currently no way to trigger the release with this API.\n\n"
-			 "   :arg attack: The attack time in seconds.\n"
-			 "   :type attack: float\n"
-			 "   :arg decay: The decay time in seconds.\n"
-			 "   :type decay: float\n"
-			 "   :arg sustain: The sustain level.\n"
-			 "   :type sustain: float\n"
-			 "   :arg release: The release level.\n"
-			 "   :type release: float\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "ADSR(attack,decay,sustain,release)\n\n"
+			 "Attack-Decay-Sustain-Release envelopes the volume of a sound. "
+			 "Note: there is currently no way to trigger the release with this API.\n\n"
+			 ":arg attack: The attack time in seconds.\n"
+			 ":type attack: float\n"
+			 ":arg decay: The decay time in seconds.\n"
+			 ":type decay: float\n"
+			 ":arg sustain: The sustain level.\n"
+			 ":type sustain: float\n"
+			 ":arg release: The release level.\n"
+			 ":type release: float\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_ADSR(Sound* self, PyObject* args)
@@ -724,12 +720,14 @@ Sound_ADSR(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_delay_doc,
-			 ".. classmethod:: delay(time)\n\n"
-			 "   Delays by playing adding silence in front of the other sound's data.\n\n"
-			 "   :arg time: How many seconds of silence should be added before the sound.\n"
-			 "   :type time: float\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "delay(time)\n\n"
+			 "Delays by playing adding silence in front of the other sound's "
+			 "data.\n\n"
+			 ":arg time: How many seconds of silence should be added before "
+			 "the sound.\n"
+			 ":type time: float\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_delay(Sound* self, PyObject* args)
@@ -760,18 +758,19 @@ Sound_delay(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_envelope_doc,
-			 ".. classmethod:: envelope(attack, release, threshold, arthreshold)\n\n"
-			 "   Delays by playing adding silence in front of the other sound's data.\n\n"
-			 "   :arg attack: The attack factor.\n"
-			 "   :type attack: float\n"
-			 "   :arg release: The release factor.\n"
-			 "   :type release: float\n"
-			 "   :arg threshold: The general threshold value.\n"
-			 "   :type threshold: float\n"
-			 "   :arg arthreshold: The attack/release threshold value.\n"
-			 "   :type arthreshold: float\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "envelope(attack, release, threshold, arthreshold)\n\n"
+			 "Delays by playing adding silence in front of the other sound's "
+			 "data.\n\n"
+			 ":arg attack: The attack factor.\n"
+			 ":type attack: float\n"
+			 ":arg release: The release factor.\n"
+			 ":type release: float\n"
+			 ":arg threshold: The general threshold value.\n"
+			 ":type threshold: float\n"
+			 ":arg arthreshold: The attack/release threshold value.\n"
+			 ":type arthreshold: float\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_envelope(Sound* self, PyObject* args)
@@ -802,16 +801,16 @@ Sound_envelope(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_fadein_doc,
-			 ".. classmethod:: fadein(start, length)\n\n"
-			 "   Fades a sound in by raising the volume linearly in the given\n"
-			 "   time interval.\n\n"
-			 "   :arg start: Time in seconds when the fading should start.\n"
-			 "   :type start: float\n"
-			 "   :arg length: Time in seconds how long the fading should last.\n"
-			 "   :type length: float\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`\n\n"
-			 "   .. note:: Before the fade starts it plays silence.");
+			 "fadein(start, length)\n\n"
+			 "Fades a sound in by raising the volume linearly in the given "
+			 "time interval.\n\n"
+			 ":arg start: Time in seconds when the fading should start.\n"
+			 ":type start: float\n"
+			 ":arg length: Time in seconds how long the fading should last.\n"
+			 ":type length: float\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`\n\n"
+			 ".. note:: Before the fade starts it plays silence.");
 
 static PyObject *
 Sound_fadein(Sound* self, PyObject* args)
@@ -842,18 +841,17 @@ Sound_fadein(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_fadeout_doc,
-			 ".. classmethod:: fadeout(start, length)\n\n"
-			 "   Fades a sound in by lowering the volume linearly in the given\n"
-			 "   time interval.\n\n"
-			 "   :arg start: Time in seconds when the fading should start.\n"
-			 "   :type start: float\n"
-			 "   :arg length: Time in seconds how long the fading should last.\n"
-			 "   :type length: float\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`\n\n"
-			 "   .. note::\n\n"
-			 "      After the fade this sound plays silence, so that\n"
-			 "      the length of the sound is not altered.");
+			 "fadeout(start, length)\n\n"
+			 "Fades a sound in by lowering the volume linearly in the given "
+			 "time interval.\n\n"
+			 ":arg start: Time in seconds when the fading should start.\n"
+			 ":type start: float\n"
+			 ":arg length: Time in seconds how long the fading should last.\n"
+			 ":type length: float\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`\n\n"
+			 ".. note:: After the fade this sound plays silence, so that "
+			 "the length of the sound is not altered.");
 
 static PyObject *
 Sound_fadeout(Sound* self, PyObject* args)
@@ -884,20 +882,20 @@ Sound_fadeout(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_filter_doc,
-			 ".. classmethod:: filter(b, a = (1))\n\n"
-			 "   Filters a sound with the supplied IIR filter coefficients.\n"
-			 "   Without the second parameter you'll get a FIR filter.\n\n"
-			 "   If the first value of the a sequence is 0,\n"
-			 "   it will be set to 1 automatically.\n"
-			 "   If the first value of the a sequence is neither 0 nor 1, all\n"
-			 "   filter coefficients will be scaled by this value so that it is 1\n"
-			 "   in the end, you don't have to scale yourself.\n\n"
-			 "   :arg b: The nominator filter coefficients.\n"
-			 "   :type b: sequence of float\n"
-			 "   :arg a: The denominator filter coefficients.\n"
-			 "   :type a: sequence of float\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "filter(b, a = (1))\n\n"
+			 "Filters a sound with the supplied IIR filter coefficients.\n"
+			 "Without the second parameter you'll get a FIR filter.\n"
+			 "If the first value of the a sequence is 0 it will be set to 1 "
+			 "automatically.\n"
+			 "If the first value of the a sequence is neither 0 nor 1, all "
+			 "filter coefficients will be scaled by this value so that it is 1 "
+			 "in the end, you don't have to scale yourself.\n\n"
+			 ":arg b: The nominator filter coefficients.\n"
+			 ":type b: sequence of float\n"
+			 ":arg a: The denominator filter coefficients.\n"
+			 ":type a: sequence of float\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_filter(Sound* self, PyObject* args)
@@ -984,15 +982,15 @@ Sound_filter(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_highpass_doc,
-			 ".. classmethod:: highpass(frequency, Q=0.5)\n\n"
-			 "   Creates a second order highpass filter based on the transfer\n"
-			 "   function :math:`H(s) = s^2 / (s^2 + s/Q + 1)`\n\n"
-			 "   :arg frequency: The cut off trequency of the highpass.\n"
-			 "   :type frequency: float\n"
-			 "   :arg Q: Q factor of the lowpass.\n"
-			 "   :type Q: float\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "highpass(frequency, Q=0.5)\n\n"
+			 "Creates a second order highpass filter based on the transfer "
+			 "function H(s) = s^2 / (s^2 + s/Q + 1)\n\n"
+			 ":arg frequency: The cut off trequency of the highpass.\n"
+			 ":type frequency: float\n"
+			 ":arg Q: Q factor of the lowpass.\n"
+			 ":type Q: float\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_highpass(Sound* self, PyObject* args)
@@ -1024,14 +1022,14 @@ Sound_highpass(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_limit_doc,
-			 ".. classmethod:: limit(start, end)\n\n"
-			 "   Limits a sound within a specific start and end time.\n\n"
-			 "   :arg start: Start time in seconds.\n"
-			 "   :type start: float\n"
-			 "   :arg end: End time in seconds.\n"
-			 "   :type end: float\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "limit(start, end)\n\n"
+			 "Limits a sound within a specific start and end time.\n\n"
+			 ":arg start: Start time in seconds.\n"
+			 ":type start: float\n"
+			 ":arg end: End time in seconds.\n"
+			 ":type end: float\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_limit(Sound* self, PyObject* args)
@@ -1062,16 +1060,15 @@ Sound_limit(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_loop_doc,
-			 ".. classmethod:: loop(count)\n\n"
-			 "   Loops a sound.\n\n"
-			 "   :arg count: How often the sound should be looped.\n"
-			 "      Negative values mean endlessly.\n"
-			 "   :type count: integer\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`\n\n"
-			 "   .. note::\n\n"
-			 "      This is a filter function, you might consider using\n"
-			 "      :attr:`Handle.loop_count` instead.");
+			 "loop(count)\n\n"
+			 "Loops a sound.\n\n"
+			 ":arg count: How often the sound should be looped. "
+			 "Negative values mean endlessly.\n"
+			 ":type count: integer\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`\n\n"
+			 ".. note:: This is a filter function, you might consider using "
+			 ":attr:`Handle.loop_count` instead.");
 
 static PyObject *
 Sound_loop(Sound* self, PyObject* args)
@@ -1102,15 +1099,15 @@ Sound_loop(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_lowpass_doc,
-			 ".. classmethod:: lowpass(frequency, Q=0.5)\n\n"
-			 "   Creates a second order lowpass filter based on the transfer "
-			 "   function :math:`H(s) = 1 / (s^2 + s/Q + 1)`\n\n"
-			 "   :arg frequency: The cut off trequency of the lowpass.\n"
-			 "   :type frequency: float\n"
-			 "   :arg Q: Q factor of the lowpass.\n"
-			 "   :type Q: float\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "lowpass(frequency, Q=0.5)\n\n"
+			 "Creates a second order lowpass filter based on the transfer "
+			 "function H(s) = 1 / (s^2 + s/Q + 1)\n\n"
+			 ":arg frequency: The cut off trequency of the lowpass.\n"
+			 ":type frequency: float\n"
+			 ":arg Q: Q factor of the lowpass.\n"
+			 ":type Q: float\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_lowpass(Sound* self, PyObject* args)
@@ -1142,15 +1139,14 @@ Sound_lowpass(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_modulate_doc,
-			 ".. classmethod:: modulate(sound)\n\n"
-			 "   Modulates two factories.\n\n"
-			 "   :arg sound: The sound to modulate over the other.\n"
-			 "   :type sound: :class:`Sound`\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`\n\n"
-			 "   .. note::\n\n"
-			 "      The two factories have to have the same specifications\n"
-			 "      (channels and samplerate).");
+			 "modulate(sound)\n\n"
+			 "Modulates two factories.\n\n"
+			 ":arg sound: The sound to modulate over the other.\n"
+			 ":type sound: :class:`Sound`\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`\n\n"
+			 ".. note:: The two factories have to have the same specifications "
+			 "(channels and samplerate).");
 
 static PyObject *
 Sound_modulate(Sound* self, PyObject* object)
@@ -1184,19 +1180,17 @@ Sound_modulate(Sound* self, PyObject* object)
 }
 
 PyDoc_STRVAR(M_aud_Sound_pitch_doc,
-			 ".. classmethod:: pitch(factor)\n\n"
-			 "   Changes the pitch of a sound with a specific factor.\n\n"
-			 "   :arg factor: The factor to change the pitch with.\n"
-			 "   :type factor: float\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`\n\n"
-			 "   .. note::\n\n"
-			 "      This is done by changing the sample rate of the\n"
-			 "      underlying sound, which has to be an integer, so the factor\n"
-			 "      value rounded and the factor may not be 100 % accurate.\n\n"
-			 "   .. note::\n\n"
-			 "      This is a filter function, you might consider using\n"
-			 "      :attr:`Handle.pitch` instead.");
+			 "pitch(factor)\n\n"
+			 "Changes the pitch of a sound with a specific factor.\n\n"
+			 ":arg factor: The factor to change the pitch with.\n"
+			 ":type factor: float\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`\n\n"
+			 ".. note:: This is done by changing the sample rate of the "
+			 "underlying sound, which has to be an integer, so the factor "
+			 "value rounded and the factor may not be 100 % accurate.\n\n"
+			 ".. note:: This is a filter function, you might consider using "
+			 ":attr:`Handle.pitch` instead.");
 
 static PyObject *
 Sound_pitch(Sound* self, PyObject* args)
@@ -1227,12 +1221,12 @@ Sound_pitch(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_rechannel_doc,
-			 ".. classmethod:: rechannel(channels)\n\n"
-			 "   Rechannels the sound.\n\n"
-			 "   :arg channels: The new channel configuration.\n"
-			 "   :type channels: int\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "rechannel(channels)\n\n"
+			 "Rechannels the sound.\n\n"
+			 ":arg channels: The new channel configuration.\n"
+			 ":type channels: int\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_rechannel(Sound* self, PyObject* args)
@@ -1267,14 +1261,14 @@ Sound_rechannel(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_resample_doc,
-			 ".. classmethod:: resample(rate, high_quality)\n\n"
-			 "   Resamples the sound.\n\n"
-			 "   :arg rate: The new sample rate.\n"
-			 "   :type rate: double\n"
-			 "   :arg high_quality: When true use a higher quality but slower resampler.\n"
-			 "   :type high_quality: bool\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "resample(rate, high_quality)\n\n"
+			 "Resamples the sound.\n\n"
+			 ":arg rate: The new sample rate.\n"
+			 ":type rate: double\n"
+			 ":arg high_quality: When true use a higher quality but slower resampler.\n"
+			 ":type high_quality: bool\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_resample(Sound* self, PyObject* args)
@@ -1322,19 +1316,17 @@ Sound_resample(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_reverse_doc,
-			 ".. classmethod:: reverse()\n\n"
-			 "   Plays a sound reversed.\n\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`\n\n"
-			 "   .. note::\n\n"
-			 "      The sound has to have a finite length and has to be seekable.\n"
-			 "      It's recommended to use this only with factories with\n"
-			 "      fast and accurate seeking, which is not true for encoded audio\n"
-			 "      files, such ones should be buffered using :meth:`cache` before\n"
-			 "      being played reversed.\n\n"
-			 "   .. warning::\n\n"
-			 "      If seeking is not accurate in the underlying sound\n"
-			 "      you'll likely hear skips/jumps/cracks.");
+			 "reverse()\n\n"
+			 "Plays a sound reversed.\n\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`\n\n"
+			 ".. note:: The sound has to have a finite length and has to be "
+			 "seekable. It's recommended to use this only with factories	 with "
+			 "fast and accurate seeking, which is not true for encoded audio "
+			 "files, such ones should be buffered using :meth:`cache` before "
+			 "being played reversed.\n\n"
+			 ".. warning:: If seeking is not accurate in the underlying sound "
+			 "you'll likely hear skips/jumps/cracks.");
 
 static PyObject *
 Sound_reverse(Sound* self)
@@ -1360,10 +1352,10 @@ Sound_reverse(Sound* self)
 }
 
 PyDoc_STRVAR(M_aud_Sound_sum_doc,
-			 ".. classmethod:: sum()\n\n"
-			 "   Sums the samples of a sound.\n\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "sum()\n\n"
+			 "Sums the samples of a sound.\n\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_sum(Sound* self)
@@ -1389,12 +1381,12 @@ Sound_sum(Sound* self)
 }
 
 PyDoc_STRVAR(M_aud_Sound_threshold_doc,
-			 ".. classmethod:: threshold(threshold = 0)\n\n"
-			 "   Makes a threshold wave out of an audio wave by setting all samples\n"
-			 "   with a amplitude >= threshold to 1, all <= -threshold to -1 and\n"
-			 "   all between to 0.\n\n"
-			 "   :arg threshold: Threshold value over which an amplitude counts\n"
-			 "      non-zero.\n"
+			 "threshold(threshold = 0)\n\n"
+			 "Makes a threshold wave out of an audio wave by setting all samples "
+			 "with a amplitude >= threshold to 1, all <= -threshold to -1 and "
+			 "all between to 0.\n\n"
+			 ":arg threshold: Threshold value over which an amplitude counts "
+			 "non-zero.\n"
 			 ":type threshold: float\n"
 			 ":return: The created :class:`Sound` object.\n"
 			 ":rtype: :class:`Sound`");
@@ -1428,16 +1420,15 @@ Sound_threshold(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_volume_doc,
-			 ".. classmethod:: volume(volume)\n\n"
-			 "   Changes the volume of a sound.\n\n"
-			 "   :arg volume: The new volume..\n"
-			 "   :type volume: float\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`\n\n"
-			 "   .. note:: Should be in the range [0, 1] to avoid clipping.\n\n"
-			 "   .. note::\n\n"
-			 "      This is a filter function, you might consider using\n"
-			 "      :attr:`Handle.volume` instead.");
+			 "volume(volume)\n\n"
+			 "Changes the volume of a sound.\n\n"
+			 ":arg volume: The new volume..\n"
+			 ":type volume: float\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`\n\n"
+			 ".. note:: Should be in the range [0, 1] to avoid clipping.\n\n"
+			 ".. note:: This is a filter function, you might consider using "
+			 ":attr:`Handle.volume` instead.");
 
 static PyObject *
 Sound_volume(Sound* self, PyObject* args)
@@ -1468,15 +1459,14 @@ Sound_volume(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_join_doc,
-			 ".. classmethod:: join(sound)\n\n"
-			 "   Plays two factories in sequence.\n\n"
-			 "   :arg sound: The sound to play second.\n"
-			 "   :type sound: :class:`Sound`\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`\n\n"
-			 "   .. note::\n\n"
-			 "   The two factories have to have the same specifications\n"
-			 "   (channels and samplerate).");
+			 "join(sound)\n\n"
+			 "Plays two factories in sequence.\n\n"
+			 ":arg sound: The sound to play second.\n"
+			 ":type sound: :class:`Sound`\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`\n\n"
+			 ".. note:: The two factories have to have the same specifications "
+			 "(channels and samplerate).");
 
 static PyObject *
 Sound_join(Sound* self, PyObject* object)
@@ -1511,15 +1501,14 @@ Sound_join(Sound* self, PyObject* object)
 }
 
 PyDoc_STRVAR(M_aud_Sound_mix_doc,
-			 ".. classmethod:: mix(sound)\n\n"
-			 "   Mixes two factories.\n\n"
-			 "   :arg sound: The sound to mix over the other.\n"
-			 "   :type sound: :class:`Sound`\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`\n\n"
-			 "   .. note::\n\n"
-			 "      The two factories have to have the same specifications\n"
-			 "      (channels and samplerate).");
+			 "mix(sound)\n\n"
+			 "Mixes two factories.\n\n"
+			 ":arg sound: The sound to mix over the other.\n"
+			 ":type sound: :class:`Sound`\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`\n\n"
+			 ".. note:: The two factories have to have the same specifications "
+			 "(channels and samplerate).");
 
 static PyObject *
 Sound_mix(Sound* self, PyObject* object)
@@ -1553,11 +1542,11 @@ Sound_mix(Sound* self, PyObject* object)
 }
 
 PyDoc_STRVAR(M_aud_Sound_pingpong_doc,
-			 ".. classmethod:: pingpong()\n\n"
-			 "   Plays a sound forward and then backward.\n"
-			 "   This is like joining a sound with its reverse.\n\n"
-			 "   :return: The created :class:`Sound` object.\n"
-			 "   :rtype: :class:`Sound`");
+			 "pingpong()\n\n"
+			 "Plays a sound forward and then backward.\n"
+			 "This is like joining a sound with its reverse.\n\n"
+			 ":return: The created :class:`Sound` object.\n"
+			 ":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_pingpong(Sound* self)
@@ -1583,12 +1572,12 @@ Sound_pingpong(Sound* self)
 }
 
 PyDoc_STRVAR(M_aud_Sound_list_doc,
-	".. classmethod:: list()\n\n"
-	"   Creates an empty sound list that can contain several sounds.\n\n"
-	"   :arg random: whether the playback will be random or not.\n"
-	"   :type random: int\n"
-	"   :return: The created :class:`Sound` object.\n"
-	"   :rtype: :class:`Sound`");
+	"list()\n\n"
+	"Creates an empty sound list that can contain several sounds.\n\n"
+	":arg random: wether the playback will be random or not.\n"
+	":type random: int\n"
+	":return: The created :class:`Sound` object.\n"
+	":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_list(PyTypeObject* type, PyObject* args)
@@ -1619,11 +1608,11 @@ Sound_list(PyTypeObject* type, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_mutable_doc,
-	".. classmethod:: mutable()\n\n"
-	"   Creates a sound that will be restarted when sought backwards.\n"
-	"   If the original sound is a sound list, the playing sound can change.\n\n"
-	"   :return: The created :class:`Sound` object.\n"
-	"   :rtype: :class:`Sound`");
+	"mutable()\n\n"
+	"Creates a sound that will be restarted when sought backwards.\n"
+	"If the original sound is a sound list, the playing sound can change.\n\n"
+	":return: The created :class:`Sound` object.\n"
+	":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_mutable(Sound* self)
@@ -1649,12 +1638,12 @@ Sound_mutable(Sound* self)
 }
 
 PyDoc_STRVAR(M_aud_Sound_list_addSound_doc,
-	".. classmethod:: addSound(sound)\n\n"
-	"   Adds a new sound to a sound list.\n\n"
-	"   :arg sound: The sound that will be added to the list.\n"
-	"   :type sound: :class:`Sound`\n\n"
-	"   .. note:: You can only add a sound to a sound list.");
-
+	"addSound(sound)\n\n"
+	"Adds a new sound to a sound list.\n\n"
+	":arg sound: The sound that will be added to the list.\n"
+	":type sound: :class:`Sound`\n\n"
+	".. note:: You can only add a sound to a sound list.");
+	
 static PyObject *
 Sound_list_addSound(Sound* self, PyObject* object)
 {
@@ -1682,14 +1671,14 @@ Sound_list_addSound(Sound* self, PyObject* object)
 #ifdef WITH_CONVOLUTION
 
 PyDoc_STRVAR(M_aud_Sound_convolver_doc,
-	".. classmethod:: convolver()\n\n"
-	"   Creates a sound that will apply convolution to another sound.\n\n"
-	"   :arg impulseResponse: The filter with which convolve the sound.\n"
-	"   :type impulseResponse: :class:`ImpulseResponse`\n"
-	"   :arg threadPool: A thread pool used to parallelize convolution.\n"
-	"   :type threadPool: :class:`ThreadPool`\n"
-	"   :return: The created :class:`Sound` object.\n"
-	"   :rtype: :class:`Sound`");
+	"convolver()\n\n"
+	"Creates a sound that will apply convolution to another sound.\n\n"
+	":arg impulseResponse: The filter with which convolve the sound.\n"
+	":type impulseResponse: :class:`ImpulseResponse`\n"
+	":arg threadPool: A thread pool used to parallelize convolution.\n"
+	":type threadPool: :class:`ThreadPool`\n"
+	":return: The created :class:`Sound` object.\n"
+	":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_convolver(Sound* self, PyObject* args)
@@ -1731,16 +1720,16 @@ Sound_convolver(Sound* self, PyObject* args)
 }
 
 PyDoc_STRVAR(M_aud_Sound_binaural_doc,
-	".. classmethod:: convolver()\n\n"
-	"   Creates a binaural sound using another sound as source. The original sound must be mono\n\n"
-	"   :arg hrtfs: An HRTF set.\n"
-	"   :type hrtf: :class:`HRTF`\n"
-	"   :arg source: An object representing the source position of the sound.\n"
-	"   :type source: :class:`Source`\n"
-	"   :arg threadPool: A thread pool used to parallelize convolution.\n"
-	"   :type threadPool: :class:`ThreadPool`\n"
-	"   :return: The created :class:`Sound` object.\n"
-	"   :rtype: :class:`Sound`");
+	"convolver()\n\n"
+	"Creates a binaural sound using another sound as source. The original sound must be mono\n\n"
+	":arg hrtfs: An HRTF set.\n"
+	":type hrtf: :class:`HRTF`\n"
+	":arg source: An object representing the source position of the sound.\n"
+	":type source: :class:`Source`\n"
+	":arg threadPool: A thread pool used to parallelize convolution.\n"
+	":type threadPool: :class:`ThreadPool`\n"
+	":return: The created :class:`Sound` object.\n"
+	":rtype: :class:`Sound`");
 
 static PyObject *
 Sound_binaural(Sound* self, PyObject* args)

extern/mantaflow/UPDATE.sh

@@ -71,7 +71,7 @@ rm $BLENDER_INSTALLATION/blender/tmp/preprocessed/fileio/*.reg
 cd $BLENDER_INSTALLATION/blender/tmp/
 
 echo "Applying clang format to Mantaflow source files"
-find . -iname *.h -o -iname *.cpp | xargs clang-format --verbose -i -style=file -sort-includes=0
+find . -iname *.h -o -iname *.cpp | xargs clang-format --verbose -i -style=file
 find . -iname *.h -o -iname *.cpp | xargs dos2unix --verbose
 
 # ==================== 5) MOVE MANTAFLOW FILES TO EXTERN/ ================================

extern/mantaflow/preprocessed/gitinfo.h

@@ -1,3 +1,3 @@
 
 
-#define MANTA_GIT_VERSION "commit 21303fab2eda588ec22988bf9e5762d2001c131f"
+#define MANTA_GIT_VERSION "commit 5fbd3d04381b21afce4a593d1fe2d9bc7bef5424"

extern/mantaflow/preprocessed/grid.cpp

@@ -853,147 +853,6 @@ template<class T> struct knPermuteAxes : public KernelBase {
   int axis2;
 };
 
-struct knJoinVec : public KernelBase {
-  knJoinVec(Grid<Vec3> &a, const Grid<Vec3> &b, bool keepMax)
-      : KernelBase(&a, 0), a(a), b(b), keepMax(keepMax)
-  {
-    runMessage();
-    run();
-  }
-  inline void op(IndexInt idx, Grid<Vec3> &a, const Grid<Vec3> &b, bool keepMax) const
-  {
-    Real a1 = normSquare(a[idx]);
-    Real b1 = normSquare(b[idx]);
-    a[idx] = (keepMax) ? max(a1, b1) : min(a1, b1);
-  }
-  inline Grid<Vec3> &getArg0()
-  {
-    return a;
-  }
-  typedef Grid<Vec3> type0;
-  inline const Grid<Vec3> &getArg1()
-  {
-    return b;
-  }
-  typedef Grid<Vec3> type1;
-  inline bool &getArg2()
-  {
-    return keepMax;
-  }
-  typedef bool type2;
-  void runMessage()
-  {
-    debMsg("Executing kernel knJoinVec ", 3);
-    debMsg("Kernel range"
-               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
-           4);
-  };
-  void operator()(const tbb::blocked_range<IndexInt> &__r) const
-  {
-    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
-      op(idx, a, b, keepMax);
-  }
-  void run()
-  {
-    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
-  }
-  Grid<Vec3> &a;
-  const Grid<Vec3> &b;
-  bool keepMax;
-};
-struct knJoinInt : public KernelBase {
-  knJoinInt(Grid<int> &a, const Grid<int> &b, bool keepMax)
-      : KernelBase(&a, 0), a(a), b(b), keepMax(keepMax)
-  {
-    runMessage();
-    run();
-  }
-  inline void op(IndexInt idx, Grid<int> &a, const Grid<int> &b, bool keepMax) const
-  {
-    a[idx] = (keepMax) ? max(a[idx], b[idx]) : min(a[idx], b[idx]);
-  }
-  inline Grid<int> &getArg0()
-  {
-    return a;
-  }
-  typedef Grid<int> type0;
-  inline const Grid<int> &getArg1()
-  {
-    return b;
-  }
-  typedef Grid<int> type1;
-  inline bool &getArg2()
-  {
-    return keepMax;
-  }
-  typedef bool type2;
-  void runMessage()
-  {
-    debMsg("Executing kernel knJoinInt ", 3);
-    debMsg("Kernel range"
-               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
-           4);
-  };
-  void operator()(const tbb::blocked_range<IndexInt> &__r) const
-  {
-    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
-      op(idx, a, b, keepMax);
-  }
-  void run()
-  {
-    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
-  }
-  Grid<int> &a;
-  const Grid<int> &b;
-  bool keepMax;
-};
-struct knJoinReal : public KernelBase {
-  knJoinReal(Grid<Real> &a, const Grid<Real> &b, bool keepMax)
-      : KernelBase(&a, 0), a(a), b(b), keepMax(keepMax)
-  {
-    runMessage();
-    run();
-  }
-  inline void op(IndexInt idx, Grid<Real> &a, const Grid<Real> &b, bool keepMax) const
-  {
-    a[idx] = (keepMax) ? max(a[idx], b[idx]) : min(a[idx], b[idx]);
-  }
-  inline Grid<Real> &getArg0()
-  {
-    return a;
-  }
-  typedef Grid<Real> type0;
-  inline const Grid<Real> &getArg1()
-  {
-    return b;
-  }
-  typedef Grid<Real> type1;
-  inline bool &getArg2()
-  {
-    return keepMax;
-  }
-  typedef bool type2;
-  void runMessage()
-  {
-    debMsg("Executing kernel knJoinReal ", 3);
-    debMsg("Kernel range"
-               << " x " << maxX << " y " << maxY << " z " << minZ << " - " << maxZ << " ",
-           4);
-  };
-  void operator()(const tbb::blocked_range<IndexInt> &__r) const
-  {
-    for (IndexInt idx = __r.begin(); idx != (IndexInt)__r.end(); idx++)
-      op(idx, a, b, keepMax);
-  }
-  void run()
-  {
-    tbb::parallel_for(tbb::blocked_range<IndexInt>(0, size), *this);
-  }
-  Grid<Real> &a;
-  const Grid<Real> &b;
-  bool keepMax;
-};
-
 template<class T> Grid<T> &Grid<T>::safeDivide(const Grid<T> &a)
 {
   knGridSafeDiv<T>(*this, a);
@@ -1069,18 +928,6 @@ void Grid<T>::permuteAxesCopyToGrid(int axis0, int axis1, int axis2, Grid<T> &ou
             "Permuted grids must have the same dimensions!");
   knPermuteAxes<T>(*this, out, axis0, axis1, axis2);
 }
-template<> void Grid<Vec3>::join(const Grid<Vec3> &a, bool keepMax)
-{
-  knJoinVec(*this, a, keepMax);
-}
-template<> void Grid<int>::join(const Grid<int> &a, bool keepMax)
-{
-  knJoinInt(*this, a, keepMax);
-}
-template<> void Grid<Real>::join(const Grid<Real> &a, bool keepMax)
-{
-  knJoinReal(*this, a, keepMax);
-}
 
 template<> Real Grid<Real>::getMax() const
 {

extern/mantaflow/preprocessed/grid.h

@@ -966,38 +966,10 @@ template<class T> class Grid : public GridBase {
     }
   }
 
-  //! join other grid by either keeping min or max value at cell
-  void join(const Grid<T> &a, bool keepMax = true);
-  static PyObject *_W_27(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
-  {
-    try {
-      PbArgs _args(_linargs, _kwds);
-      Grid *pbo = dynamic_cast<Grid *>(Pb::objFromPy(_self));
-      bool noTiming = _args.getOpt<bool>("notiming", -1, 0);
-      pbPreparePlugin(pbo->getParent(), "Grid::join", !noTiming);
-      PyObject *_retval = 0;
-      {
-        ArgLocker _lock;
-        const Grid<T> &a = *_args.getPtr<Grid<T>>("a", 0, &_lock);
-        bool keepMax = _args.getOpt<bool>("keepMax", 1, true, &_lock);
-        pbo->_args.copy(_args);
-        _retval = getPyNone();
-        pbo->join(a, keepMax);
-        pbo->_args.check();
-      }
-      pbFinalizePlugin(pbo->getParent(), "Grid::join", !noTiming);
-      return _retval;
-    }
-    catch (std::exception &e) {
-      pbSetError("Grid::join", e.what());
-      return 0;
-    }
-  }
-
   // common compound operators
   //! get absolute max value in grid
   Real getMaxAbs() const;
-  static PyObject *_W_28(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_27(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1022,7 +994,7 @@ template<class T> class Grid : public GridBase {
 
   //! get max value in grid
   Real getMax() const;
-  static PyObject *_W_29(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_28(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1047,7 +1019,7 @@ template<class T> class Grid : public GridBase {
 
   //! get min value in grid
   Real getMin() const;
-  static PyObject *_W_30(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_29(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1072,7 +1044,7 @@ template<class T> class Grid : public GridBase {
 
   //! calculate L1 norm of grid content
   Real getL1(int bnd = 0);
-  static PyObject *_W_31(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_30(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1098,7 +1070,7 @@ template<class T> class Grid : public GridBase {
 
   //! calculate L2 norm of grid content
   Real getL2(int bnd = 0);
-  static PyObject *_W_32(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_31(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1124,7 +1096,7 @@ template<class T> class Grid : public GridBase {
 
   //! set all boundary cells to constant value (Dirichlet)
   void setBound(T value, int boundaryWidth = 1);
-  static PyObject *_W_33(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_32(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1152,7 +1124,7 @@ template<class T> class Grid : public GridBase {
 
   //! set all boundary cells to last inner value (Neumann)
   void setBoundNeumann(int boundaryWidth = 1);
-  static PyObject *_W_34(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_33(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1179,7 +1151,7 @@ template<class T> class Grid : public GridBase {
 
   //! get data pointer of grid
   std::string getDataPointer();
-  static PyObject *_W_35(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_34(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1204,7 +1176,7 @@ template<class T> class Grid : public GridBase {
 
   //! debugging helper, print grid from python. skip boundary of width bnd
   void printGrid(int zSlice = -1, bool printIndex = false, int bnd = 1);
-  static PyObject *_W_36(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_35(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1272,7 +1244,7 @@ class MACGrid : public Grid<Vec3> {
   {
     mType = (GridType)(TypeMAC | TypeVec3);
   }
-  static int _W_37(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static int _W_36(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     PbClass *obj = Pb::objFromPy(_self);
     if (obj)
@@ -1354,7 +1326,7 @@ class MACGrid : public Grid<Vec3> {
   //! set all boundary cells of a MAC grid to certain value (Dirchlet). Respects staggered grid
   //! locations optionally, only set normal components
   void setBoundMAC(Vec3 value, int boundaryWidth, bool normalOnly = false);
-  static PyObject *_W_38(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_37(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1395,7 +1367,7 @@ class FlagGrid : public Grid<int> {
   {
     mType = (GridType)(TypeFlags | TypeInt);
   }
-  static int _W_39(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static int _W_38(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     PbClass *obj = Pb::objFromPy(_self);
     if (obj)
@@ -1575,7 +1547,7 @@ class FlagGrid : public Grid<int> {
                   const std::string &inflow = "      ",
                   const std::string &outflow = "      ",
                   Grid<Real> *phiWalls = 0x00);
-  static PyObject *_W_40(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_39(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1609,7 +1581,7 @@ class FlagGrid : public Grid<int> {
 
   //! set fluid flags inside levelset (liquids)
   void updateFromLevelset(LevelsetGrid &levelset);
-  static PyObject *_W_41(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_40(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1636,7 +1608,7 @@ class FlagGrid : public Grid<int> {
 
   //! set all cells (except obs/in/outflow) to type (fluid by default)
   void fillGrid(int type = TypeFluid);
-  static PyObject *_W_42(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_41(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);
@@ -1665,7 +1637,7 @@ class FlagGrid : public Grid<int> {
   //! warning for large grids! only regular int returned (due to python interface)
   //! optionally creates mask in RealGrid (1 where flag matches, 0 otherwise)
   int countCells(int flag, int bnd = 0, Grid<Real> *mask = NULL);
-  static PyObject *_W_43(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
+  static PyObject *_W_42(PyObject *_self, PyObject *_linargs, PyObject *_kwds)
   {
     try {
       PbArgs _args(_linargs, _kwds);

extern/mantaflow/preprocessed/grid.h.reg.cpp

@@ -8,11 +8,11 @@ namespace Manta {
 #ifdef _C_FlagGrid
 static const Pb::Register _R_26("FlagGrid", "FlagGrid", "Grid<int>");
 template<> const char *Namify<FlagGrid>::S = "FlagGrid";
-static const Pb::Register _R_27("FlagGrid", "FlagGrid", FlagGrid::_W_39);
-static const Pb::Register _R_28("FlagGrid", "initDomain", FlagGrid::_W_40);
-static const Pb::Register _R_29("FlagGrid", "updateFromLevelset", FlagGrid::_W_41);
-static const Pb::Register _R_30("FlagGrid", "fillGrid", FlagGrid::_W_42);
-static const Pb::Register _R_31("FlagGrid", "countCells", FlagGrid::_W_43);
+static const Pb::Register _R_27("FlagGrid", "FlagGrid", FlagGrid::_W_38);
+static const Pb::Register _R_28("FlagGrid", "initDomain", FlagGrid::_W_39);
+static const Pb::Register _R_29("FlagGrid", "updateFromLevelset", FlagGrid::_W_40);
+static const Pb::Register _R_30("FlagGrid", "fillGrid", FlagGrid::_W_41);
+static const Pb::Register _R_31("FlagGrid", "countCells", FlagGrid::_W_42);
 #endif
 #ifdef _C_Grid
 static const Pb::Register _R_32("Grid<int>", "Grid<int>", "GridBase");
@@ -35,95 +35,92 @@ static const Pb::Register _R_47("Grid<int>", "clamp", Grid<int>::_W_23);
 static const Pb::Register _R_48("Grid<int>", "stomp", Grid<int>::_W_24);
 static const Pb::Register _R_49("Grid<int>", "permuteAxes", Grid<int>::_W_25);
 static const Pb::Register _R_50("Grid<int>", "permuteAxesCopyToGrid", Grid<int>::_W_26);
-static const Pb::Register _R_51("Grid<int>", "join", Grid<int>::_W_27);
-static const Pb::Register _R_52("Grid<int>", "getMaxAbs", Grid<int>::_W_28);
-static const Pb::Register _R_53("Grid<int>", "getMax", Grid<int>::_W_29);
-static const Pb::Register _R_54("Grid<int>", "getMin", Grid<int>::_W_30);
-static const Pb::Register _R_55("Grid<int>", "getL1", Grid<int>::_W_31);
-static const Pb::Register _R_56("Grid<int>", "getL2", Grid<int>::_W_32);
-static const Pb::Register _R_57("Grid<int>", "setBound", Grid<int>::_W_33);
-static const Pb::Register _R_58("Grid<int>", "setBoundNeumann", Grid<int>::_W_34);
-static const Pb::Register _R_59("Grid<int>", "getDataPointer", Grid<int>::_W_35);
-static const Pb::Register _R_60("Grid<int>", "printGrid", Grid<int>::_W_36);
-static const Pb::Register _R_61("Grid<Real>", "Grid<Real>", "GridBase");
+static const Pb::Register _R_51("Grid<int>", "getMaxAbs", Grid<int>::_W_27);
+static const Pb::Register _R_52("Grid<int>", "getMax", Grid<int>::_W_28);
+static const Pb::Register _R_53("Grid<int>", "getMin", Grid<int>::_W_29);
+static const Pb::Register _R_54("Grid<int>", "getL1", Grid<int>::_W_30);
+static const Pb::Register _R_55("Grid<int>", "getL2", Grid<int>::_W_31);
+static const Pb::Register _R_56("Grid<int>", "setBound", Grid<int>::_W_32);
+static const Pb::Register _R_57("Grid<int>", "setBoundNeumann", Grid<int>::_W_33);
+static const Pb::Register _R_58("Grid<int>", "getDataPointer", Grid<int>::_W_34);
+static const Pb::Register _R_59("Grid<int>", "printGrid", Grid<int>::_W_35);
+static const Pb::Register _R_60("Grid<Real>", "Grid<Real>", "GridBase");
 template<> const char *Namify<Grid<Real>>::S = "Grid<Real>";
-static const Pb::Register _R_62("Grid<Real>", "Grid", Grid<Real>::_W_9);
-static const Pb::Register _R_63("Grid<Real>", "save", Grid<Real>::_W_10);
-static const Pb::Register _R_64("Grid<Real>", "load", Grid<Real>::_W_11);
-static const Pb::Register _R_65("Grid<Real>", "clear", Grid<Real>::_W_12);
-static const Pb::Register _R_66("Grid<Real>", "copyFrom", Grid<Real>::_W_13);
-static const Pb::Register _R_67("Grid<Real>", "getGridType", Grid<Real>::_W_14);
-static const Pb::Register _R_68("Grid<Real>", "add", Grid<Real>::_W_15);
-static const Pb::Register _R_69("Grid<Real>", "sub", Grid<Real>::_W_16);
-static const Pb::Register _R_70("Grid<Real>", "setConst", Grid<Real>::_W_17);
-static const Pb::Register _R_71("Grid<Real>", "addConst", Grid<Real>::_W_18);
-static const Pb::Register _R_72("Grid<Real>", "addScaled", Grid<Real>::_W_19);
-static const Pb::Register _R_73("Grid<Real>", "mult", Grid<Real>::_W_20);
-static const Pb::Register _R_74("Grid<Real>", "multConst", Grid<Real>::_W_21);
-static const Pb::Register _R_75("Grid<Real>", "safeDivide", Grid<Real>::_W_22);
-static const Pb::Register _R_76("Grid<Real>", "clamp", Grid<Real>::_W_23);
-static const Pb::Register _R_77("Grid<Real>", "stomp", Grid<Real>::_W_24);
-static const Pb::Register _R_78("Grid<Real>", "permuteAxes", Grid<Real>::_W_25);
-static const Pb::Register _R_79("Grid<Real>", "permuteAxesCopyToGrid", Grid<Real>::_W_26);
-static const Pb::Register _R_80("Grid<Real>", "join", Grid<Real>::_W_27);
-static const Pb::Register _R_81("Grid<Real>", "getMaxAbs", Grid<Real>::_W_28);
-static const Pb::Register _R_82("Grid<Real>", "getMax", Grid<Real>::_W_29);
-static const Pb::Register _R_83("Grid<Real>", "getMin", Grid<Real>::_W_30);
-static const Pb::Register _R_84("Grid<Real>", "getL1", Grid<Real>::_W_31);
-static const Pb::Register _R_85("Grid<Real>", "getL2", Grid<Real>::_W_32);
-static const Pb::Register _R_86("Grid<Real>", "setBound", Grid<Real>::_W_33);
-static const Pb::Register _R_87("Grid<Real>", "setBoundNeumann", Grid<Real>::_W_34);
-static const Pb::Register _R_88("Grid<Real>", "getDataPointer", Grid<Real>::_W_35);
-static const Pb::Register _R_89("Grid<Real>", "printGrid", Grid<Real>::_W_36);
-static const Pb::Register _R_90("Grid<Vec3>", "Grid<Vec3>", "GridBase");
+static const Pb::Register _R_61("Grid<Real>", "Grid", Grid<Real>::_W_9);
+static const Pb::Register _R_62("Grid<Real>", "save", Grid<Real>::_W_10);
+static const Pb::Register _R_63("Grid<Real>", "load", Grid<Real>::_W_11);
+static const Pb::Register _R_64("Grid<Real>", "clear", Grid<Real>::_W_12);
+static const Pb::Register _R_65("Grid<Real>", "copyFrom", Grid<Real>::_W_13);
+static const Pb::Register _R_66("Grid<Real>", "getGridType", Grid<Real>::_W_14);
+static const Pb::Register _R_67("Grid<Real>", "add", Grid<Real>::_W_15);
+static const Pb::Register _R_68("Grid<Real>", "sub", Grid<Real>::_W_16);
+static const Pb::Register _R_69("Grid<Real>", "setConst", Grid<Real>::_W_17);
+static const Pb::Register _R_70("Grid<Real>", "addConst", Grid<Real>::_W_18);
+static const Pb::Register _R_71("Grid<Real>", "addScaled", Grid<Real>::_W_19);
+static const Pb::Register _R_72("Grid<Real>", "mult", Grid<Real>::_W_20);
+static const Pb::Register _R_73("Grid<Real>", "multConst", Grid<Real>::_W_21);
+static const Pb::Register _R_74("Grid<Real>", "safeDivide", Grid<Real>::_W_22);
+static const Pb::Register _R_75("Grid<Real>", "clamp", Grid<Real>::_W_23);
+static const Pb::Register _R_76("Grid<Real>", "stomp", Grid<Real>::_W_24);
+static const Pb::Register _R_77("Grid<Real>", "permuteAxes", Grid<Real>::_W_25);
+static const Pb::Register _R_78("Grid<Real>", "permuteAxesCopyToGrid", Grid<Real>::_W_26);
+static const Pb::Register _R_79("Grid<Real>", "getMaxAbs", Grid<Real>::_W_27);
+static const Pb::Register _R_80("Grid<Real>", "getMax", Grid<Real>::_W_28);
+static const Pb::Register _R_81("Grid<Real>", "getMin", Grid<Real>::_W_29);
+static const Pb::Register _R_82("Grid<Real>", "getL1", Grid<Real>::_W_30);
+static const Pb::Register _R_83("Grid<Real>", "getL2", Grid<Real>::_W_31);
+static const Pb::Register _R_84("Grid<Real>", "setBound", Grid<Real>::_W_32);
+static const Pb::Register _R_85("Grid<Real>", "setBoundNeumann", Grid<Real>::_W_33);
+static const Pb::Register _R_86("Grid<Real>", "getDataPointer", Grid<Real>::_W_34);
+static const Pb::Register _R_87("Grid<Real>", "printGrid", Grid<Real>::_W_35);
+static const Pb::Register _R_88("Grid<Vec3>", "Grid<Vec3>", "GridBase");
 template<> const char *Namify<Grid<Vec3>>::S = "Grid<Vec3>";
-static const Pb::Register _R_91("Grid<Vec3>", "Grid", Grid<Vec3>::_W_9);
-static const Pb::Register _R_92("Grid<Vec3>", "save", Grid<Vec3>::_W_10);
-static const Pb::Register _R_93("Grid<Vec3>", "load", Grid<Vec3>::_W_11);
-static const Pb::Register _R_94("Grid<Vec3>", "clear", Grid<Vec3>::_W_12);
-static const Pb::Register _R_95("Grid<Vec3>", "copyFrom", Grid<Vec3>::_W_13);
-static const Pb::Register _R_96("Grid<Vec3>", "getGridType", Grid<Vec3>::_W_14);
-static const Pb::Register _R_97("Grid<Vec3>", "add", Grid<Vec3>::_W_15);
-static const Pb::Register _R_98("Grid<Vec3>", "sub", Grid<Vec3>::_W_16);
-static const Pb::Register _R_99("Grid<Vec3>", "setConst", Grid<Vec3>::_W_17);
-static const Pb::Register _R_100("Grid<Vec3>", "addConst", Grid<Vec3>::_W_18);
-static const Pb::Register _R_101("Grid<Vec3>", "addScaled", Grid<Vec3>::_W_19);
-static const Pb::Register _R_102("Grid<Vec3>", "mult", Grid<Vec3>::_W_20);
-static const Pb::Register _R_103("Grid<Vec3>", "multConst", Grid<Vec3>::_W_21);
-static const Pb::Register _R_104("Grid<Vec3>", "safeDivide", Grid<Vec3>::_W_22);
-static const Pb::Register _R_105("Grid<Vec3>", "clamp", Grid<Vec3>::_W_23);
-static const Pb::Register _R_106("Grid<Vec3>", "stomp", Grid<Vec3>::_W_24);
-static const Pb::Register _R_107("Grid<Vec3>", "permuteAxes", Grid<Vec3>::_W_25);
-static const Pb::Register _R_108("Grid<Vec3>", "permuteAxesCopyToGrid", Grid<Vec3>::_W_26);
-static const Pb::Register _R_109("Grid<Vec3>", "join", Grid<Vec3>::_W_27);
-static const Pb::Register _R_110("Grid<Vec3>", "getMaxAbs", Grid<Vec3>::_W_28);
-static const Pb::Register _R_111("Grid<Vec3>", "getMax", Grid<Vec3>::_W_29);
-static const Pb::Register _R_112("Grid<Vec3>", "getMin", Grid<Vec3>::_W_30);
-static const Pb::Register _R_113("Grid<Vec3>", "getL1", Grid<Vec3>::_W_31);
-static const Pb::Register _R_114("Grid<Vec3>", "getL2", Grid<Vec3>::_W_32);
-static const Pb::Register _R_115("Grid<Vec3>", "setBound", Grid<Vec3>::_W_33);
-static const Pb::Register _R_116("Grid<Vec3>", "setBoundNeumann", Grid<Vec3>::_W_34);
-static const Pb::Register _R_117("Grid<Vec3>", "getDataPointer", Grid<Vec3>::_W_35);
-static const Pb::Register _R_118("Grid<Vec3>", "printGrid", Grid<Vec3>::_W_36);
+static const Pb::Register _R_89("Grid<Vec3>", "Grid", Grid<Vec3>::_W_9);
+static const Pb::Register _R_90("Grid<Vec3>", "save", Grid<Vec3>::_W_10);
+static const Pb::Register _R_91("Grid<Vec3>", "load", Grid<Vec3>::_W_11);
+static const Pb::Register _R_92("Grid<Vec3>", "clear", Grid<Vec3>::_W_12);
+static const Pb::Register _R_93("Grid<Vec3>", "copyFrom", Grid<Vec3>::_W_13);
+static const Pb::Register _R_94("Grid<Vec3>", "getGridType", Grid<Vec3>::_W_14);
+static const Pb::Register _R_95("Grid<Vec3>", "add", Grid<Vec3>::_W_15);
+static const Pb::Register _R_96("Grid<Vec3>", "sub", Grid<Vec3>::_W_16);
+static const Pb::Register _R_97("Grid<Vec3>", "setConst", Grid<Vec3>::_W_17);
+static const Pb::Register _R_98("Grid<Vec3>", "addConst", Grid<Vec3>::_W_18);
+static const Pb::Register _R_99("Grid<Vec3>", "addScaled", Grid<Vec3>::_W_19);
+static const Pb::Register _R_100("Grid<Vec3>", "mult", Grid<Vec3>::_W_20);
+static const Pb::Register _R_101("Grid<Vec3>", "multConst", Grid<Vec3>::_W_21);
+static const Pb::Register _R_102("Grid<Vec3>", "safeDivide", Grid<Vec3>::_W_22);
+static const Pb::Register _R_103("Grid<Vec3>", "clamp", Grid<Vec3>::_W_23);
+static const Pb::Register _R_104("Grid<Vec3>", "stomp", Grid<Vec3>::_W_24);
+static const Pb::Register _R_105("Grid<Vec3>", "permuteAxes", Grid<Vec3>::_W_25);
+static const Pb::Register _R_106("Grid<Vec3>", "permuteAxesCopyToGrid", Grid<Vec3>::_W_26);
+static const Pb::Register _R_107("Grid<Vec3>", "getMaxAbs", Grid<Vec3>::_W_27);
+static const Pb::Register _R_108("Grid<Vec3>", "getMax", Grid<Vec3>::_W_28);
+static const Pb::Register _R_109("Grid<Vec3>", "getMin", Grid<Vec3>::_W_29);
+static const Pb::Register _R_110("Grid<Vec3>", "getL1", Grid<Vec3>::_W_30);
+static const Pb::Register _R_111("Grid<Vec3>", "getL2", Grid<Vec3>::_W_31);
+static const Pb::Register _R_112("Grid<Vec3>", "setBound", Grid<Vec3>::_W_32);
+static const Pb::Register _R_113("Grid<Vec3>", "setBoundNeumann", Grid<Vec3>::_W_33);
+static const Pb::Register _R_114("Grid<Vec3>", "getDataPointer", Grid<Vec3>::_W_34);
+static const Pb::Register _R_115("Grid<Vec3>", "printGrid", Grid<Vec3>::_W_35);
 #endif
 #ifdef _C_GridBase
-static const Pb::Register _R_119("GridBase", "GridBase", "PbClass");
+static const Pb::Register _R_116("GridBase", "GridBase", "PbClass");
 template<> const char *Namify<GridBase>::S = "GridBase";
-static const Pb::Register _R_120("GridBase", "GridBase", GridBase::_W_0);
-static const Pb::Register _R_121("GridBase", "getSizeX", GridBase::_W_1);
-static const Pb::Register _R_122("GridBase", "getSizeY", GridBase::_W_2);
-static const Pb::Register _R_123("GridBase", "getSizeZ", GridBase::_W_3);
-static const Pb::Register _R_124("GridBase", "getSize", GridBase::_W_4);
-static const Pb::Register _R_125("GridBase", "is3D", GridBase::_W_5);
-static const Pb::Register _R_126("GridBase", "is4D", GridBase::_W_6);
-static const Pb::Register _R_127("GridBase", "getSizeT", GridBase::_W_7);
-static const Pb::Register _R_128("GridBase", "getStrideT", GridBase::_W_8);
+static const Pb::Register _R_117("GridBase", "GridBase", GridBase::_W_0);
+static const Pb::Register _R_118("GridBase", "getSizeX", GridBase::_W_1);
+static const Pb::Register _R_119("GridBase", "getSizeY", GridBase::_W_2);
+static const Pb::Register _R_120("GridBase", "getSizeZ", GridBase::_W_3);
+static const Pb::Register _R_121("GridBase", "getSize", GridBase::_W_4);
+static const Pb::Register _R_122("GridBase", "is3D", GridBase::_W_5);
+static const Pb::Register _R_123("GridBase", "is4D", GridBase::_W_6);
+static const Pb::Register _R_124("GridBase", "getSizeT", GridBase::_W_7);
+static const Pb::Register _R_125("GridBase", "getStrideT", GridBase::_W_8);
 #endif
 #ifdef _C_MACGrid
-static const Pb::Register _R_129("MACGrid", "MACGrid", "Grid<Vec3>");
+static const Pb::Register _R_126("MACGrid", "MACGrid", "Grid<Vec3>");
 template<> const char *Namify<MACGrid>::S = "MACGrid";
-static const Pb::Register _R_130("MACGrid", "MACGrid", MACGrid::_W_37);
-static const Pb::Register _R_131("MACGrid", "setBoundMAC", MACGrid::_W_38);
+static const Pb::Register _R_127("MACGrid", "MACGrid", MACGrid::_W_36);
+static const Pb::Register _R_128("MACGrid", "setBoundMAC", MACGrid::_W_37);
 #endif
 static const Pb::Register _R_7("GridType_TypeNone", 0);
 static const Pb::Register _R_8("GridType_TypeReal", 1);
@@ -250,9 +247,6 @@ void PbRegister_file_7()
   KEEP_UNUSED(_R_126);
   KEEP_UNUSED(_R_127);
   KEEP_UNUSED(_R_128);
-  KEEP_UNUSED(_R_129);
-  KEEP_UNUSED(_R_130);
-  KEEP_UNUSED(_R_131);
 }
 }
 }  // namespace Manta

extern/mantaflow/preprocessed/plugin/secondaryparticles.cpp

@@ -525,7 +525,7 @@ struct knFlipSampleSecondaryParticlesMoreCylinders : public KernelBase {
     if (!(flags(i, j, k) & itype))
       return;
 
-    static RandomStream mRand(9832);
+    RandomStream mRand(9832);
     Real radius =
         0.25;  // diameter=0.5 => sampling with two cylinders in each dimension since cell size=1
     for (Real x = i - radius; x <= i + radius; x += 2 * radius) {
@@ -791,9 +791,11 @@ struct knFlipSampleSecondaryParticles : public KernelBase {
     const int n = KE * (k_ta * TA + k_wc * WC) * dt;  // number of secondary particles
     if (n == 0)
       return;
-    static RandomStream mRand(9832);
+    RandomStream mRand(9832);
 
-    Vec3 xi = Vec3(i, j, k) + mRand.getVec3();  // randomized offset uniform in cell
+    Vec3 xi = Vec3(i + mRand.getReal(),
+                   j + mRand.getReal(),
+                   k + mRand.getReal());  // randomized offset uniform in cell
     Vec3 vi = v.getInterpolated(xi);
     Vec3 dir = dt * vi;                               // direction of movement of current particle
     Vec3 e1 = getNormalized(Vec3(dir.z, 0, -dir.x));  // perpendicular to dir
@@ -1832,7 +1834,7 @@ struct knFlipDeleteParticlesInObstacle : public KernelBase {
     }
     int gridIndex = flags.index(xidx);
     // remove particles that penetrate obstacles
-    if (flags.isObstacle(gridIndex) || flags.isOutflow(gridIndex)) {
+    if (flags[gridIndex] == FlagGrid::TypeObstacle || flags[gridIndex] == FlagGrid::TypeOutflow) {
       pts.kill(idx);
     }
   }

intern/atomic/intern/atomic_ops_msvc.h

@@ -37,8 +37,8 @@
 #endif
 #define WIN32_LEAN_AND_MEAN
 
-#include <intrin.h>
 #include <windows.h>
+#include <intrin.h>
 
 #if defined(__clang__)
 #  pragma GCC diagnostic push

intern/atomic/intern/atomic_ops_utils.h

@@ -47,10 +47,10 @@
 #ifndef __ATOMIC_OPS_UTILS_H__
 #define __ATOMIC_OPS_UTILS_H__
 
-#include <limits.h>
-#include <stddef.h>
 #include <stdint.h>
+#include <stddef.h>
 #include <stdlib.h>
+#include <limits.h>
 
 #include <assert.h>
 

intern/audaspace/intern/AUD_PyInit.cpp

@@ -25,8 +25,8 @@
 #include "AUD_PyInit.h"
 
 #include <AUD_Sound.h>
-#include <python/PyAPI.h>
 #include <python/PySound.h>
+#include <python/PyAPI.h>
 
 extern "C" {
 extern void *BKE_sound_get_factory(void *sound);

intern/clog/clog.c

@@ -18,23 +18,23 @@
  * \ingroup clog
  */
 
-#include <assert.h>
 #include <stdarg.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <stdint.h>
+#include <assert.h>
 
 /* Disable for small single threaded programs
  * to avoid having to link with pthreads. */
 #ifdef WITH_CLOG_PTHREADS
-#  include "atomic_ops.h"
 #  include <pthread.h>
+#  include "atomic_ops.h"
 #endif
 
 /* For 'isatty' to check for color. */
 #if defined(__unix__) || defined(__APPLE__) || defined(__HAIKU__)
-#  include <sys/time.h>
 #  include <unistd.h>
+#  include <sys/time.h>
 #endif
 
 #if defined(_MSC_VER)

intern/cycles/CMakeLists.txt

@@ -313,7 +313,9 @@ if(WITH_CYCLES_CUDA_BINARIES AND (NOT WITH_CYCLES_CUBIN_COMPILER))
       set(MAX_MSVC 1910)
     elseif(${CUDA_VERSION} EQUAL "9.1")
       set(MAX_MSVC 1911)
-    elseif(${CUDA_VERSION} LESS "11.0")
+    elseif(${CUDA_VERSION} EQUAL "10.0")
+      set(MAX_MSVC 1999)
+    elseif(${CUDA_VERSION} EQUAL "10.1")
       set(MAX_MSVC 1999)
     endif()
     if(NOT MSVC_VERSION LESS ${MAX_MSVC} OR CMAKE_C_COMPILER_ID MATCHES "Clang")
@@ -330,7 +332,7 @@ if(WITH_CYCLES_CUDA_BINARIES AND (NOT WITH_CYCLES_CUBIN_COMPILER))
 endif()
 
 # NVRTC gives wrong rendering result in CUDA 10.0, so we must use NVCC.
-if(WITH_CYCLES_CUDA_BINARIES AND WITH_CYCLES_CUBIN_COMPILER AND NOT WITH_CYCLES_CUBIN_COMPILER_OVERRRIDE)
+if(WITH_CYCLES_CUDA_BINARIES AND WITH_CYCLES_CUBIN_COMPILER)
   if(NOT (${CUDA_VERSION} VERSION_LESS 10.0))
     message(STATUS "cycles_cubin_cc not supported for CUDA 10.0+, using nvcc instead.")
     set(WITH_CYCLES_CUBIN_COMPILER OFF)
@@ -348,6 +350,17 @@ if(WITH_CYCLES_NETWORK)
   add_definitions(-DWITH_NETWORK)
 endif()
 
+if(WITH_OPENCOLORIO)
+  add_definitions(-DWITH_OCIO)
+  include_directories(
+    SYSTEM
+    ${OPENCOLORIO_INCLUDE_DIRS}
+  )
+  if(WIN32)
+    add_definitions(-DOpenColorIO_STATIC)
+  endif()
+endif()
+
 if(WITH_CYCLES_STANDALONE OR WITH_CYCLES_NETWORK OR WITH_CYCLES_CUBIN_COMPILER)
   add_subdirectory(app)
 endif()

intern/cycles/app/CMakeLists.txt

@@ -60,7 +60,6 @@ link_directories(
   ${TIFF_LIBPATH}
   ${OPENEXR_LIBPATH}
   ${OPENJPEG_LIBPATH}
-  ${OPENVDB_LIBPATH}
 )
 
 if(WITH_OPENCOLORIO)

intern/cycles/app/cycles_cubin_cc.cpp

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <stdint.h>
 #include <stdio.h>
+#include <stdint.h>
 
 #include <string>
 #include <vector>
@@ -43,8 +43,7 @@ template<typename T> std::string to_string(const T &n)
 
 class CompilationSettings {
  public:
-  CompilationSettings()
-      : target_arch(0), bits(64), verbose(false), fast_math(false), ptx_only(false)
+  CompilationSettings() : target_arch(0), bits(64), verbose(false), fast_math(false)
   {
   }
 
@@ -58,13 +57,12 @@ class CompilationSettings {
   int bits;
   bool verbose;
   bool fast_math;
-  bool ptx_only;
 };
 
 static bool compile_cuda(CompilationSettings &settings)
 {
-  const char *headers[] = {"stdlib.h", "float.h", "math.h", "stdio.h", "stddef.h"};
-  const char *header_content[] = {"\n", "\n", "\n", "\n", "\n"};
+  const char *headers[] = {"stdlib.h", "float.h", "math.h", "stdio.h"};
+  const char *header_content[] = {"\n", "\n", "\n", "\n"};
 
   printf("Building %s\n", settings.input_file.c_str());
 
@@ -85,8 +83,6 @@ static bool compile_cuda(CompilationSettings &settings)
   options.push_back("-D__KERNEL_CUDA_VERSION__=" + std::to_string(cuewNvrtcVersion()));
   options.push_back("-arch=compute_" + std::to_string(settings.target_arch));
   options.push_back("--device-as-default-execution-space");
-  options.push_back("-DCYCLES_CUBIN_CC");
-  options.push_back("--std=c++11");
   if (settings.fast_math)
     options.push_back("--use_fast_math");
 
@@ -138,14 +134,10 @@ static bool compile_cuda(CompilationSettings &settings)
     fprintf(stderr, "Error: nvrtcGetPTX failed (%d)\n\n", (int)result);
     return false;
   }
-  if (settings.ptx_only) {
-    settings.ptx_file = settings.output_file;
-  }
-  else {
-    /* Write a file in the temp folder with the ptx code. */
-    settings.ptx_file = OIIO::Filesystem::temp_directory_path() + "/" +
-                        OIIO::Filesystem::unique_path();
-  }
+
+  /* Write a file in the temp folder with the ptx code. */
+  settings.ptx_file = OIIO::Filesystem::temp_directory_path() + "/" +
+                      OIIO::Filesystem::unique_path();
   FILE *f = fopen(settings.ptx_file.c_str(), "wb");
   fwrite(&ptx_code[0], 1, ptx_size, f);
   fclose(f);
@@ -257,9 +249,6 @@ static bool parse_parameters(int argc, const char **argv, CompilationSettings &s
              "-D %L",
              &settings.defines,
              "Add additional defines",
-             "-ptx",
-             &settings.ptx_only,
-             "emit PTX code",
              "-v",
              &settings.verbose,
              "Use verbose logging",
@@ -314,10 +303,8 @@ int main(int argc, const char **argv)
     exit(EXIT_FAILURE);
   }
 
-  if (!settings.ptx_only) {
-    if (!link_ptxas(settings)) {
-      exit(EXIT_FAILURE);
-    }
+  if (!link_ptxas(settings)) {
+    exit(EXIT_FAILURE);
   }
 
   return 0;

intern/cycles/app/cycles_server.cpp

@@ -20,11 +20,11 @@
 
 #include "util/util_args.h"
 #include "util/util_foreach.h"
-#include "util/util_logging.h"
 #include "util/util_path.h"
 #include "util/util_stats.h"
 #include "util/util_string.h"
 #include "util/util_task.h"
+#include "util/util_logging.h"
 
 using namespace ccl;
 

intern/cycles/app/cycles_standalone.cpp

@@ -16,12 +16,12 @@
 
 #include <stdio.h>
 
-#include "device/device.h"
 #include "render/buffers.h"
 #include "render/camera.h"
-#include "render/integrator.h"
+#include "device/device.h"
 #include "render/scene.h"
 #include "render/session.h"
+#include "render/integrator.h"
 
 #include "util/util_args.h"
 #include "util/util_foreach.h"

intern/cycles/app/cycles_xml.cpp

@@ -16,9 +16,9 @@
 
 #include <stdio.h>
 
+#include <sstream>
 #include <algorithm>
 #include <iterator>
-#include <sstream>
 
 #include "graph/node_xml.h"
 
@@ -32,8 +32,8 @@
 #include "render/nodes.h"
 #include "render/object.h"
 #include "render/osl.h"
-#include "render/scene.h"
 #include "render/shader.h"
+#include "render/scene.h"
 
 #include "subd/subd_patch.h"
 #include "subd/subd_split.h"

intern/cycles/blender/CMakeLists.txt

@@ -92,20 +92,6 @@ if(WITH_MOD_FLUID)
   add_definitions(-DWITH_FLUID)
 endif()
 
-if(WITH_NEW_OBJECT_TYPES)
-  add_definitions(-DWITH_NEW_OBJECT_TYPES)
-endif()
-
-if(WITH_OPENVDB)
-  add_definitions(-DWITH_OPENVDB ${OPENVDB_DEFINITIONS})
-  list(APPEND INC_SYS
-    ${OPENVDB_INCLUDE_DIRS}
-  )
-  list(APPEND LIB
-    ${OPENVDB_LIBRARIES}
-  )
-endif()
-
 blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 
 # avoid link failure with clang 3.4 debug

intern/cycles/blender/addon/engine.py

@@ -260,16 +260,15 @@ def list_render_passes(srl):
     if crl.use_pass_volume_indirect:           yield ("VolumeInd",                     "RGB", 'COLOR')
 
     # Cryptomatte passes.
-    crypto_depth = (crl.pass_crypto_depth + 1) // 2
     if crl.use_pass_crypto_object:
-        for i in range(0, crypto_depth):
-            yield ("CryptoObject" + '{:02d}'.format(i), "RGBA", 'COLOR')
+        for i in range(0, crl.pass_crypto_depth, 2):
+            yield ("CryptoObject" + '{:02d}'.format(i//2), "RGBA", 'COLOR')
     if crl.use_pass_crypto_material:
-        for i in range(0, crypto_depth):
-            yield ("CryptoMaterial" + '{:02d}'.format(i), "RGBA", 'COLOR')
+        for i in range(0, crl.pass_crypto_depth, 2):
+            yield ("CryptoMaterial" + '{:02d}'.format(i//2), "RGBA", 'COLOR')
     if srl.cycles.use_pass_crypto_asset:
-        for i in range(0, crypto_depth):
-            yield ("CryptoAsset" + '{:02d}'.format(i), "RGBA", 'COLOR')
+        for i in range(0, srl.cycles.pass_crypto_depth, 2):
+            yield ("CryptoAsset" + '{:02d}'.format(i//2), "RGBA", 'COLOR')
 
     # Denoising passes.
     if crl.use_denoising or crl.denoising_store_passes:

intern/cycles/blender/addon/properties.py

@@ -444,20 +444,13 @@ class CyclesRenderSettings(bpy.types.PropertyGroup):
         default=8,
     )
 
-    volume_step_rate: FloatProperty(
-        name="Step Rate",
-        description="Globally adjust detail for volume rendering, on top of automatically estimated step size. "
-                    "Higher values reduce render time, lower values render with more detail",
-        default=1.0,
-        min=0.01, max=100.0, soft_min=0.1, soft_max=10.0, precision=2
-    )
-
-    volume_preview_step_rate: FloatProperty(
-        name="Step Rate",
-        description="Globally adjust detail for volume rendering, on top of automatically estimated step size. "
-                    "Higher values reduce render time, lower values render with more detail",
-        default=1.0,
-        min=0.01, max=100.0, soft_min=0.1, soft_max=10.0, precision=2
+    volume_step_size: FloatProperty(
+        name="Step Size",
+        description="Distance between volume shader samples when rendering the volume "
+        "(lower values give more accurate and detailed results, but also increased render time)",
+        default=0.1,
+        min=0.0000001, max=100000.0, soft_min=0.01, soft_max=1.0, precision=4,
+        unit='LENGTH'
     )
 
     volume_max_steps: IntProperty(
@@ -941,14 +934,6 @@ class CyclesMaterialSettings(bpy.types.PropertyGroup):
         default='LINEAR',
     )
 
-    volume_step_rate: FloatProperty(
-        name="Step Rate",
-        description="Scale the distance between volume shader samples when rendering the volume "
-                    "(lower values give more accurate and detailed results, but also increased render time)",
-        default=1.0,
-        min=0.001, max=1000.0, soft_min=0.1, soft_max=10.0, precision=4
-    )
-
     displacement_method: EnumProperty(
         name="Displacement Method",
         description="Method to use for the displacement",
@@ -1059,13 +1044,6 @@ class CyclesWorldSettings(bpy.types.PropertyGroup):
         items=enum_volume_interpolation,
         default='LINEAR',
     )
-    volume_step_size: FloatProperty(
-        name="Step Size",
-        description="Distance between volume shader samples when rendering the volume "
-                    "(lower values give more accurate and detailed results, but also increased render time)",
-        default=1.0,
-        min=0.0000001, max=100000.0, soft_min=0.1, soft_max=100.0, precision=4
-    )
 
     @classmethod
     def register(cls):

intern/cycles/blender/addon/ui.py

@@ -373,7 +373,7 @@ class CYCLES_RENDER_PT_subdivision(CyclesButtonsPanel, Panel):
         col = layout.column()
         sub = col.column(align=True)
         sub.prop(cscene, "dicing_rate", text="Dicing Rate Render")
-        sub.prop(cscene, "preview_dicing_rate", text="Viewport")
+        sub.prop(cscene, "preview_dicing_rate", text="Preview")
 
         col.separator()
 
@@ -428,11 +428,9 @@ class CYCLES_RENDER_PT_volumes(CyclesButtonsPanel, Panel):
         scene = context.scene
         cscene = scene.cycles
 
-        col = layout.column(align=True)
-        col.prop(cscene, "volume_step_rate", text="Step Rate Render")
-        col.prop(cscene, "volume_preview_step_rate", text="Viewport")
-
-        layout.prop(cscene, "volume_max_steps", text="Max Steps")
+        col = layout.column()
+        col.prop(cscene, "volume_step_size", text="Step Size")
+        col.prop(cscene, "volume_max_steps", text="Max Steps")
 
 
 class CYCLES_RENDER_PT_light_paths(CyclesButtonsPanel, Panel):
@@ -1698,9 +1696,6 @@ class CYCLES_WORLD_PT_settings_volume(CyclesButtonsPanel, Panel):
         sub.prop(cworld, "volume_sampling", text="Sampling")
         col.prop(cworld, "volume_interpolation", text="Interpolation")
         col.prop(cworld, "homogeneous_volume", text="Homogeneous")
-        sub = col.column()
-        sub.active = not cworld.homogeneous_volume
-        sub.prop(cworld, "volume_step_size")
 
 
 class CYCLES_MATERIAL_PT_preview(CyclesButtonsPanel, Panel):
@@ -1832,9 +1827,6 @@ class CYCLES_MATERIAL_PT_settings_volume(CyclesButtonsPanel, Panel):
         sub.prop(cmat, "volume_sampling", text="Sampling")
         col.prop(cmat, "volume_interpolation", text="Interpolation")
         col.prop(cmat, "homogeneous_volume", text="Homogeneous")
-        sub = col.column()
-        sub.active = not cmat.homogeneous_volume
-        sub.prop(cmat, "volume_step_rate")
 
     def draw(self, context):
         self.draw_shared(self, context, context.material)
@@ -1917,6 +1909,7 @@ class CYCLES_RENDER_PT_bake_influence(CyclesButtonsPanel, Panel):
             flow.prop(cbk, "use_pass_diffuse")
             flow.prop(cbk, "use_pass_glossy")
             flow.prop(cbk, "use_pass_transmission")
+            flow.prop(cbk, "use_pass_subsurface")
             flow.prop(cbk, "use_pass_ambient_occlusion")
             flow.prop(cbk, "use_pass_emit")
 
@@ -2086,7 +2079,7 @@ class CYCLES_RENDER_PT_simplify_viewport(CyclesButtonsPanel, Panel):
         col.prop(rd, "simplify_child_particles", text="Child Particles")
         col.prop(cscene, "texture_limit", text="Texture Limit")
         col.prop(cscene, "ao_bounces", text="AO Bounces")
-
+        col.prop(rd, "use_simplify_smoke_highres")
 
 class CYCLES_RENDER_PT_simplify_render(CyclesButtonsPanel, Panel):
     bl_label = "Render"

intern/cycles/blender/blender_curves.cpp

@@ -595,6 +595,40 @@ static void ExportCurveTriangleGeometry(Mesh *mesh, ParticleCurveData *CData, in
   /* texture coords still needed */
 }
 
+static void export_hair_motion_validate_attribute(Hair *hair,
+                                                  int motion_step,
+                                                  int num_motion_keys,
+                                                  bool have_motion)
+{
+  Attribute *attr_mP = hair->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
+  const int num_keys = hair->curve_keys.size();
+
+  if (num_motion_keys != num_keys || !have_motion) {
+    /* No motion or hair "topology" changed, remove attributes again. */
+    if (num_motion_keys != num_keys) {
+      VLOG(1) << "Hair topology changed, removing attribute.";
+    }
+    else {
+      VLOG(1) << "No motion, removing attribute.";
+    }
+    hair->attributes.remove(ATTR_STD_MOTION_VERTEX_POSITION);
+  }
+  else if (motion_step > 0) {
+    VLOG(1) << "Filling in new motion vertex position for motion_step " << motion_step;
+
+    /* Motion, fill up previous steps that we might have skipped because
+     * they had no motion, but we need them anyway now. */
+    for (int step = 0; step < motion_step; step++) {
+      float4 *mP = attr_mP->data_float4() + step * num_keys;
+
+      for (int key = 0; key < num_keys; key++) {
+        mP[key] = float3_to_float4(hair->curve_keys[key]);
+        mP[key].w = hair->curve_radius[key];
+      }
+    }
+  }
+}
+
 static void ExportCurveSegments(Scene *scene, Hair *hair, ParticleCurveData *CData)
 {
   int num_keys = 0;
@@ -714,40 +748,6 @@ static float4 LerpCurveSegmentMotionCV(ParticleCurveData *CData, int sys, int cu
   return lerp(mP, mP2, remainder);
 }
 
-static void export_hair_motion_validate_attribute(Hair *hair,
-                                                  int motion_step,
-                                                  int num_motion_keys,
-                                                  bool have_motion)
-{
-  Attribute *attr_mP = hair->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
-  const int num_keys = hair->curve_keys.size();
-
-  if (num_motion_keys != num_keys || !have_motion) {
-    /* No motion or hair "topology" changed, remove attributes again. */
-    if (num_motion_keys != num_keys) {
-      VLOG(1) << "Hair topology changed, removing attribute.";
-    }
-    else {
-      VLOG(1) << "No motion, removing attribute.";
-    }
-    hair->attributes.remove(ATTR_STD_MOTION_VERTEX_POSITION);
-  }
-  else if (motion_step > 0) {
-    VLOG(1) << "Filling in new motion vertex position for motion_step " << motion_step;
-
-    /* Motion, fill up previous steps that we might have skipped because
-     * they had no motion, but we need them anyway now. */
-    for (int step = 0; step < motion_step; step++) {
-      float4 *mP = attr_mP->data_float4() + step * num_keys;
-
-      for (int key = 0; key < num_keys; key++) {
-        mP[key] = float3_to_float4(hair->curve_keys[key]);
-        mP[key].w = hair->curve_radius[key];
-      }
-    }
-  }
-}
-
 static void ExportCurveSegmentsMotion(Hair *hair, ParticleCurveData *CData, int motion_step)
 {
   VLOG(1) << "Exporting curve motion segments for hair " << hair->name << ", motion step "
@@ -817,7 +817,7 @@ static void ExportCurveSegmentsMotion(Hair *hair, ParticleCurveData *CData, int
     }
   }
 
-  /* In case of new attribute, we verify if there really was any motion. */
+  /* in case of new attribute, we verify if there really was any motion */
   if (new_attribute) {
     export_hair_motion_validate_attribute(hair, motion_step, i, have_motion);
   }
@@ -1154,194 +1154,6 @@ void BlenderSync::sync_particle_hair(
   }
 }
 
-#ifdef WITH_NEW_OBJECT_TYPES
-static float4 hair_point_as_float4(BL::HairPoint b_point)
-{
-  float4 mP = float3_to_float4(get_float3(b_point.co()));
-  mP.w = b_point.radius();
-  return mP;
-}
-
-static float4 interpolate_hair_points(BL::Hair b_hair,
-                                      const int first_point_index,
-                                      const int num_points,
-                                      const float step)
-{
-  const float curve_t = step * (num_points - 1);
-  const int point_a = clamp((int)curve_t, 0, num_points - 1);
-  const int point_b = min(point_a + 1, num_points - 1);
-  const float t = curve_t - (float)point_a;
-  return lerp(hair_point_as_float4(b_hair.points[first_point_index + point_a]),
-              hair_point_as_float4(b_hair.points[first_point_index + point_b]),
-              t);
-}
-
-static void export_hair_curves(Scene *scene, Hair *hair, BL::Hair b_hair)
-{
-  /* TODO: optimize so we can straight memcpy arrays from Blender? */
-
-  /* Add requested attributes. */
-  Attribute *attr_intercept = NULL;
-  Attribute *attr_random = NULL;
-
-  if (hair->need_attribute(scene, ATTR_STD_CURVE_INTERCEPT)) {
-    attr_intercept = hair->attributes.add(ATTR_STD_CURVE_INTERCEPT);
-  }
-  if (hair->need_attribute(scene, ATTR_STD_CURVE_RANDOM)) {
-    attr_random = hair->attributes.add(ATTR_STD_CURVE_RANDOM);
-  }
-
-  /* Reserve memory. */
-  const int num_keys = b_hair.points.length();
-  const int num_curves = b_hair.curves.length();
-
-  if (num_curves > 0) {
-    VLOG(1) << "Exporting curve segments for hair " << hair->name;
-  }
-
-  hair->reserve_curves(num_curves, num_keys);
-
-  /* Export curves and points. */
-  vector<float> points_length;
-
-  BL::Hair::curves_iterator b_curve_iter;
-  for (b_hair.curves.begin(b_curve_iter); b_curve_iter != b_hair.curves.end(); ++b_curve_iter) {
-    BL::HairCurve b_curve = *b_curve_iter;
-    const int first_point_index = b_curve.first_point_index();
-    const int num_points = b_curve.num_points();
-
-    float3 prev_co = make_float3(0.0f, 0.0f, 0.0f);
-    float length = 0.0f;
-    if (attr_intercept) {
-      points_length.clear();
-      points_length.reserve(num_points);
-    }
-
-    /* Position and radius. */
-    for (int i = 0; i < num_points; i++) {
-      BL::HairPoint b_point = b_hair.points[first_point_index + i];
-
-      const float3 co = get_float3(b_point.co());
-      const float radius = b_point.radius();
-      hair->add_curve_key(co, radius);
-
-      if (attr_intercept) {
-        if (i > 0) {
-          length += len(co - prev_co);
-          points_length.push_back(length);
-        }
-        prev_co = co;
-      }
-    }
-
-    /* Normalized 0..1 attribute along curve. */
-    if (attr_intercept) {
-      for (int i = 0; i < num_points; i++) {
-        attr_intercept->add((length == 0.0f) ? 0.0f : points_length[i] / length);
-      }
-    }
-
-    /* Random number per curve. */
-    if (attr_random != NULL) {
-      attr_random->add(hash_uint2_to_float(b_curve.index(), 0));
-    }
-
-    /* Curve. */
-    const int shader_index = 0;
-    hair->add_curve(first_point_index, shader_index);
-  }
-}
-
-static void export_hair_curves_motion(Hair *hair, BL::Hair b_hair, int motion_step)
-{
-  VLOG(1) << "Exporting curve motion segments for hair " << hair->name << ", motion step "
-          << motion_step;
-
-  /* Find or add attribute. */
-  Attribute *attr_mP = hair->attributes.find(ATTR_STD_MOTION_VERTEX_POSITION);
-  bool new_attribute = false;
-
-  if (!attr_mP) {
-    VLOG(1) << "Creating new motion vertex position attribute";
-    attr_mP = hair->attributes.add(ATTR_STD_MOTION_VERTEX_POSITION);
-    new_attribute = true;
-  }
-
-  /* Export motion keys. */
-  const int num_keys = hair->curve_keys.size();
-  float4 *mP = attr_mP->data_float4() + motion_step * num_keys;
-  bool have_motion = false;
-  int num_motion_keys = 0;
-  int curve_index = 0;
-
-  BL::Hair::curves_iterator b_curve_iter;
-  for (b_hair.curves.begin(b_curve_iter); b_curve_iter != b_hair.curves.end(); ++b_curve_iter) {
-    BL::HairCurve b_curve = *b_curve_iter;
-    const int first_point_index = b_curve.first_point_index();
-    const int num_points = b_curve.num_points();
-
-    Hair::Curve curve = hair->get_curve(curve_index);
-    curve_index++;
-
-    if (num_points == curve.num_keys) {
-      /* Number of keys matches. */
-      for (int i = 0; i < num_points; i++) {
-        int point_index = first_point_index + i;
-
-        if (point_index < num_keys) {
-          mP[num_motion_keys] = hair_point_as_float4(b_hair.points[point_index]);
-          num_motion_keys++;
-
-          if (!have_motion) {
-            /* TODO: use epsilon for comparison? Was needed for particles due to
-             * transform, but ideally should not happen anymore. */
-            float4 curve_key = float3_to_float4(hair->curve_keys[i]);
-            curve_key.w = hair->curve_radius[i];
-            have_motion = !(mP[i] == curve_key);
-          }
-        }
-      }
-    }
-    else {
-      /* Number of keys has changed. Generate an interpolated version
-       * to preserve motion blur. */
-      const float step_size = curve.num_keys > 1 ? 1.0f / (curve.num_keys - 1) : 0.0f;
-      for (int i = 0; i < curve.num_keys; i++) {
-        const float step = i * step_size;
-        mP[num_motion_keys] = interpolate_hair_points(b_hair, first_point_index, num_points, step);
-        num_motion_keys++;
-      }
-      have_motion = true;
-    }
-  }
-
-  /* In case of new attribute, we verify if there really was any motion. */
-  if (new_attribute) {
-    export_hair_motion_validate_attribute(hair, motion_step, num_motion_keys, have_motion);
-  }
-}
-#endif /* WITH_NEW_OBJECT_TYPES */
-
-/* Hair object. */
-void BlenderSync::sync_hair(Hair *hair, BL::Object &b_ob, bool motion, int motion_step)
-{
-#ifdef WITH_NEW_OBJECT_TYPES
-  /* Convert Blender hair to Cycles curves. */
-  BL::Hair b_hair(b_ob.data());
-  if (motion) {
-    export_hair_curves_motion(hair, b_hair, motion_step);
-  }
-  else {
-    export_hair_curves(scene, hair, b_hair);
-  }
-#else
-  (void)hair;
-  (void)b_ob;
-  (void)motion;
-  (void)motion_step;
-#endif /* WITH_NEW_OBJECT_TYPES */
-}
-
 void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph,
                             BL::Object b_ob,
                             Geometry *geom,
@@ -1367,24 +1179,14 @@ void BlenderSync::sync_hair(BL::Depsgraph b_depsgraph,
   geom->used_shaders = used_shaders;
 
   if (view_layer.use_hair && scene->curve_system_manager->use_curves) {
-#ifdef WITH_NEW_OBJECT_TYPES
-    if (b_ob.type() == BL::Object::type_HAIR) {
-      /* Hair object. */
-      sync_hair(hair, b_ob, false);
-      assert(mesh == NULL);
-    }
-    else
-#endif
-    {
-      /* Particle hair. */
-      bool need_undeformed = geom->need_attribute(scene, ATTR_STD_GENERATED);
-      BL::Mesh b_mesh = object_to_mesh(
-          b_data, b_ob, b_depsgraph, need_undeformed, Mesh::SUBDIVISION_NONE);
+    /* Particle hair. */
+    bool need_undeformed = geom->need_attribute(scene, ATTR_STD_GENERATED);
+    BL::Mesh b_mesh = object_to_mesh(
+        b_data, b_ob, b_depsgraph, need_undeformed, Mesh::SUBDIVISION_NONE);
 
-      if (b_mesh) {
-        sync_particle_hair(geom, b_mesh, b_ob, false);
-        free_object_to_mesh(b_data, b_ob, b_mesh);
-      }
+    if (b_mesh) {
+      sync_particle_hair(geom, b_mesh, b_ob, false);
+      free_object_to_mesh(b_data, b_ob, b_mesh);
     }
   }
 
@@ -1411,24 +1213,13 @@ void BlenderSync::sync_hair_motion(BL::Depsgraph b_depsgraph,
 
   /* Export deformed coordinates. */
   if (ccl::BKE_object_is_deform_modified(b_ob, b_scene, preview)) {
-#ifdef WITH_NEW_OBJECT_TYPES
-    if (b_ob.type() == BL::Object::type_HAIR) {
-      /* Hair object. */
-      sync_hair(hair, b_ob, true, motion_step);
-      assert(mesh == NULL);
+    /* Particle hair. */
+    BL::Mesh b_mesh = object_to_mesh(b_data, b_ob, b_depsgraph, false, Mesh::SUBDIVISION_NONE);
+    if (b_mesh) {
+      sync_particle_hair(geom, b_mesh, b_ob, true, motion_step);
+      free_object_to_mesh(b_data, b_ob, b_mesh);
       return;
     }
-    else
-#endif
-    {
-      /* Particle hair. */
-      BL::Mesh b_mesh = object_to_mesh(b_data, b_ob, b_depsgraph, false, Mesh::SUBDIVISION_NONE);
-      if (b_mesh) {
-        sync_particle_hair(geom, b_mesh, b_ob, true, motion_step);
-        free_object_to_mesh(b_data, b_ob, b_mesh);
-        return;
-      }
-    }
   }
 
   /* No deformation on this frame, copy coordinates if other frames did have it. */

intern/cycles/blender/blender_device.h

@@ -18,9 +18,9 @@
 #define __BLENDER_DEVICE_H__
 
 #include "MEM_guardedalloc.h"
+#include "RNA_types.h"
 #include "RNA_access.h"
 #include "RNA_blender_cpp.h"
-#include "RNA_types.h"
 
 #include "device/device.h"
 

intern/cycles/blender/blender_geometry.cpp

@@ -38,19 +38,11 @@ Geometry *BlenderSync::sync_geometry(BL::Depsgraph &b_depsgraph,
   BL::ID b_key_id = (BKE_object_is_modified(b_ob)) ? b_ob_instance : b_ob_data;
   GeometryKey key(b_key_id.ptr.data, use_particle_hair);
   BL::Material material_override = view_layer.material_override;
-  Shader *default_shader = (b_ob.type() == BL::Object::type_VOLUME) ? scene->default_volume :
-                                                                      scene->default_surface;
-#ifdef WITH_NEW_OBJECT_TYPES
-  Geometry::Type geom_type = ((b_ob.type() == BL::Object::type_HAIR || use_particle_hair) &&
+  Shader *default_shader = scene->default_surface;
+  Geometry::Type geom_type = (use_particle_hair &&
                               (scene->curve_system_manager->primitive != CURVE_TRIANGLES)) ?
                                  Geometry::HAIR :
                                  Geometry::MESH;
-#else
-  Geometry::Type geom_type = ((use_particle_hair) &&
-                              (scene->curve_system_manager->primitive != CURVE_TRIANGLES)) ?
-                                 Geometry::HAIR :
-                                 Geometry::MESH;
-#endif
 
   /* Find shader indices. */
   vector<Shader *> used_shaders;
@@ -129,14 +121,10 @@ Geometry *BlenderSync::sync_geometry(BL::Depsgraph &b_depsgraph,
 
   geom->name = ustring(b_ob_data.name().c_str());
 
-#ifdef WITH_NEW_OBJECT_TYPES
-  if (b_ob.type() == BL::Object::type_HAIR || use_particle_hair) {
-#else
   if (use_particle_hair) {
-#endif
     sync_hair(b_depsgraph, b_ob, geom, used_shaders);
   }
-  else if (b_ob.type() == BL::Object::type_VOLUME || object_fluid_gas_domain_find(b_ob)) {
+  else if (object_fluid_gas_domain_find(b_ob)) {
     Mesh *mesh = static_cast<Mesh *>(geom);
     sync_volume(b_ob, mesh, used_shaders);
   }
@@ -173,14 +161,10 @@ void BlenderSync::sync_geometry_motion(BL::Depsgraph &b_depsgraph,
     return;
   }
 
-#ifdef WITH_NEW_OBJECT_TYPES
-  if (b_ob.type() == BL::Object::type_HAIR || use_particle_hair) {
-#else
   if (use_particle_hair) {
-#endif
     sync_hair_motion(b_depsgraph, b_ob, geom, motion_step);
   }
-  else if (b_ob.type() == BL::Object::type_VOLUME || object_fluid_gas_domain_find(b_ob)) {
+  else if (object_fluid_gas_domain_find(b_ob)) {
     /* No volume motion blur support yet. */
   }
   else {

intern/cycles/blender/blender_mesh.cpp

@@ -14,25 +14,25 @@
  * limitations under the License.
  */
 
-#include "render/camera.h"
 #include "render/colorspace.h"
 #include "render/mesh.h"
 #include "render/object.h"
 #include "render/scene.h"
+#include "render/camera.h"
 
-#include "blender/blender_session.h"
 #include "blender/blender_sync.h"
+#include "blender/blender_session.h"
 #include "blender/blender_util.h"
 
 #include "subd/subd_patch.h"
 #include "subd/subd_split.h"
 
 #include "util/util_algorithm.h"
-#include "util/util_disjoint_set.h"
 #include "util/util_foreach.h"
 #include "util/util_hash.h"
 #include "util/util_logging.h"
 #include "util/util_math.h"
+#include "util/util_disjoint_set.h"
 
 #include "mikktspace.h"
 

intern/cycles/blender/blender_object.cpp

@@ -15,14 +15,14 @@
  */
 
 #include "render/camera.h"
-#include "render/graph.h"
 #include "render/integrator.h"
+#include "render/graph.h"
 #include "render/light.h"
 #include "render/mesh.h"
-#include "render/nodes.h"
 #include "render/object.h"
-#include "render/particles.h"
 #include "render/scene.h"
+#include "render/nodes.h"
+#include "render/particles.h"
 #include "render/shader.h"
 
 #include "blender/blender_object_cull.h"
@@ -67,20 +67,10 @@ bool BlenderSync::object_is_mesh(BL::Object &b_ob)
     return false;
   }
 
-  BL::Object::type_enum type = b_ob.type();
-
-#ifdef WITH_NEW_OBJECT_TYPES
-  if (type == BL::Object::type_VOLUME || type == BL::Object::type_HAIR) {
-#else
-  if (type == BL::Object::type_VOLUME) {
-#endif
-    /* Will be exported attached to mesh. */
-    return true;
-  }
-  else if (type == BL::Object::type_CURVE) {
+  if (b_ob.type() == BL::Object::type_CURVE) {
     /* Skip exporting curves without faces, overhead can be
      * significant if there are many for path animation. */
-    BL::Curve b_curve(b_ob_data);
+    BL::Curve b_curve(b_ob.data());
 
     return (b_curve.bevel_object() || b_curve.extrude() != 0.0f || b_curve.bevel_depth() != 0.0f ||
             b_curve.dimensions() == BL::Curve::dimensions_2D || b_ob.modifiers.length());

intern/cycles/blender/blender_python.cpp

@@ -19,8 +19,8 @@
 #include "blender/CCL_api.h"
 
 #include "blender/blender_device.h"
-#include "blender/blender_session.h"
 #include "blender/blender_sync.h"
+#include "blender/blender_session.h"
 #include "blender/blender_util.h"
 
 #include "render/denoising.h"
@@ -38,8 +38,8 @@
 #ifdef WITH_OSL
 #  include "render/osl.h"
 
-#  include <OSL/oslconfig.h>
 #  include <OSL/oslquery.h>
+#  include <OSL/oslconfig.h>
 #endif
 
 #ifdef WITH_OPENCL

intern/cycles/blender/blender_session.cpp

@@ -41,8 +41,8 @@
 #include "util/util_progress.h"
 #include "util/util_time.h"
 
-#include "blender/blender_session.h"
 #include "blender/blender_sync.h"
+#include "blender/blender_session.h"
 #include "blender/blender_util.h"
 
 CCL_NAMESPACE_BEGIN

intern/cycles/blender/blender_shader.cpp

@@ -24,14 +24,14 @@
 #include "render/shader.h"
 
 #include "blender/blender_image.h"
-#include "blender/blender_sync.h"
 #include "blender/blender_texture.h"
+#include "blender/blender_sync.h"
 #include "blender/blender_util.h"
 
 #include "util/util_debug.h"
 #include "util/util_foreach.h"
-#include "util/util_set.h"
 #include "util/util_string.h"
+#include "util/util_set.h"
 #include "util/util_task.h"
 
 CCL_NAMESPACE_BEGIN
@@ -1260,7 +1260,6 @@ void BlenderSync::sync_materials(BL::Depsgraph &b_depsgraph, bool update_all)
       shader->heterogeneous_volume = !get_boolean(cmat, "homogeneous_volume");
       shader->volume_sampling_method = get_volume_sampling(cmat);
       shader->volume_interpolation_method = get_volume_interpolation(cmat);
-      shader->volume_step_rate = get_float(cmat, "volume_step_rate");
       shader->displacement_method = get_displacement_method(cmat);
 
       shader->set_graph(graph);
@@ -1325,7 +1324,6 @@ void BlenderSync::sync_world(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d,
       shader->heterogeneous_volume = !get_boolean(cworld, "homogeneous_volume");
       shader->volume_sampling_method = get_volume_sampling(cworld);
       shader->volume_interpolation_method = get_volume_interpolation(cworld);
-      shader->volume_step_rate = get_float(cworld, "volume_step_size");
     }
     else if (new_viewport_parameters.use_scene_world && b_world) {
       BackgroundNode *background = new BackgroundNode();

intern/cycles/blender/blender_sync.cpp

@@ -16,7 +16,6 @@
 
 #include "render/background.h"
 #include "render/camera.h"
-#include "render/curves.h"
 #include "render/film.h"
 #include "render/graph.h"
 #include "render/integrator.h"
@@ -26,18 +25,19 @@
 #include "render/object.h"
 #include "render/scene.h"
 #include "render/shader.h"
+#include "render/curves.h"
 
 #include "device/device.h"
 
 #include "blender/blender_device.h"
-#include "blender/blender_session.h"
 #include "blender/blender_sync.h"
+#include "blender/blender_session.h"
 #include "blender/blender_util.h"
 
 #include "util/util_debug.h"
 #include "util/util_foreach.h"
-#include "util/util_hash.h"
 #include "util/util_opengl.h"
+#include "util/util_hash.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -178,11 +178,6 @@ void BlenderSync::sync_recalc(BL::Depsgraph &b_depsgraph, BL::SpaceView3D &b_v3d
         world_recalc = true;
       }
     }
-    /* Volume */
-    else if (b_id.is_a(&RNA_Volume)) {
-      BL::Volume b_volume(b_id);
-      geometry_map.set_recalc(b_volume);
-    }
   }
 
   BlenderViewportParameters new_viewport_parameters(b_v3d);
@@ -262,8 +257,7 @@ void BlenderSync::sync_integrator()
   integrator->transparent_max_bounce = get_int(cscene, "transparent_max_bounces");
 
   integrator->volume_max_steps = get_int(cscene, "volume_max_steps");
-  integrator->volume_step_rate = (preview) ? get_float(cscene, "volume_preview_step_rate") :
-                                             get_float(cscene, "volume_step_rate");
+  integrator->volume_step_size = get_float(cscene, "volume_step_size");
 
   integrator->caustics_reflective = get_boolean(cscene, "caustics_reflective");
   integrator->caustics_refractive = get_boolean(cscene, "caustics_refractive");
@@ -633,11 +627,11 @@ vector<Pass> BlenderSync::sync_render_passes(BL::RenderLayer &b_rlay,
 
   /* Cryptomatte stores two ID/weight pairs per RGBA layer.
    * User facing parameter is the number of pairs. */
-  int crypto_depth = divide_up(min(16, get_int(crp, "pass_crypto_depth")), 2);
+  int crypto_depth = min(16, get_int(crp, "pass_crypto_depth")) / 2;
   scene->film->cryptomatte_depth = crypto_depth;
   scene->film->cryptomatte_passes = CRYPT_NONE;
   if (get_boolean(crp, "use_pass_crypto_object")) {
-    for (int i = 0; i < crypto_depth; i++) {
+    for (int i = 0; i < crypto_depth; ++i) {
       string passname = cryptomatte_prefix + string_printf("Object%02d", i);
       b_engine.add_pass(passname.c_str(), 4, "RGBA", b_view_layer.name().c_str());
       Pass::add(PASS_CRYPTOMATTE, passes, passname.c_str());
@@ -646,7 +640,7 @@ vector<Pass> BlenderSync::sync_render_passes(BL::RenderLayer &b_rlay,
                                                         CRYPT_OBJECT);
   }
   if (get_boolean(crp, "use_pass_crypto_material")) {
-    for (int i = 0; i < crypto_depth; i++) {
+    for (int i = 0; i < crypto_depth; ++i) {
       string passname = cryptomatte_prefix + string_printf("Material%02d", i);
       b_engine.add_pass(passname.c_str(), 4, "RGBA", b_view_layer.name().c_str());
       Pass::add(PASS_CRYPTOMATTE, passes, passname.c_str());
@@ -655,7 +649,7 @@ vector<Pass> BlenderSync::sync_render_passes(BL::RenderLayer &b_rlay,
                                                         CRYPT_MATERIAL);
   }
   if (get_boolean(crp, "use_pass_crypto_asset")) {
-    for (int i = 0; i < crypto_depth; i++) {
+    for (int i = 0; i < crypto_depth; ++i) {
       string passname = cryptomatte_prefix + string_printf("Asset%02d", i);
       b_engine.add_pass(passname.c_str(), 4, "RGBA", b_view_layer.name().c_str());
       Pass::add(PASS_CRYPTOMATTE, passes, passname.c_str());

intern/cycles/blender/blender_sync.h

@@ -18,9 +18,9 @@
 #define __BLENDER_SYNC_H__
 
 #include "MEM_guardedalloc.h"
+#include "RNA_types.h"
 #include "RNA_access.h"
 #include "RNA_blender_cpp.h"
-#include "RNA_types.h"
 
 #include "blender/blender_id_map.h"
 #include "blender/blender_viewport.h"
@@ -157,7 +157,6 @@ class BlenderSync {
                         BL::Object b_ob,
                         Geometry *geom,
                         int motion_step);
-  void sync_hair(Hair *hair, BL::Object &b_ob, bool motion, int motion_step = 0);
   void sync_particle_hair(
       Geometry *geom, BL::Mesh &b_mesh, BL::Object &b_ob, bool motion, int motion_step = 0);
   void sync_curve_settings();

intern/cycles/blender/blender_texture.h

@@ -17,8 +17,8 @@
 #ifndef __BLENDER_TEXTURE_H__
 #define __BLENDER_TEXTURE_H__
 
-#include "blender/blender_sync.h"
 #include <stdlib.h>
+#include "blender/blender_sync.h"
 
 CCL_NAMESPACE_BEGIN
 

intern/cycles/blender/blender_viewport.h

@@ -18,9 +18,9 @@
 #define __BLENDER_VIEWPORT_H__
 
 #include "MEM_guardedalloc.h"
+#include "RNA_types.h"
 #include "RNA_access.h"
 #include "RNA_blender_cpp.h"
-#include "RNA_types.h"
 
 #include "render/film.h"
 #include "util/util_param.h"

intern/cycles/blender/blender_volume.cpp

@@ -15,20 +15,12 @@
  */
 
 #include "render/colorspace.h"
-#include "render/image.h"
-#include "render/image_vdb.h"
 #include "render/mesh.h"
 #include "render/object.h"
 
 #include "blender/blender_sync.h"
 #include "blender/blender_util.h"
 
-#ifdef WITH_OPENVDB
-#  include <openvdb/openvdb.h>
-openvdb::GridBase::ConstPtr BKE_volume_grid_openvdb_for_read(const struct Volume *volume,
-                                                             struct VolumeGrid *grid);
-#endif
-
 CCL_NAMESPACE_BEGIN
 
 /* TODO: verify this is not loading unnecessary attributes. */
@@ -76,15 +68,6 @@ class BlenderSmokeLoader : public ImageLoader {
     metadata.height = resolution.y * amplify;
     metadata.depth = resolution.z * amplify;
 
-    /* Create a matrix to transform from object space to mesh texture space.
-     * This does not work with deformations but that can probably only be done
-     * well with a volume grid mapping of coordinates. */
-    BL::Mesh b_mesh(b_ob.data());
-    float3 loc, size;
-    mesh_texture_space(b_mesh, loc, size);
-    metadata.transform_3d = transform_translate(-loc) * transform_scale(size);
-    metadata.use_transform_3d = true;
-
     return true;
   }
 
@@ -207,7 +190,7 @@ static void sync_smoke_volume(Scene *scene, BL::Object &b_ob, Mesh *mesh, float
       continue;
     }
 
-    mesh->volume_clipping = b_domain.clipping();
+    mesh->volume_isovalue = b_domain.clipping();
 
     Attribute *attr = mesh->attributes.add(std);
 
@@ -217,125 +200,19 @@ static void sync_smoke_volume(Scene *scene, BL::Object &b_ob, Mesh *mesh, float
 
     attr->data_voxel() = scene->image_manager->add_image(loader, params);
   }
-}
 
-class BlenderVolumeLoader : public VDBImageLoader {
- public:
-  BlenderVolumeLoader(BL::Volume b_volume, const string &grid_name)
-      : VDBImageLoader(grid_name),
-        b_volume(b_volume),
-        b_volume_grid(PointerRNA_NULL),
-        unload(false)
-  {
-#ifdef WITH_OPENVDB
-    /* Find grid with matching name. */
-    BL::Volume::grids_iterator b_grid_iter;
-    for (b_volume.grids.begin(b_grid_iter); b_grid_iter != b_volume.grids.end(); ++b_grid_iter) {
-      if (b_grid_iter->name() == grid_name) {
-        b_volume_grid = *b_grid_iter;
-      }
-    }
-#endif
-  }
+  /* Create a matrix to transform from object space to mesh texture space.
+   * This does not work with deformations but that can probably only be done
+   * well with a volume grid mapping of coordinates. */
+  if (mesh->need_attribute(scene, ATTR_STD_GENERATED_TRANSFORM)) {
+    Attribute *attr = mesh->attributes.add(ATTR_STD_GENERATED_TRANSFORM);
+    Transform *tfm = attr->data_transform();
 
-  bool load_metadata(ImageMetaData &metadata) override
-  {
-    if (!b_volume_grid) {
-      return false;
-    }
+    BL::Mesh b_mesh(b_ob.data());
+    float3 loc, size;
+    mesh_texture_space(b_mesh, loc, size);
 
-    unload = !b_volume_grid.is_loaded();
-
-#ifdef WITH_OPENVDB
-    Volume *volume = (Volume *)b_volume.ptr.data;
-    VolumeGrid *volume_grid = (VolumeGrid *)b_volume_grid.ptr.data;
-    grid = BKE_volume_grid_openvdb_for_read(volume, volume_grid);
-#endif
-
-    return VDBImageLoader::load_metadata(metadata);
-  }
-
-  bool load_pixels(const ImageMetaData &metadata,
-                   void *pixels,
-                   const size_t pixel_size,
-                   const bool associate_alpha) override
-  {
-    if (!b_volume_grid) {
-      return false;
-    }
-
-    return VDBImageLoader::load_pixels(metadata, pixels, pixel_size, associate_alpha);
-  }
-
-  bool equals(const ImageLoader &other) const override
-  {
-    /* TODO: detect multiple volume datablocks with the same filepath. */
-    const BlenderVolumeLoader &other_loader = (const BlenderVolumeLoader &)other;
-    return b_volume == other_loader.b_volume && b_volume_grid == other_loader.b_volume_grid;
-  }
-
-  void cleanup() override
-  {
-    VDBImageLoader::cleanup();
-    if (b_volume_grid && unload) {
-      b_volume_grid.unload();
-    }
-  }
-
-  BL::Volume b_volume;
-  BL::VolumeGrid b_volume_grid;
-  bool unload;
-};
-
-static void sync_volume_object(BL::BlendData &b_data, BL::Object &b_ob, Scene *scene, Mesh *mesh)
-{
-  BL::Volume b_volume(b_ob.data());
-  b_volume.grids.load(b_data.ptr.data);
-
-  BL::VolumeRender b_render(b_volume.render());
-
-  mesh->volume_clipping = b_render.clipping();
-  mesh->volume_step_size = b_render.step_size();
-  mesh->volume_object_space = (b_render.space() == BL::VolumeRender::space_OBJECT);
-
-  /* Find grid with matching name. */
-  BL::Volume::grids_iterator b_grid_iter;
-  for (b_volume.grids.begin(b_grid_iter); b_grid_iter != b_volume.grids.end(); ++b_grid_iter) {
-    BL::VolumeGrid b_grid = *b_grid_iter;
-    ustring name = ustring(b_grid.name());
-    AttributeStandard std = ATTR_STD_NONE;
-
-    if (name == Attribute::standard_name(ATTR_STD_VOLUME_DENSITY)) {
-      std = ATTR_STD_VOLUME_DENSITY;
-    }
-    else if (name == Attribute::standard_name(ATTR_STD_VOLUME_COLOR)) {
-      std = ATTR_STD_VOLUME_COLOR;
-    }
-    else if (name == Attribute::standard_name(ATTR_STD_VOLUME_FLAME)) {
-      std = ATTR_STD_VOLUME_FLAME;
-    }
-    else if (name == Attribute::standard_name(ATTR_STD_VOLUME_HEAT)) {
-      std = ATTR_STD_VOLUME_HEAT;
-    }
-    else if (name == Attribute::standard_name(ATTR_STD_VOLUME_TEMPERATURE)) {
-      std = ATTR_STD_VOLUME_TEMPERATURE;
-    }
-    else if (name == Attribute::standard_name(ATTR_STD_VOLUME_VELOCITY)) {
-      std = ATTR_STD_VOLUME_VELOCITY;
-    }
-
-    if ((std != ATTR_STD_NONE && mesh->need_attribute(scene, std)) ||
-        mesh->need_attribute(scene, name)) {
-      Attribute *attr = (std != ATTR_STD_NONE) ?
-                            mesh->attributes.add(std) :
-                            mesh->attributes.add(name, TypeDesc::TypeFloat, ATTR_ELEMENT_VOXEL);
-
-      ImageLoader *loader = new BlenderVolumeLoader(b_volume, name.string());
-      ImageParams params;
-      params.frame = b_volume.grids.frame();
-
-      attr->data_voxel() = scene->image_manager->add_image(loader, params);
-    }
+    *tfm = transform_translate(-loc) * transform_scale(size);
   }
 }
 
@@ -359,16 +236,9 @@ void BlenderSync::sync_volume(BL::Object &b_ob, Mesh *mesh, const vector<Shader
   mesh->clear();
   mesh->used_shaders = used_shaders;
 
+  /* Smoke domain. */
   if (view_layer.use_volumes) {
-    if (b_ob.type() == BL::Object::type_VOLUME) {
-      /* Volume object. Create only attributes, bounding mesh will then
-       * be automatically generated later. */
-      sync_volume_object(b_data, b_ob, scene, mesh);
-    }
-    else {
-      /* Smoke domain. */
-      sync_smoke_volume(scene, b_ob, mesh, b_scene.frame_current());
-    }
+    sync_smoke_volume(scene, b_ob, mesh, b_scene.frame_current());
   }
 
   /* Tag update. */

intern/cycles/bvh/bvh_build.cpp

@@ -22,20 +22,20 @@
 #include "bvh/bvh_params.h"
 #include "bvh_split.h"
 
-#include "render/curves.h"
 #include "render/hair.h"
 #include "render/mesh.h"
 #include "render/object.h"
 #include "render/scene.h"
+#include "render/curves.h"
 
 #include "util/util_algorithm.h"
 #include "util/util_foreach.h"
 #include "util/util_logging.h"
 #include "util/util_progress.h"
-#include "util/util_queue.h"
-#include "util/util_simd.h"
 #include "util/util_stack_allocator.h"
+#include "util/util_simd.h"
 #include "util/util_time.h"
+#include "util/util_queue.h"
 
 CCL_NAMESPACE_BEGIN
 

intern/cycles/bvh/bvh_embree.cpp

@@ -35,9 +35,9 @@
 
 #ifdef WITH_EMBREE
 
-#  include <embree3/rtcore_geometry.h>
 #  include <pmmintrin.h>
 #  include <xmmintrin.h>
+#  include <embree3/rtcore_geometry.h>
 
 #  include "bvh/bvh_embree.h"
 
@@ -45,9 +45,9 @@
  */
 #  include "kernel/bvh/bvh_embree.h"
 #  include "kernel/kernel_compat_cpu.h"
+#  include "kernel/split/kernel_split_data_types.h"
 #  include "kernel/kernel_globals.h"
 #  include "kernel/kernel_random.h"
-#  include "kernel/split/kernel_split_data_types.h"
 
 #  include "render/hair.h"
 #  include "render/mesh.h"

intern/cycles/bvh/bvh_optix.cpp

@@ -18,8 +18,8 @@
 #ifdef WITH_OPTIX
 
 #  include "bvh/bvh_optix.h"
-#  include "render/geometry.h"
 #  include "render/hair.h"
+#  include "render/geometry.h"
 #  include "render/mesh.h"
 #  include "render/object.h"
 #  include "util/util_foreach.h"

intern/cycles/device/cuda/device_cuda_impl.cpp

@@ -39,8 +39,8 @@
 #  include "util/util_path.h"
 #  include "util/util_string.h"
 #  include "util/util_system.h"
-#  include "util/util_time.h"
 #  include "util/util_types.h"
+#  include "util/util_time.h"
 #  include "util/util_windows.h"
 
 #  include "kernel/split/kernel_split_data_types.h"

intern/cycles/device/device.cpp

@@ -25,11 +25,11 @@
 #include "util/util_logging.h"
 #include "util/util_math.h"
 #include "util/util_opengl.h"
-#include "util/util_string.h"
-#include "util/util_system.h"
 #include "util/util_time.h"
+#include "util/util_system.h"
 #include "util/util_types.h"
 #include "util/util_vector.h"
+#include "util/util_string.h"
 
 CCL_NAMESPACE_BEGIN
 
@@ -597,7 +597,6 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo> &subdevices,
 
   info.has_half_images = true;
   info.has_volume_decoupled = true;
-  info.has_adaptive_stop_per_sample = true;
   info.has_osl = true;
   info.has_profiling = true;
 
@@ -640,7 +639,6 @@ DeviceInfo Device::get_multi_device(const vector<DeviceInfo> &subdevices,
     /* Accumulate device info. */
     info.has_half_images &= device.has_half_images;
     info.has_volume_decoupled &= device.has_volume_decoupled;
-    info.has_adaptive_stop_per_sample &= device.has_adaptive_stop_per_sample;
     info.has_osl &= device.has_osl;
     info.has_profiling &= device.has_profiling;
   }

intern/cycles/device/device.h

@@ -27,8 +27,8 @@
 #include "util/util_list.h"
 #include "util/util_stats.h"
 #include "util/util_string.h"
-#include "util/util_texture.h"
 #include "util/util_thread.h"
+#include "util/util_texture.h"
 #include "util/util_types.h"
 #include "util/util_vector.h"
 
@@ -75,13 +75,12 @@ class DeviceInfo {
   string description;
   string id; /* used for user preferences, should stay fixed with changing hardware config */
   int num;
-  bool display_device;               /* GPU is used as a display device. */
-  bool has_half_images;              /* Support half-float textures. */
-  bool has_volume_decoupled;         /* Decoupled volume shading. */
-  bool has_adaptive_stop_per_sample; /* Per-sample adaptive sampling stopping. */
-  bool has_osl;                      /* Support Open Shading Language. */
-  bool use_split_kernel;             /* Use split or mega kernel. */
-  bool has_profiling;                /* Supports runtime collection of profiling info. */
+  bool display_device;       /* GPU is used as a display device. */
+  bool has_half_images;      /* Support half-float textures. */
+  bool has_volume_decoupled; /* Decoupled volume shading. */
+  bool has_osl;              /* Support Open Shading Language. */
+  bool use_split_kernel;     /* Use split or mega kernel. */
+  bool has_profiling;        /* Supports runtime collection of profiling info. */
   int cpu_threads;
   vector<DeviceInfo> multi_devices;
   vector<DeviceInfo> denoising_devices;
@@ -95,7 +94,6 @@ class DeviceInfo {
     display_device = false;
     has_half_images = false;
     has_volume_decoupled = false;
-    has_adaptive_stop_per_sample = false;
     has_osl = false;
     use_split_kernel = false;
     has_profiling = false;

intern/cycles/device/device_cpu.cpp

@@ -839,7 +839,7 @@ class CPUDevice : public Device {
     return true;
   }
 
-  bool adaptive_sampling_filter(KernelGlobals *kg, RenderTile &tile, int sample)
+  bool adaptive_sampling_filter(KernelGlobals *kg, RenderTile &tile)
   {
     WorkTile wtile;
     wtile.x = tile.x;
@@ -850,24 +850,11 @@ class CPUDevice : public Device {
     wtile.stride = tile.stride;
     wtile.buffer = (float *)tile.buffer;
 
-    /* For CPU we do adaptive stopping per sample so we can stop earlier, but
-     * for combined CPU + GPU rendering we match the GPU and do it per tile
-     * after a given number of sample steps. */
-    if (!kernel_data.integrator.adaptive_stop_per_sample) {
-      for (int y = wtile.y; y < wtile.y + wtile.h; ++y) {
-        for (int x = wtile.x; x < wtile.x + wtile.w; ++x) {
-          const int index = wtile.offset + x + y * wtile.stride;
-          float *buffer = wtile.buffer + index * kernel_data.film.pass_stride;
-          kernel_do_adaptive_stopping(kg, buffer, sample);
-        }
-      }
-    }
-
     bool any = false;
-    for (int y = wtile.y; y < wtile.y + wtile.h; ++y) {
+    for (int y = tile.y; y < tile.y + tile.h; ++y) {
       any |= kernel_do_adaptive_filter_x(kg, y, &wtile);
     }
-    for (int x = wtile.x; x < wtile.x + wtile.w; ++x) {
+    for (int x = tile.x; x < tile.x + tile.w; ++x) {
       any |= kernel_do_adaptive_filter_y(kg, x, &wtile);
     }
     return (!any);
@@ -930,7 +917,7 @@ class CPUDevice : public Device {
       tile.sample = sample + 1;
 
       if (task.adaptive_sampling.use && task.adaptive_sampling.need_filter(sample)) {
-        const bool stop = adaptive_sampling_filter(kg, tile, sample);
+        const bool stop = adaptive_sampling_filter(kg, tile);
         if (stop) {
           const int num_progress_samples = end_sample - sample;
           tile.sample = end_sample;
@@ -1340,7 +1327,6 @@ void device_cpu_info(vector<DeviceInfo> &devices)
   info.id = "CPU";
   info.num = 0;
   info.has_volume_decoupled = true;
-  info.has_adaptive_stop_per_sample = true;
   info.has_osl = true;
   info.has_half_images = true;
   info.has_profiling = true;

intern/cycles/device/device_cuda.cpp

@@ -16,9 +16,9 @@
 
 #ifdef WITH_CUDA
 
-#  include "device/cuda/device_cuda.h"
 #  include "device/device.h"
 #  include "device/device_intern.h"
+#  include "device/cuda/device_cuda.h"
 
 #  include "util/util_logging.h"
 #  include "util/util_string.h"
@@ -129,7 +129,6 @@ void device_cuda_info(vector<DeviceInfo> &devices)
 
     info.has_half_images = (major >= 3);
     info.has_volume_decoupled = false;
-    info.has_adaptive_stop_per_sample = false;
 
     int pci_location[3] = {0, 0, 0};
     cuDeviceGetAttribute(&pci_location[0], CU_DEVICE_ATTRIBUTE_PCI_DOMAIN_ID, num);

intern/cycles/device/device_memory.cpp

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "device/device_memory.h"
 #include "device/device.h"
+#include "device/device_memory.h"
 
 CCL_NAMESPACE_BEGIN
 

intern/cycles/device/device_multi.cpp

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <sstream>
 #include <stdlib.h>
+#include <sstream>
 
 #include "device/device.h"
 #include "device/device_intern.h"

intern/cycles/device/device_network.cpp

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "device/device_network.h"
 #include "device/device.h"
 #include "device/device_intern.h"
+#include "device/device_network.h"
 
 #include "util/util_foreach.h"
 #include "util/util_logging.h"
@@ -311,7 +311,6 @@ void device_network_info(vector<DeviceInfo> &devices)
 
   /* todo: get this info from device */
   info.has_volume_decoupled = false;
-  info.has_adaptive_stop_per_sample = false;
   info.has_osl = false;
 
   devices.push_back(info);

intern/cycles/device/device_network.h

@@ -19,19 +19,19 @@
 
 #ifdef WITH_NETWORK
 
-#  include <boost/archive/binary_iarchive.hpp>
-#  include <boost/archive/binary_oarchive.hpp>
 #  include <boost/archive/text_iarchive.hpp>
 #  include <boost/archive/text_oarchive.hpp>
+#  include <boost/archive/binary_iarchive.hpp>
+#  include <boost/archive/binary_oarchive.hpp>
 #  include <boost/array.hpp>
 #  include <boost/asio.hpp>
 #  include <boost/bind.hpp>
 #  include <boost/serialization/vector.hpp>
 #  include <boost/thread.hpp>
 
-#  include <deque>
 #  include <iostream>
 #  include <sstream>
+#  include <deque>
 
 #  include "render/buffers.h"
 

intern/cycles/device/device_opencl.cpp

@@ -16,9 +16,9 @@
 
 #ifdef WITH_OPENCL
 
-#  include "device/opencl/device_opencl.h"
 #  include "device/device.h"
 #  include "device/device_intern.h"
+#  include "device/opencl/device_opencl.h"
 
 #  include "util/util_foreach.h"
 #  include "util/util_logging.h"
@@ -119,7 +119,6 @@ void device_opencl_info(vector<DeviceInfo> &devices)
     info.display_device = true;
     info.use_split_kernel = true;
     info.has_volume_decoupled = false;
-    info.has_adaptive_stop_per_sample = false;
     info.id = id;
 
     /* Check OpenCL extensions */

intern/cycles/device/device_optix.cpp

@@ -17,28 +17,28 @@
 
 #ifdef WITH_OPTIX
 
-#  include "bvh/bvh.h"
 #  include "device/cuda/device_cuda.h"
-#  include "device/device_denoising.h"
 #  include "device/device_intern.h"
-#  include "render/buffers.h"
+#  include "device/device_denoising.h"
+#  include "bvh/bvh.h"
+#  include "render/scene.h"
 #  include "render/hair.h"
 #  include "render/mesh.h"
 #  include "render/object.h"
-#  include "render/scene.h"
-#  include "util/util_debug.h"
-#  include "util/util_logging.h"
+#  include "render/buffers.h"
 #  include "util/util_md5.h"
 #  include "util/util_path.h"
 #  include "util/util_time.h"
+#  include "util/util_debug.h"
+#  include "util/util_logging.h"
 
 #  ifdef WITH_CUDA_DYNLOAD
 #    include <cuew.h>
 // Do not use CUDA SDK headers when using CUEW
 #    define OPTIX_DONT_INCLUDE_CUDA
 #  endif
-#  include <optix_function_table_definition.h>
 #  include <optix_stubs.h>
+#  include <optix_function_table_definition.h>
 
 // TODO(pmours): Disable this once drivers have native support
 #  define OPTIX_DENOISER_NO_PIXEL_STRIDE 1
@@ -1558,7 +1558,7 @@ void device_optix_info(vector<DeviceInfo> &devices)
     }
 
     // Only add devices with RTX support
-    if (rtcore_version == 0 && !getenv("CYCLES_OPTIX_TEST"))
+    if (rtcore_version == 0)
       it = cuda_devices.erase(it);
     else
       ++it;

intern/cycles/device/device_task.cpp

@@ -138,7 +138,8 @@ void DeviceTask::update_progress(RenderTile *rtile, int pixel_samples)
 
 /* Adaptive Sampling */
 
-AdaptiveSampling::AdaptiveSampling() : use(true), adaptive_step(0), min_samples(0)
+AdaptiveSampling::AdaptiveSampling()
+    : use(true), adaptive_step(ADAPTIVE_SAMPLE_STEP), min_samples(0)
 {
 }
 

intern/cycles/device/opencl/device_opencl.h

@@ -88,12 +88,9 @@ class OpenCLInfo {
   static bool device_supported(const string &platform_name, const cl_device_id device_id);
   static bool platform_version_check(cl_platform_id platform, string *error = NULL);
   static bool device_version_check(cl_device_id device, string *error = NULL);
-  static bool get_device_version(cl_device_id device,
-                                 int *r_major,
-                                 int *r_minor,
-                                 string *error = NULL);
   static string get_hardware_id(const string &platform_name, cl_device_id device_id);
-  static void get_usable_devices(vector<OpenCLPlatformDevice> *usable_devices);
+  static void get_usable_devices(vector<OpenCLPlatformDevice> *usable_devices,
+                                 bool force_all = false);
 
   /* ** Some handy shortcuts to low level cl*GetInfo() functions. ** */
 

intern/cycles/device/opencl/device_opencl_impl.cpp

@@ -257,16 +257,16 @@ void OpenCLDevice::OpenCLSplitPrograms::load_kernels(
 
     /* Ordered with most complex kernels first, to reduce overall compile time. */
     ADD_SPLIT_KERNEL_PROGRAM(subsurface_scatter);
-    ADD_SPLIT_KERNEL_PROGRAM(direct_lighting);
-    ADD_SPLIT_KERNEL_PROGRAM(indirect_background);
     if (requested_features.use_volume || is_preview) {
       ADD_SPLIT_KERNEL_PROGRAM(do_volume);
     }
-    ADD_SPLIT_KERNEL_PROGRAM(shader_eval);
-    ADD_SPLIT_KERNEL_PROGRAM(lamp_emission);
-    ADD_SPLIT_KERNEL_PROGRAM(holdout_emission_blurring_pathtermination_ao);
     ADD_SPLIT_KERNEL_PROGRAM(shadow_blocked_dl);
     ADD_SPLIT_KERNEL_PROGRAM(shadow_blocked_ao);
+    ADD_SPLIT_KERNEL_PROGRAM(holdout_emission_blurring_pathtermination_ao);
+    ADD_SPLIT_KERNEL_PROGRAM(lamp_emission);
+    ADD_SPLIT_KERNEL_PROGRAM(direct_lighting);
+    ADD_SPLIT_KERNEL_PROGRAM(indirect_background);
+    ADD_SPLIT_KERNEL_PROGRAM(shader_eval);
 
     /* Quick kernels bundled in a single program to reduce overhead of starting
      * Blender processes. */
@@ -1896,17 +1896,6 @@ string OpenCLDevice::kernel_build_options(const string *debug_src)
 {
   string build_options = "-cl-no-signed-zeros -cl-mad-enable ";
 
-  /* Build with OpenCL 2.0 if available, this improves performance
-   * with AMD OpenCL drivers on Windows and Linux (legacy drivers).
-   * Note that OpenCL selects the highest 1.x version by default,
-   * only for 2.0 do we need the explicit compiler flag. */
-  int version_major, version_minor;
-  if (OpenCLInfo::get_device_version(cdDevice, &version_major, &version_minor)) {
-    if (version_major >= 2) {
-      build_options += "-cl-std=CL2.0 ";
-    }
-  }
-
   if (platform_name == "NVIDIA CUDA") {
     build_options +=
         "-D__KERNEL_OPENCL_NVIDIA__ "

intern/cycles/device/opencl/memory_manager.h

@@ -19,8 +19,8 @@
 #include "device/device.h"
 
 #include "util/util_map.h"
-#include "util/util_string.h"
 #include "util/util_vector.h"
+#include "util/util_string.h"
 
 #include "clew.h"
 

intern/cycles/device/opencl/opencl_util.cpp

@@ -16,16 +16,15 @@
 
 #ifdef WITH_OPENCL
 
-#  include "device/device_intern.h"
 #  include "device/opencl/device_opencl.h"
+#  include "device/device_intern.h"
 
 #  include "util/util_debug.h"
 #  include "util/util_logging.h"
 #  include "util/util_md5.h"
 #  include "util/util_path.h"
-#  include "util/util_semaphore.h"
-#  include "util/util_system.h"
 #  include "util/util_time.h"
+#  include "util/util_system.h"
 
 using std::cerr;
 using std::endl;
@@ -391,27 +390,8 @@ static void escape_python_string(string &str)
   string_replace(str, "'", "\'");
 }
 
-static int opencl_compile_process_limit()
-{
-  /* Limit number of concurrent processes compiling, with a heuristic based
-   * on total physical RAM and estimate of memory usage needed when compiling
-   * with all Cycles features enabled.
-   *
-   * This is somewhat arbitrary as we don't know the actual available RAM or
-   * how much the kernel compilation will needed depending on the features, but
-   * better than not limiting at all. */
-  static const int64_t GB = 1024LL * 1024LL * 1024LL;
-  static const int64_t process_memory = 2 * GB;
-  static const int64_t base_memory = 2 * GB;
-  static const int64_t system_memory = system_physical_ram();
-  static const int64_t process_limit = (system_memory - base_memory) / process_memory;
-
-  return max((int)process_limit, 1);
-}
-
 bool OpenCLDevice::OpenCLProgram::compile_separate(const string &clbin)
 {
-  /* Construct arguments. */
   vector<string> args;
   args.push_back("--background");
   args.push_back("--factory-startup");
@@ -439,23 +419,14 @@ bool OpenCLDevice::OpenCLProgram::compile_separate(const string &clbin)
       kernel_file_escaped.c_str(),
       clbin_escaped.c_str()));
 
-  /* Limit number of concurrent processes compiling. */
-  static thread_counting_semaphore semaphore(opencl_compile_process_limit());
-  semaphore.acquire();
-
-  /* Compile. */
-  const double starttime = time_dt();
+  double starttime = time_dt();
   add_log(string("Cycles: compiling OpenCL program ") + program_name + "...", false);
   add_log(string("Build flags: ") + kernel_build_options, true);
-  const bool success = system_call_self(args);
-  const double elapsed = time_dt() - starttime;
-
-  semaphore.release();
-
-  if (!success || !path_exists(clbin)) {
+  if (!system_call_self(args) || !path_exists(clbin)) {
     return false;
   }
 
+  double elapsed = time_dt() - starttime;
   add_log(
       string_printf("Kernel compilation of %s finished in %.2lfs.", program_name.c_str(), elapsed),
       false);
@@ -776,10 +747,6 @@ bool OpenCLInfo::device_supported(const string &platform_name, const cl_device_i
   }
   VLOG(3) << "OpenCL driver version " << driver_major << "." << driver_minor;
 
-  if (getenv("CYCLES_OPENCL_TEST")) {
-    return true;
-  }
-
   /* It is possible to have Iris GPU on AMD/Apple OpenCL framework
    * (aka, it will not be on Intel framework). This isn't supported
    * and needs an explicit blacklist.
@@ -839,30 +806,18 @@ bool OpenCLInfo::platform_version_check(cl_platform_id platform, string *error)
   return true;
 }
 
-bool OpenCLInfo::get_device_version(cl_device_id device, int *r_major, int *r_minor, string *error)
+bool OpenCLInfo::device_version_check(cl_device_id device, string *error)
 {
+  const int req_major = 1, req_minor = 1;
+  int major, minor;
   char version[256];
   clGetDeviceInfo(device, CL_DEVICE_OPENCL_C_VERSION, sizeof(version), &version, NULL);
-  if (sscanf(version, "OpenCL C %d.%d", r_major, r_minor) < 2) {
+  if (sscanf(version, "OpenCL C %d.%d", &major, &minor) < 2) {
     if (error != NULL) {
       *error = string_printf("OpenCL: failed to parse OpenCL C version string (%s).", version);
     }
     return false;
   }
-  if (error != NULL) {
-    *error = "";
-  }
-  return true;
-}
-
-bool OpenCLInfo::device_version_check(cl_device_id device, string *error)
-{
-  const int req_major = 1, req_minor = 1;
-  int major, minor;
-  if (!get_device_version(device, &major, &minor, error)) {
-    return false;
-  }
-
   if (!((major == req_major && minor >= req_minor) || (major > req_major))) {
     if (error != NULL) {
       *error = string_printf("OpenCL: C version 1.1 or later required, found %d.%d", major, minor);
@@ -903,7 +858,7 @@ string OpenCLInfo::get_hardware_id(const string &platform_name, cl_device_id dev
   return "";
 }
 
-void OpenCLInfo::get_usable_devices(vector<OpenCLPlatformDevice> *usable_devices)
+void OpenCLInfo::get_usable_devices(vector<OpenCLPlatformDevice> *usable_devices, bool force_all)
 {
   const cl_device_type device_type = OpenCLInfo::device_type();
   static bool first_time = true;
@@ -969,7 +924,7 @@ void OpenCLInfo::get_usable_devices(vector<OpenCLPlatformDevice> *usable_devices
         FIRST_VLOG(2) << "Ignoring device " << device_name << " due to old compiler version.";
         continue;
       }
-      if (device_supported(platform_name, device_id)) {
+      if (force_all || device_supported(platform_name, device_id)) {
         cl_device_type device_type;
         if (!get_device_type(device_id, &device_type, &error)) {
           FIRST_VLOG(2) << "Ignoring device " << device_name

intern/cycles/kernel/CMakeLists.txt

@@ -452,7 +452,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
       endif()
 
       add_custom_command(
-        OUTPUT ${cuda_file}
+        OUTPUT ${cuda_cubin}
         COMMAND ${CUBIN_CC_ENV}
             "$<TARGET_FILE:cycles_cubin_cc>"
             -target ${CUDA_ARCH}
@@ -461,6 +461,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
             -v
             -cuda-toolkit-dir "${CUDA_TOOLKIT_ROOT_DIR}"
         DEPENDS ${kernel_sources} cycles_cubin_cc)
+      set(cuda_file ${cuda_cubin})
     else()
       add_custom_command(
         OUTPUT ${cuda_file}
@@ -516,6 +517,7 @@ if(WITH_CYCLES_DEVICE_OPTIX)
       -I "${OPTIX_INCLUDE_DIR}"
       -I "${CMAKE_CURRENT_SOURCE_DIR}/.."
       -I "${CMAKE_CURRENT_SOURCE_DIR}/kernels/cuda"
+      -arch=sm_30
       --use_fast_math
       -o ${output})
 
@@ -523,62 +525,25 @@ if(WITH_CYCLES_DEVICE_OPTIX)
       set(cuda_flags ${cuda_flags}
         -D __KERNEL_DEBUG__)
     endif()
-    if(WITH_CYCLES_CUBIN_COMPILER)
 
-      # Needed to find libnvrtc-builtins.so. Can't do it from inside
-      # cycles_cubin_cc since the env variable is read before main()
-      if(APPLE)
-        set(CUBIN_CC_ENV ${CMAKE_COMMAND}
-          -E env DYLD_LIBRARY_PATH="${CUDA_TOOLKIT_ROOT_DIR}/lib")
-      elseif(UNIX)
-        set(CUBIN_CC_ENV ${CMAKE_COMMAND}
-          -E env LD_LIBRARY_PATH="${CUDA_TOOLKIT_ROOT_DIR}/lib64")
-      endif()
+    add_custom_command(
+      OUTPUT
+        ${output}
+      DEPENDS
+        ${input}
+        ${SRC_HEADERS}
+        ${SRC_KERNELS_CUDA_HEADERS}
+        ${SRC_KERNELS_OPTIX_HEADERS}
+        ${SRC_BVH_HEADERS}
+        ${SRC_SVM_HEADERS}
+        ${SRC_GEOM_HEADERS}
+        ${SRC_CLOSURE_HEADERS}
+        ${SRC_UTIL_HEADERS}
+      COMMAND
+        ${CUDA_NVCC_EXECUTABLE} --ptx ${cuda_flags} ${input}
+      WORKING_DIRECTORY
+        "${CMAKE_CURRENT_SOURCE_DIR}")
 
-      add_custom_command(
-        OUTPUT ${output}
-        DEPENDS
-          ${input}
-          ${SRC_HEADERS}
-          ${SRC_KERNELS_CUDA_HEADERS}
-          ${SRC_KERNELS_OPTIX_HEADERS}
-          ${SRC_BVH_HEADERS}
-          ${SRC_SVM_HEADERS}
-          ${SRC_GEOM_HEADERS}
-          ${SRC_CLOSURE_HEADERS}
-          ${SRC_UTIL_HEADERS}
-        COMMAND ${CUBIN_CC_ENV}
-            "$<TARGET_FILE:cycles_cubin_cc>"
-            -target 30
-            -ptx
-            -i ${CMAKE_CURRENT_SOURCE_DIR}/${input}
-            ${cuda_flags}
-            -v
-            -cuda-toolkit-dir "${CUDA_TOOLKIT_ROOT_DIR}"
-        DEPENDS ${kernel_sources} cycles_cubin_cc)
-    else()
-      add_custom_command(
-        OUTPUT
-          ${output}
-        DEPENDS
-          ${input}
-          ${SRC_HEADERS}
-          ${SRC_KERNELS_CUDA_HEADERS}
-          ${SRC_KERNELS_OPTIX_HEADERS}
-          ${SRC_BVH_HEADERS}
-          ${SRC_SVM_HEADERS}
-          ${SRC_GEOM_HEADERS}
-          ${SRC_CLOSURE_HEADERS}
-          ${SRC_UTIL_HEADERS}
-        COMMAND
-          ${CUDA_NVCC_EXECUTABLE}
-          --ptx
-          -arch=sm_30
-          ${cuda_flags}
-          ${input}
-        WORKING_DIRECTORY
-          "${CMAKE_CURRENT_SOURCE_DIR}")
-    endif()
     list(APPEND optix_ptx ${output})
 
     delayed_install("${CMAKE_CURRENT_BINARY_DIR}" "${output}" ${CYCLES_INSTALL_PATH}/lib)

intern/cycles/kernel/closure/bsdf_hair_principled.h

@@ -493,36 +493,6 @@ ccl_device void bsdf_principled_hair_blur(ShaderClosure *sc, float roughness)
   bsdf->m0_roughness = fmaxf(roughness, bsdf->m0_roughness);
 }
 
-/* Hair Albedo */
-
-ccl_device_inline float bsdf_principled_hair_albedo_roughness_scale(
-    const float azimuthal_roughness)
-{
-  const float x = azimuthal_roughness;
-  return (((((0.245f * x) + 5.574f) * x - 10.73f) * x + 2.532f) * x - 0.215f) * x + 5.969f;
-}
-
-ccl_device float3 bsdf_principled_hair_albedo(ShaderClosure *sc)
-{
-  PrincipledHairBSDF *bsdf = (PrincipledHairBSDF *)sc;
-  return exp3(-sqrt(bsdf->sigma) * bsdf_principled_hair_albedo_roughness_scale(bsdf->v));
-}
-
-ccl_device_inline float3
-bsdf_principled_hair_sigma_from_reflectance(const float3 color, const float azimuthal_roughness)
-{
-  const float3 sigma = log3(color) /
-                       bsdf_principled_hair_albedo_roughness_scale(azimuthal_roughness);
-  return sigma * sigma;
-}
-
-ccl_device_inline float3 bsdf_principled_hair_sigma_from_concentration(const float eumelanin,
-                                                                       const float pheomelanin)
-{
-  return eumelanin * make_float3(0.506f, 0.841f, 1.653f) +
-         pheomelanin * make_float3(0.343f, 0.733f, 1.924f);
-}
-
 CCL_NAMESPACE_END
 
 #endif /* __BSDF_HAIR_PRINCIPLED_H__ */

intern/cycles/kernel/geom/geom_motion_triangle_intersect.h

@@ -103,21 +103,17 @@ ccl_device_inline
                                  const Ray *ray,
                                  float3 verts[3])
 {
-#  ifdef __KERNEL_OPTIX__
-  /* isect->t is always in world space with OptiX. */
-  return motion_triangle_refine(kg, sd, isect, ray, verts);
-#  else
   float3 P = ray->P;
   float3 D = ray->D;
   float t = isect->t;
 
-#    ifdef __INTERSECTION_REFINE__
+#  ifdef __INTERSECTION_REFINE__
   if (isect->object != OBJECT_NONE) {
-#      ifdef __OBJECT_MOTION__
+#    ifdef __OBJECT_MOTION__
     Transform tfm = sd->ob_itfm;
-#      else
+#    else
     Transform tfm = object_fetch_transform(kg, isect->object, OBJECT_INVERSE_TRANSFORM);
-#      endif
+#    endif
 
     P = transform_point(&tfm, P);
     D = transform_direction(&tfm, D);
@@ -139,20 +135,19 @@ ccl_device_inline
   P = P + D * rt;
 
   if (isect->object != OBJECT_NONE) {
-#      ifdef __OBJECT_MOTION__
+#    ifdef __OBJECT_MOTION__
     Transform tfm = sd->ob_tfm;
-#      else
+#    else
     Transform tfm = object_fetch_transform(kg, isect->object, OBJECT_TRANSFORM);
-#      endif
+#    endif
 
     P = transform_point(&tfm, P);
   }
 
   return P;
-#    else  /* __INTERSECTION_REFINE__ */
+#  else  /* __INTERSECTION_REFINE__ */
   return P + D * t;
-#    endif /* __INTERSECTION_REFINE__ */
-#  endif
+#  endif /* __INTERSECTION_REFINE__ */
 }
 #endif /* __BVH_LOCAL__ */
 

intern/cycles/kernel/geom/geom_object.h

@@ -320,26 +320,6 @@ ccl_device_inline uint object_patch_map_offset(KernelGlobals *kg, int object)
   return kernel_tex_fetch(__objects, object).patch_map_offset;
 }
 
-/* Volume step size */
-
-ccl_device_inline float object_volume_density(KernelGlobals *kg, int object)
-{
-  if (object == OBJECT_NONE) {
-    return 1.0f;
-  }
-
-  return kernel_tex_fetch(__objects, object).surface_area;
-}
-
-ccl_device_inline float object_volume_step_size(KernelGlobals *kg, int object)
-{
-  if (object == OBJECT_NONE) {
-    return kernel_data.background.volume_step_size;
-  }
-
-  return kernel_tex_fetch(__object_volume_step, object);
-}
-
 /* Pass ID for shader */
 
 ccl_device int shader_pass_id(KernelGlobals *kg, const ShaderData *sd)

intern/cycles/kernel/geom/geom_triangle_intersect.h

@@ -690,20 +690,16 @@ ccl_device_inline float3 triangle_refine_local(KernelGlobals *kg,
                                                const Intersection *isect,
                                                const Ray *ray)
 {
-#ifdef __KERNEL_OPTIX__
-  /* isect->t is always in world space with OptiX. */
-  return triangle_refine(kg, sd, isect, ray);
-#else
   float3 P = ray->P;
   float3 D = ray->D;
   float t = isect->t;
 
   if (isect->object != OBJECT_NONE) {
-#  ifdef __OBJECT_MOTION__
+#ifdef __OBJECT_MOTION__
     Transform tfm = sd->ob_itfm;
-#  else
+#else
     Transform tfm = object_fetch_transform(kg, isect->object, OBJECT_INVERSE_TRANSFORM);
-#  endif
+#endif
 
     P = transform_point(&tfm, P);
     D = transform_direction(&tfm, D);
@@ -712,7 +708,7 @@ ccl_device_inline float3 triangle_refine_local(KernelGlobals *kg,
 
   P = P + D * t;
 
-#  ifdef __INTERSECTION_REFINE__
+#ifdef __INTERSECTION_REFINE__
   const uint tri_vindex = kernel_tex_fetch(__prim_tri_index, isect->prim);
   const float4 tri_a = kernel_tex_fetch(__prim_tri_verts, tri_vindex + 0),
                tri_b = kernel_tex_fetch(__prim_tri_verts, tri_vindex + 1),
@@ -732,20 +728,19 @@ ccl_device_inline float3 triangle_refine_local(KernelGlobals *kg,
     float rt = dot(edge2, qvec) / det;
     P = P + D * rt;
   }
-#  endif /* __INTERSECTION_REFINE__ */
+#endif /* __INTERSECTION_REFINE__ */
 
   if (isect->object != OBJECT_NONE) {
-#  ifdef __OBJECT_MOTION__
+#ifdef __OBJECT_MOTION__
     Transform tfm = sd->ob_tfm;
-#  else
+#else
     Transform tfm = object_fetch_transform(kg, isect->object, OBJECT_TRANSFORM);
-#  endif
+#endif
 
     P = transform_point(&tfm, P);
   }
 
   return P;
-#endif
 }
 
 CCL_NAMESPACE_END

intern/cycles/kernel/geom/geom_volume.h

@@ -51,14 +51,10 @@ ccl_device float volume_attribute_float(KernelGlobals *kg,
                                         const ShaderData *sd,
                                         const AttributeDescriptor desc)
 {
-  /* todo: optimize this so we don't have to transform both here and in
-   * kernel_tex_image_interp_3d when possible. Also could optimize for the
-   * common case where transform is translation/scale only. */
-  float3 P = sd->P;
-  object_inverse_position_transform(kg, sd, &P);
+  float3 P = volume_normalized_position(kg, sd, sd->P);
   InterpolationType interp = (sd->flag & SD_VOLUME_CUBIC) ? INTERPOLATION_CUBIC :
                                                             INTERPOLATION_NONE;
-  float4 r = kernel_tex_image_interp_3d(kg, desc.offset, P, interp);
+  float4 r = kernel_tex_image_interp_3d(kg, desc.offset, P.x, P.y, P.z, interp);
   return average(float4_to_float3(r));
 }
 
@@ -66,11 +62,10 @@ ccl_device float3 volume_attribute_float3(KernelGlobals *kg,
                                           const ShaderData *sd,
                                           const AttributeDescriptor desc)
 {
-  float3 P = sd->P;
-  object_inverse_position_transform(kg, sd, &P);
+  float3 P = volume_normalized_position(kg, sd, sd->P);
   InterpolationType interp = (sd->flag & SD_VOLUME_CUBIC) ? INTERPOLATION_CUBIC :
                                                             INTERPOLATION_NONE;
-  float4 r = kernel_tex_image_interp_3d(kg, desc.offset, P, interp);
+  float4 r = kernel_tex_image_interp_3d(kg, desc.offset, P.x, P.y, P.z, interp);
 
   if (r.w > 1e-6f && r.w != 1.0f) {
     /* For RGBA colors, unpremultiply after interpolation. */

intern/cycles/kernel/kernel.h

@@ -19,8 +19,8 @@
 
 /* CPU Kernel Interface */
 
-#include "kernel/kernel_types.h"
 #include "util/util_types.h"
+#include "kernel/kernel_types.h"
 
 CCL_NAMESPACE_BEGIN
 

intern/cycles/kernel/kernel_adaptive_sampling.h

@@ -150,7 +150,6 @@ ccl_device void kernel_adaptive_post_adjust(KernelGlobals *kg,
   }
 #endif /* __DENOISING_FEATURES__ */
 
-  /* Cryptomatte. */
   if (kernel_data.film.cryptomatte_passes) {
     int num_slots = 0;
     num_slots += (kernel_data.film.cryptomatte_passes & CRYPT_OBJECT) ? 1 : 0;
@@ -163,14 +162,6 @@ ccl_device void kernel_adaptive_post_adjust(KernelGlobals *kg,
       id_buffer[slot].y *= sample_multiplier;
     }
   }
-
-  /* AOVs. */
-  for (int i = 0; i < kernel_data.film.pass_aov_value_num; i++) {
-    *(buffer + kernel_data.film.pass_aov_value + i) *= sample_multiplier;
-  }
-  for (int i = 0; i < kernel_data.film.pass_aov_color_num; i++) {
-    *((ccl_global float4 *)(buffer + kernel_data.film.pass_aov_color) + i) *= sample_multiplier;
-  }
 }
 
 /* This is a simple box filter in two passes.

intern/cycles/kernel/kernel_compat_cpu.h

@@ -35,11 +35,11 @@
 #  define __NODES_FEATURES__ NODE_FEATURE_ALL
 #endif
 
-#include "util/util_half.h"
 #include "util/util_math.h"
 #include "util/util_simd.h"
-#include "util/util_texture.h"
+#include "util/util_half.h"
 #include "util/util_types.h"
+#include "util/util_texture.h"
 
 #define ccl_addr_space
 

intern/cycles/kernel/kernel_compat_cuda.h

@@ -37,11 +37,8 @@ typedef unsigned long long uint64_t;
 typedef unsigned short half;
 typedef unsigned long long CUtexObject;
 
-#ifdef CYCLES_CUBIN_CC
-#  define FLT_MIN 1.175494350822287507969e-38f
-#  define FLT_MAX 340282346638528859811704183484516925440.0f
-#  define FLT_EPSILON 1.192092896e-07F
-#endif
+#define FLT_MIN 1.175494350822287507969e-38f
+#define FLT_MAX 340282346638528859811704183484516925440.0f
 
 __device__ half __float2half(const float f)
 {

intern/cycles/kernel/kernel_compat_optix.h

@@ -35,11 +35,9 @@ typedef unsigned int uint32_t;
 typedef unsigned long long uint64_t;
 typedef unsigned short half;
 typedef unsigned long long CUtexObject;
-#ifdef CYCLES_CUBIN_CC
-#  define FLT_MIN 1.175494350822287507969e-38f
-#  define FLT_MAX 340282346638528859811704183484516925440.0f
-#  define FLT_EPSILON 1.192092896e-07F
-#endif
+
+#define FLT_MIN 1.175494350822287507969e-38f
+#define FLT_MAX 340282346638528859811704183484516925440.0f
 
 __device__ half __float2half(const float f)
 {

intern/cycles/kernel/kernel_globals.h

@@ -22,8 +22,8 @@
 #include "kernel/kernel_profiling.h"
 
 #ifdef __KERNEL_CPU__
-#  include "util/util_map.h"
 #  include "util/util_vector.h"
+#  include "util/util_map.h"
 #endif
 
 #ifdef __KERNEL_OPENCL__

intern/cycles/kernel/kernel_passes.h

@@ -87,9 +87,6 @@ ccl_device_inline void kernel_update_denoising_features(KernelGlobals *kg,
       PrincipledSheenBsdf *bsdf = (PrincipledSheenBsdf *)sc;
       closure_albedo *= bsdf->avg_value;
     }
-    else if (sc->type == CLOSURE_BSDF_HAIR_PRINCIPLED_ID) {
-      closure_albedo *= bsdf_principled_hair_albedo(sc);
-    }
 
     if (bsdf_get_specular_roughness_squared(sc) > sqr(0.075f)) {
       diffuse_albedo += closure_albedo;
@@ -403,13 +400,9 @@ ccl_device_inline void kernel_write_result(KernelGlobals *kg,
                                make_float4(L_sum.x * 2.0f, L_sum.y * 2.0f, L_sum.z * 2.0f, 0.0f));
     }
 #ifdef __KERNEL_CPU__
-    if ((sample > kernel_data.integrator.adaptive_min_samples) &&
-        kernel_data.integrator.adaptive_stop_per_sample) {
-      const int step = kernel_data.integrator.adaptive_step;
-
-      if ((sample & (step - 1)) == (step - 1)) {
-        kernel_do_adaptive_stopping(kg, buffer, sample);
-      }
+    if (sample > kernel_data.integrator.adaptive_min_samples &&
+        (sample & (ADAPTIVE_SAMPLE_STEP - 1)) == (ADAPTIVE_SAMPLE_STEP - 1)) {
+      kernel_do_adaptive_stopping(kg, buffer, sample);
     }
 #endif
   }

intern/cycles/kernel/kernel_path.h

@@ -171,19 +171,19 @@ ccl_device_forceinline VolumeIntegrateResult kernel_path_volume(KernelGlobals *k
   Ray volume_ray = *ray;
   volume_ray.t = (hit) ? isect->t : FLT_MAX;
 
-  float step_size = volume_stack_step_size(kg, state->volume_stack);
+  bool heterogeneous = volume_stack_is_heterogeneous(kg, state->volume_stack);
 
 #    ifdef __VOLUME_DECOUPLED__
   int sampling_method = volume_stack_sampling_method(kg, state->volume_stack);
   bool direct = (state->flag & PATH_RAY_CAMERA) != 0;
-  bool decoupled = kernel_volume_use_decoupled(kg, step_size, direct, sampling_method);
+  bool decoupled = kernel_volume_use_decoupled(kg, heterogeneous, direct, sampling_method);
 
   if (decoupled) {
     /* cache steps along volume for repeated sampling */
     VolumeSegment volume_segment;
 
     shader_setup_from_volume(kg, sd, &volume_ray);
-    kernel_volume_decoupled_record(kg, state, &volume_ray, sd, &volume_segment, step_size);
+    kernel_volume_decoupled_record(kg, state, &volume_ray, sd, &volume_segment, heterogeneous);
 
     volume_segment.sampling_method = sampling_method;
 
@@ -229,7 +229,7 @@ ccl_device_forceinline VolumeIntegrateResult kernel_path_volume(KernelGlobals *k
   {
     /* integrate along volume segment with distance sampling */
     VolumeIntegrateResult result = kernel_volume_integrate(
-        kg, state, sd, &volume_ray, L, throughput, step_size);
+        kg, state, sd, &volume_ray, L, throughput, heterogeneous);
 
 #    ifdef __VOLUME_SCATTER__
     if (result == VOLUME_PATH_SCATTERED) {

intern/cycles/kernel/kernel_path_branched.h

@@ -91,7 +91,7 @@ ccl_device_forceinline void kernel_branched_path_volume(KernelGlobals *kg,
   Ray volume_ray = *ray;
   volume_ray.t = (hit) ? isect->t : FLT_MAX;
 
-  float step_size = volume_stack_step_size(kg, state->volume_stack);
+  bool heterogeneous = volume_stack_is_heterogeneous(kg, state->volume_stack);
 
 #      ifdef __VOLUME_DECOUPLED__
   /* decoupled ray marching only supported on CPU */
@@ -100,7 +100,7 @@ ccl_device_forceinline void kernel_branched_path_volume(KernelGlobals *kg,
     VolumeSegment volume_segment;
 
     shader_setup_from_volume(kg, sd, &volume_ray);
-    kernel_volume_decoupled_record(kg, state, &volume_ray, sd, &volume_segment, step_size);
+    kernel_volume_decoupled_record(kg, state, &volume_ray, sd, &volume_segment, heterogeneous);
 
     /* direct light sampling */
     if (volume_segment.closure_flag & SD_SCATTER) {
@@ -171,7 +171,7 @@ ccl_device_forceinline void kernel_branched_path_volume(KernelGlobals *kg,
       path_state_branch(&ps, j, num_samples);
 
       VolumeIntegrateResult result = kernel_volume_integrate(
-          kg, &ps, sd, &volume_ray, L, &tp, step_size);
+          kg, &ps, sd, &volume_ray, L, &tp, heterogeneous);
 
 #      ifdef __VOLUME_SCATTER__
       if (result == VOLUME_PATH_SCATTERED) {

intern/cycles/kernel/kernel_subsurface.h

@@ -428,17 +428,12 @@ ccl_device_noinline
     hit = (ss_isect->num_hits > 0);
 
     if (hit) {
-#ifdef __KERNEL_OPTIX__
-      /* t is always in world space with OptiX. */
-      t = ss_isect->hits[0].t;
-#else
       /* Compute world space distance to surface hit. */
       float3 D = ray->D;
       object_inverse_dir_transform(kg, sd, &D);
       D = normalize(D) * ss_isect->hits[0].t;
       object_dir_transform(kg, sd, &D);
       t = len(D);
-#endif
     }
 
     /* Advance to new scatter location. */

intern/cycles/kernel/kernel_textures.h

@@ -35,7 +35,6 @@ KERNEL_TEX(KernelObject, __objects)
 KERNEL_TEX(Transform, __object_motion_pass)
 KERNEL_TEX(DecomposedTransform, __object_motion)
 KERNEL_TEX(uint, __object_flag)
-KERNEL_TEX(float, __object_volume_step)
 
 /* cameras */
 KERNEL_TEX(DecomposedTransform, __camera_motion)

intern/cycles/kernel/kernel_types.h

@@ -63,6 +63,11 @@ CCL_NAMESPACE_BEGIN
 
 #define VOLUME_STACK_SIZE 32
 
+/* Adaptive sampling constants */
+#define ADAPTIVE_SAMPLE_STEP 4
+static_assert((ADAPTIVE_SAMPLE_STEP & (ADAPTIVE_SAMPLE_STEP - 1)) == 0,
+              "ADAPTIVE_SAMPLE_STEP must be power of two for bitwise operations to work");
+
 /* Split kernel constants */
 #define WORK_POOL_SIZE_GPU 64
 #define WORK_POOL_SIZE_CPU 1
@@ -106,6 +111,8 @@ CCL_NAMESPACE_BEGIN
 #ifndef __KERNEL_AO_PREVIEW__
 #  define __SVM__
 #  define __EMISSION__
+#  define __TEXTURES__
+#  define __EXTRA_NODES__
 #  define __HOLDOUT__
 #  define __MULTI_CLOSURE__
 #  define __TRANSPARENT_SHADOWS__
@@ -880,13 +887,13 @@ enum ShaderDataFlag {
   SD_HAS_DISPLACEMENT = (1 << 26),
   /* Has constant emission (value stored in __shaders) */
   SD_HAS_CONSTANT_EMISSION = (1 << 27),
-  /* Needs to access attributes for volume rendering */
-  SD_NEED_VOLUME_ATTRIBUTES = (1 << 28),
+  /* Needs to access attributes */
+  SD_NEED_ATTRIBUTES = (1 << 28),
 
   SD_SHADER_FLAGS = (SD_USE_MIS | SD_HAS_TRANSPARENT_SHADOW | SD_HAS_VOLUME | SD_HAS_ONLY_VOLUME |
                      SD_HETEROGENEOUS_VOLUME | SD_HAS_BSSRDF_BUMP | SD_VOLUME_EQUIANGULAR |
                      SD_VOLUME_MIS | SD_VOLUME_CUBIC | SD_HAS_BUMP | SD_HAS_DISPLACEMENT |
-                     SD_HAS_CONSTANT_EMISSION | SD_NEED_VOLUME_ATTRIBUTES)
+                     SD_HAS_CONSTANT_EMISSION | SD_NEED_ATTRIBUTES)
 };
 
 /* Object flags. */
@@ -1237,9 +1244,7 @@ typedef struct KernelFilm {
 
   int pass_aov_color;
   int pass_aov_value;
-  int pass_aov_color_num;
-  int pass_aov_value_num;
-  int pad1, pad2, pad3;
+  int pad1;
 
   /* XYZ to rendering color space transform. float4 instead of float3 to
    * ensure consistent padding/alignment across devices. */
@@ -1262,7 +1267,7 @@ typedef struct KernelFilm {
   int use_display_exposure;
   int use_display_pass_alpha;
 
-  int pad4, pad5, pad6;
+  int pad3, pad4, pad5;
 } KernelFilm;
 static_assert_align(KernelFilm, 16);
 
@@ -1270,7 +1275,6 @@ typedef struct KernelBackground {
   /* only shader index */
   int surface_shader;
   int volume_shader;
-  float volume_step_size;
   int transparent;
   float transparent_roughness_squared_threshold;
 
@@ -1278,6 +1282,7 @@ typedef struct KernelBackground {
   float ao_factor;
   float ao_distance;
   float ao_bounces_factor;
+  float ao_pad;
 } KernelBackground;
 static_assert_align(KernelBackground, 16);
 
@@ -1345,21 +1350,19 @@ typedef struct KernelIntegrator {
   int sampling_pattern;
   int aa_samples;
   int adaptive_min_samples;
-  int adaptive_step;
-  int adaptive_stop_per_sample;
   float adaptive_threshold;
 
   /* volume render */
   int use_volumes;
   int volume_max_steps;
-  float volume_step_rate;
+  float volume_step_size;
   int volume_samples;
 
   int start_sample;
 
   int max_closures;
 
-  int pad1;
+  int pad1, pad2, pad3;
 } KernelIntegrator;
 static_assert_align(KernelIntegrator, 16);