[Bf-blender-cvs] [b7f8e646c4e] newboolean: Merge from master.
Howard Trickey
noreply at git.blender.org
Wed Aug 21 16:23:04 CEST 2019
Commit: b7f8e646c4e99cd0a81ddafc694d89d5dcd6758f
Author: Howard Trickey
Date: Wed Aug 21 10:21:39 2019 -0400
Branches: newboolean
https://developer.blender.org/rBb7f8e646c4e99cd0a81ddafc694d89d5dcd6758f
Merge from master.
===================================================================
M CMakeLists.txt
M build_files/build_environment/cmake/osl.cmake
M build_files/build_environment/install_deps.sh
M build_files/cmake/Modules/FindOpenImageDenoise.cmake
M build_files/cmake/config/blender_full.cmake
M build_files/cmake/config/blender_release.cmake
M build_files/cmake/packaging.cmake
M build_files/cmake/platform/platform_win32.cmake
M extern/Eigen3/Eigen/Cholesky
M extern/Eigen3/Eigen/CholmodSupport
M extern/Eigen3/Eigen/Core
M extern/Eigen3/Eigen/Eigen
M extern/Eigen3/Eigen/Eigenvalues
M extern/Eigen3/Eigen/Geometry
M extern/Eigen3/Eigen/Householder
M extern/Eigen3/Eigen/IterativeLinearSolvers
M extern/Eigen3/Eigen/Jacobi
M extern/Eigen3/Eigen/LU
M extern/Eigen3/Eigen/MetisSupport
M extern/Eigen3/Eigen/OrderingMethods
M extern/Eigen3/Eigen/PaStiXSupport
M extern/Eigen3/Eigen/PardisoSupport
M extern/Eigen3/Eigen/QR
M extern/Eigen3/Eigen/QtAlignedMalloc
M extern/Eigen3/Eigen/SPQRSupport
M extern/Eigen3/Eigen/SVD
M extern/Eigen3/Eigen/Sparse
M extern/Eigen3/Eigen/SparseCholesky
M extern/Eigen3/Eigen/SparseCore
M extern/Eigen3/Eigen/SparseLU
M extern/Eigen3/Eigen/SparseQR
M extern/Eigen3/Eigen/StdDeque
M extern/Eigen3/Eigen/StdList
M extern/Eigen3/Eigen/StdVector
M extern/Eigen3/Eigen/SuperLUSupport
M extern/Eigen3/Eigen/UmfPackSupport
M extern/Eigen3/Eigen/src/Cholesky/LDLT.h
M extern/Eigen3/Eigen/src/Cholesky/LLT.h
A extern/Eigen3/Eigen/src/Cholesky/LLT_LAPACKE.h
M extern/Eigen3/Eigen/src/CholmodSupport/CholmodSupport.h
M extern/Eigen3/Eigen/src/Core/Array.h
M extern/Eigen3/Eigen/src/Core/ArrayBase.h
M extern/Eigen3/Eigen/src/Core/ArrayWrapper.h
M extern/Eigen3/Eigen/src/Core/Assign.h
A extern/Eigen3/Eigen/src/Core/AssignEvaluator.h
M extern/Eigen3/Eigen/src/Core/Assign_MKL.h
M extern/Eigen3/Eigen/src/Core/BandMatrix.h
M extern/Eigen3/Eigen/src/Core/Block.h
M extern/Eigen3/Eigen/src/Core/BooleanRedux.h
M extern/Eigen3/Eigen/src/Core/CommaInitializer.h
A extern/Eigen3/Eigen/src/Core/ConditionEstimator.h
A extern/Eigen3/Eigen/src/Core/CoreEvaluators.h
M extern/Eigen3/Eigen/src/Core/CoreIterators.h
M extern/Eigen3/Eigen/src/Core/CwiseBinaryOp.h
M extern/Eigen3/Eigen/src/Core/CwiseNullaryOp.h
A extern/Eigen3/Eigen/src/Core/CwiseTernaryOp.h
M extern/Eigen3/Eigen/src/Core/CwiseUnaryOp.h
M extern/Eigen3/Eigen/src/Core/CwiseUnaryView.h
M extern/Eigen3/Eigen/src/Core/DenseBase.h
M extern/Eigen3/Eigen/src/Core/DenseCoeffsBase.h
M extern/Eigen3/Eigen/src/Core/DenseStorage.h
M extern/Eigen3/Eigen/src/Core/Diagonal.h
M extern/Eigen3/Eigen/src/Core/DiagonalMatrix.h
M extern/Eigen3/Eigen/src/Core/DiagonalProduct.h
M extern/Eigen3/Eigen/src/Core/Dot.h
M extern/Eigen3/Eigen/src/Core/EigenBase.h
M extern/Eigen3/Eigen/src/Core/ForceAlignedAccess.h
M extern/Eigen3/Eigen/src/Core/Fuzzy.h
M extern/Eigen3/Eigen/src/Core/GeneralProduct.h
M extern/Eigen3/Eigen/src/Core/GenericPacketMath.h
M extern/Eigen3/Eigen/src/Core/GlobalFunctions.h
M extern/Eigen3/Eigen/src/Core/IO.h
A extern/Eigen3/Eigen/src/Core/Inverse.h
M extern/Eigen3/Eigen/src/Core/Map.h
M extern/Eigen3/Eigen/src/Core/MapBase.h
M extern/Eigen3/Eigen/src/Core/MathFunctions.h
A extern/Eigen3/Eigen/src/Core/MathFunctionsImpl.h
M extern/Eigen3/Eigen/src/Core/Matrix.h
M extern/Eigen3/Eigen/src/Core/MatrixBase.h
M extern/Eigen3/Eigen/src/Core/NestByValue.h
M extern/Eigen3/Eigen/src/Core/NoAlias.h
M extern/Eigen3/Eigen/src/Core/NumTraits.h
M extern/Eigen3/Eigen/src/Core/PermutationMatrix.h
M extern/Eigen3/Eigen/src/Core/PlainObjectBase.h
M extern/Eigen3/Eigen/src/Core/Product.h
A extern/Eigen3/Eigen/src/Core/ProductEvaluators.h
M extern/Eigen3/Eigen/src/Core/Random.h
M extern/Eigen3/Eigen/src/Core/Redux.h
M extern/Eigen3/Eigen/src/Core/Ref.h
M extern/Eigen3/Eigen/src/Core/Replicate.h
M extern/Eigen3/Eigen/src/Core/ReturnByValue.h
M extern/Eigen3/Eigen/src/Core/Reverse.h
M extern/Eigen3/Eigen/src/Core/Select.h
M extern/Eigen3/Eigen/src/Core/SelfAdjointView.h
M extern/Eigen3/Eigen/src/Core/SelfCwiseBinaryOp.h
A extern/Eigen3/Eigen/src/Core/Solve.h
M extern/Eigen3/Eigen/src/Core/SolveTriangular.h
A extern/Eigen3/Eigen/src/Core/SolverBase.h
M extern/Eigen3/Eigen/src/Core/StableNorm.h
M extern/Eigen3/Eigen/src/Core/Stride.h
M extern/Eigen3/Eigen/src/Core/Swap.h
M extern/Eigen3/Eigen/src/Core/Transpose.h
M extern/Eigen3/Eigen/src/Core/Transpositions.h
M extern/Eigen3/Eigen/src/Core/TriangularMatrix.h
M extern/Eigen3/Eigen/src/Core/VectorBlock.h
M extern/Eigen3/Eigen/src/Core/VectorwiseOp.h
M extern/Eigen3/Eigen/src/Core/Visitor.h
A extern/Eigen3/Eigen/src/Core/arch/AVX/Complex.h
A extern/Eigen3/Eigen/src/Core/arch/AVX/MathFunctions.h
A extern/Eigen3/Eigen/src/Core/arch/AVX/PacketMath.h
A extern/Eigen3/Eigen/src/Core/arch/AVX/TypeCasting.h
A extern/Eigen3/Eigen/src/Core/arch/AVX512/MathFunctions.h
A extern/Eigen3/Eigen/src/Core/arch/AVX512/PacketMath.h
M extern/Eigen3/Eigen/src/Core/arch/AltiVec/Complex.h
A extern/Eigen3/Eigen/src/Core/arch/AltiVec/MathFunctions.h
M extern/Eigen3/Eigen/src/Core/arch/AltiVec/PacketMath.h
A extern/Eigen3/Eigen/src/Core/arch/CUDA/Complex.h
A extern/Eigen3/Eigen/src/Core/arch/CUDA/Half.h
A extern/Eigen3/Eigen/src/Core/arch/CUDA/MathFunctions.h
A extern/Eigen3/Eigen/src/Core/arch/CUDA/PacketMath.h
A extern/Eigen3/Eigen/src/Core/arch/CUDA/PacketMathHalf.h
A extern/Eigen3/Eigen/src/Core/arch/CUDA/TypeCasting.h
A extern/Eigen3/Eigen/src/Core/arch/Default/ConjHelper.h
M extern/Eigen3/Eigen/src/Core/arch/NEON/Complex.h
A extern/Eigen3/Eigen/src/Core/arch/NEON/MathFunctions.h
M extern/Eigen3/Eigen/src/Core/arch/NEON/PacketMath.h
M extern/Eigen3/Eigen/src/Core/arch/SSE/Complex.h
M extern/Eigen3/Eigen/src/Core/arch/SSE/MathFunctions.h
M extern/Eigen3/Eigen/src/Core/arch/SSE/PacketMath.h
A extern/Eigen3/Eigen/src/Core/arch/SSE/TypeCasting.h
A extern/Eigen3/Eigen/src/Core/arch/ZVector/Complex.h
A extern/Eigen3/Eigen/src/Core/arch/ZVector/MathFunctions.h
A extern/Eigen3/Eigen/src/Core/arch/ZVector/PacketMath.h
A extern/Eigen3/Eigen/src/Core/functors/AssignmentFunctors.h
A extern/Eigen3/Eigen/src/Core/functors/BinaryFunctors.h
A extern/Eigen3/Eigen/src/Core/functors/NullaryFunctors.h
A extern/Eigen3/Eigen/src/Core/functors/StlFunctors.h
A extern/Eigen3/Eigen/src/Core/functors/TernaryFunctors.h
A extern/Eigen3/Eigen/src/Core/functors/UnaryFunctors.h
M extern/Eigen3/Eigen/src/Core/products/GeneralBlockPanelKernel.h
M extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
M extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular.h
A extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrixTriangular_BLAS.h
A extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix_BLAS.h
M extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector.h
A extern/Eigen3/Eigen/src/Core/products/GeneralMatrixVector_BLAS.h
M extern/Eigen3/Eigen/src/Core/products/Parallelizer.h
M extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix.h
A extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixMatrix_BLAS.h
M extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector.h
A extern/Eigen3/Eigen/src/Core/products/SelfadjointMatrixVector_BLAS.h
M extern/Eigen3/Eigen/src/Core/products/SelfadjointProduct.h
M extern/Eigen3/Eigen/src/Core/products/SelfadjointRank2Update.h
M extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix.h
A extern/Eigen3/Eigen/src/Core/products/TriangularMatrixMatrix_BLAS.h
M extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector.h
A extern/Eigen3/Eigen/src/Core/products/TriangularMatrixVector_BLAS.h
M extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix.h
A extern/Eigen3/Eigen/src/Core/products/TriangularSolverMatrix_BLAS.h
M extern/Eigen3/Eigen/src/Core/products/TriangularSolverVector.h
M extern/Eigen3/Eigen/src/Core/util/BlasUtil.h
M extern/Eigen3/Eigen/src/Core/util/Constants.h
M extern/Eigen3/Eigen/src/Core/util/DisableStupidWarnings.h
M extern/Eigen3/Eigen/src/Core/util/ForwardDeclarations.h
M extern/Eigen3/Eigen/src/Core/util/MKL_support.h
M extern/Eigen3/Eigen/src/Core/util/Macros.h
M extern/Eigen3/Eigen/src/Core/util/Memory.h
M extern/Eigen3/Eigen/src/Core/util/Meta.h
M extern/Eigen3/Eigen/src/Core/util/ReenableStupidWarnings.h
M extern/Eigen3/Eigen/src/Core/util/StaticAssert.h
M extern/Eigen3/Eigen/src/Core/util/XprHelper.h
M extern/Eigen3/Eigen/src/Eigenvalues/ComplexEigenSolver.h
M extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur.h
A extern/Eigen3/Eigen/src/Eigenvalues/ComplexSchur_LAPACKE.h
M extern/Eigen3/Eigen/src/Eigenvalues/EigenSolver.h
M extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedEigenSolver.h
M extern/Eigen3/Eigen/src/Eigenvalues/GeneralizedSelfAdjointEigenSolver.h
M extern/Eigen3/Eigen/src/Eigenvalues/HessenbergDecomposition.h
M extern/Eigen3/Eigen/src/Eigenvalues/MatrixBaseEigenvalues.h
M extern/Eigen3/Eigen/src/Eigenvalues/RealQZ.h
M extern/Eigen3/Eigen/src/Eigenvalues/RealSchur.h
A extern/Eigen3/Eigen/src/Eigenvalues/RealSchur_LAPACKE.h
M extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver.h
A extern/Eigen3/Eigen/src/Eigenvalues/SelfAdjointEigenSolver_LAPACKE.h
M extern/Eigen3/Eigen/src/Eigenvalues/Tridiagonalization.h
M extern/Eigen3/Eigen/src/Geometry/AlignedBox.h
M extern/Eigen3/Eigen/src/Geometry/AngleAxis.h
M extern/Eigen3/Eigen/src/Geometry/EulerAngles.h
M extern/Eigen3/Eigen/src/Geometry/Homogeneous.h
M extern/Eigen3/Eigen/src/Geometry/Hyperplane.h
M extern/Eigen3/Eigen/src/Geometry/OrthoMethods.h
M extern/Eigen3/Eigen/src/Geometry/ParametrizedLine.h
M extern/Eigen3/Eigen/src/Geometry/Quaternion.h
M extern/Eigen3/Eigen/src/Geometry/Rotation2D.h
M extern/Eigen3/Eigen/src/Geometry/RotationBase.h
M extern/Eigen3/Eigen/src/Geometry/Scaling.h
M extern/Eigen3/Eigen/src/Geometry/Transform.h
M extern/Eigen3/Eigen/src/Geometry/Translation.h
M extern/Eigen3/Eigen/src/Geometry/Umeyama.h
M extern/Eigen3/Eigen/src/Geometry/arch/Geometry_SSE.h
M extern/Eigen3/Eigen/src/Householder/BlockHouseholder.h
M extern/Eigen3/Eigen/src/Householder/Householder.h
M extern/Eigen3/Eigen/src/Householder/HouseholderSequence.h
M extern/Eigen3/Eigen/src/IterativeLinearSolvers/BasicPreconditioners.h
M extern/Eigen3/Eigen/src/IterativeLinearSolvers/BiCGSTAB.h
M extern/Eigen3/Eigen/src/IterativeLinearSolvers/ConjugateGradient.h
A extern/Eigen3/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h
M extern/Eigen3/Eigen/src/IterativeLinearSolvers/IncompleteLUT.h
M extern/Eigen3/Eigen/src/IterativeLinearSolvers/IterativeSolverBase.h
A extern/Eigen3/Eigen/src/IterativeLinearSolvers/LeastSquareConjugateGradient.h
A extern/Eigen3/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h
M extern/Eigen3/Eigen/src/Jacobi/Jacobi.h
M extern/Eigen3/Eigen/src/LU/Determinant.h
M extern/Eigen3/Eigen/src/LU/FullPivLU.h
A extern/Eigen3/Eigen/src/LU/InverseImpl.h
M extern/Eigen3/Eigen/src/LU/PartialPivLU.h
A extern/Eigen3/Eigen/src/LU/PartialPivLU_LAPACKE.h
M extern/Eigen3/Eigen/src/LU/arch/Inverse_SSE.h
M extern/Eigen3/Eigen/src/MetisSupport/MetisSupport.h
M extern/Eigen3/Eigen/src/OrderingMethods/Amd.h
M extern/Eigen3/Eigen/src/OrderingMethods/Eigen_Colamd.h
M extern/Eigen3/Eigen/src/OrderingMethods/Ordering.h
M extern/Eigen3/Eigen/src/PaStiXSupport/PaStiXSupport.h
M extern/Eigen3/Eigen/src/PardisoSupport/PardisoSupport.h
M extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR.h
A extern/Eigen3/Eigen/src/QR/ColPivHouseholderQR_LAPACKE.h
A extern/Eigen3/Eigen/src/QR/CompleteOrthogonalDecomposition.h
M extern/Eigen3/Eigen/src/QR/FullPivHouseholderQR.h
M extern/Eigen3/Eigen/src/QR/HouseholderQR.h
A extern/Eigen3/Eigen/src/QR/HouseholderQR_LAPACKE.h
M extern/Eigen3/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h
A extern/Eigen3/Eigen/src/SVD/BDCSVD.h
M extern/Eigen3/Eigen/src/SVD/JacobiSVD.h
A extern/Eigen3/Eigen/src/SVD/JacobiSVD_LAPACKE.h
A extern/Eigen3/Eigen/src/SVD/SVDBase.h
M extern/Eigen3/Eigen/src/SVD/UpperBidiagonalization.h
M extern/Eigen3/Eigen/src/SparseCholesky/SimplicialCholesky.h
M extern/Eigen3/Eigen/src/SparseCholesky/SimplicialCholesky_impl.h
M extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h
M extern/Eigen3/Eigen/src/SparseCore/CompressedStorage.h
M extern/Eigen3/Eigen/src/SparseCore/ConservativeSparseSparseProduct.h
M extern/Eigen3/Eigen/src/SparseCore/MappedSparseMatrix.h
M extern/Eigen3/Eigen/src/SparseCore/SparseAssign.h
M extern/Eigen3/Eigen/src/SparseCore/SparseBlock.h
M extern/Eigen3/Eigen/src/SparseCore/SparseColEtree.h
A extern/Eigen3/Eigen/src/SparseCore/SparseCompressedBase.h
M extern/Eigen3/Eigen/src/SparseCore/SparseCwiseBinaryOp.h
M extern/Eigen3/Eigen/src/SparseCore/SparseCwiseUnaryOp.h
M extern/Eigen3/Eigen/src/SparseCore/SparseDenseProduct.h
M extern/Eigen3/Eigen/src/SparseCore/SparseDiagonalProduct.h
M extern/Eigen3/Eigen/src/SparseCore/SparseDot.h
M extern/Eigen3/Eigen/src/SparseCore/SparseFuzzy.h
A extern/Eigen3/Eigen/src/SparseCore/SparseMap.h
M extern/Eigen3/Eigen/src/SparseCore/SparseMatrix.h
M extern/Eigen3/Eigen/src/SparseCore/SparseMatrixBase.h
M extern/Eigen3/Eigen/src/SparseCore/SparsePermutation.h
M extern/Eigen3/Eigen/src/SparseCore/SparseProduct.h
M extern/Eigen3/Eigen/src/SparseCore/SparseRedux.h
A extern/Eigen3/Eigen/src/SparseCore/SparseRef.h
M extern/Eigen3/Eigen/src/SparseCore/SparseSelfAdjointView.h
A extern/Eigen3/Eigen/src/SparseCore/SparseSolverBase.h
M extern/Eigen3/Eigen/src/SparseCore/SparseSparseProductWithPruning.h
M extern/Eigen3/Eigen/src/SparseCore/SparseTranspose.h
M extern/Eigen3/Eigen/src/SparseCore/SparseTriangularView.h
M extern/Eigen3/Eigen/src/SparseCore/SparseUtil.h
M extern/Eigen3/Eigen/src/SparseCore/SparseVector.h
M extern/Eigen3/Eigen/src/SparseCore/SparseView.h
M extern/Eigen3/Eigen/src/SparseCore/TriangularSolver.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLUImpl.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_Memory.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_Structs.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_SupernodalMatrix.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_Utils.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_column_bmod.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_column_dfs.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_copy_to_ucol.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_gemm_kernel.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_heap_relax_snode.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_kernel_bmod.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_panel_bmod.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_panel_dfs.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_pivotL.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_pruneL.h
M extern/Eigen3/Eigen/src/SparseLU/SparseLU_relax_snode.h
M extern/Eigen3/Eigen/src/SparseQR/SparseQR.h
M extern/Eigen3/Eigen/src/StlSupport/StdDeque.h
M extern/Eigen3/Eigen/src/StlSupport/StdList.h
M extern/Eigen3/Eigen/src/StlSupport/StdVector.h
M extern/Eigen3/Eigen/src/StlSupport/details.h
M extern/Eigen3/Eigen/src/SuperLUSupport/SuperLUSupport.h
M extern/Eigen3/Eigen/src/UmfPackSupport/UmfPackSupport.h
M extern/Eigen3/Eigen/src/misc/Image.h
M extern/Eigen3/Eigen/src/misc/Kernel.h
A extern/Eigen3/Eigen/src/misc/RealSvd2x2.h
M extern/Eigen3/Eigen/src/misc/blas.h
A extern/Eigen3/Eigen/src/misc/lapack.h
A extern/Eigen3/Eigen/src/misc/lapacke.h
A extern/Eigen3/Eigen/src/misc/lapacke_mangling.h
M extern/Eigen3/Eigen/src/plugins/ArrayCwiseBinaryOps.h
M extern/Eigen3/Eigen/src/plugins/ArrayCwiseUnaryOps.h
M extern/Eigen3/Eigen/src/plugins/BlockMethods.h
M extern/Eigen3/Eigen/src/plugins/CommonCwiseBinaryOps.h
M extern/Eigen3/Eigen/src/plugins/CommonCwiseUnaryOps.h
M extern/Eigen3/Eigen/src/plugins/MatrixCwiseBinaryOps.h
M extern/Eigen3/Eigen/src/plugins/MatrixCwiseUnaryOps.h
M extern/Eigen3/eigen-update.sh
M extern/cuew/include/cuew.h
M extern/cuew/src/cuew.c
M intern/cycles/blender/blender_shader.cpp
M intern/cycles/bvh/bvh4.cpp
M intern/cycles/kernel/closure/bssrdf.h
M intern/cycles/kernel/filter/filter_transform.h
M intern/cycles/kernel/kernel_shader.h
M intern/cycles/kernel/kernel_types.h
M intern/cycles/kernel/kernels/cpu/kernel_cpu_image.h
M intern/cycles/kernel/shaders/node_math.osl
M intern/cycles/kernel/svm/svm_math.h
M intern/cycles/kernel/svm/svm_math_util.h
M intern/cycles/kernel/svm/svm_types.h
M intern/cycles/render/constant_fold.cpp
M intern/cycles/render/constant_fold.h
M intern/cycles/render/nodes.cpp
M intern/cycles/render/nodes.h
M intern/cycles/render/stats.h
M intern/cycles/test/render_graph_finalize_test.cpp
M intern/cycles/util/util_vector.h
M intern/guardedalloc/intern/mallocn_guarded_impl.c
M release/datafiles/blender_icons.svg
A release/datafiles/blender_icons16/icon16_snap_midpoint.dat
A release/datafiles/blender_icons16/icon16_snap_perpendicular.dat
A release/datafiles/blender_icons32/icon32_snap_midpoint.dat
A release/datafiles/blender_icons32/icon32_snap_perpendicular.dat
M release/datafiles/locale
M release/datafiles/userdef/userdef_default_theme.c
M release/scripts/addons
M release/scripts/addons_contrib
M release/scripts/modules/addon_utils.py
M release/scripts/modules/bl_i18n_utils/utils.py
M release/scripts/modules/bl_ui_utils/bug_report_url.py
M release/scripts/modules/bpy_extras/mesh_utils.py
M release/scripts/presets/interface_theme/blender_light.xml
M release/scripts/presets/keyconfig/keymap_data/blender_default.py
M release/scripts/presets/keyconfig/keymap_data/industry_compatible_data.py
M release/scripts/startup/bl_operators/anim.py
M release/scripts/startup/bl_operators/userpref.py
M release/scripts/startup/bl_operators/wm.py
M release/scripts/startup/bl_ui/__init__.py
M release/scripts/startup/bl_ui/properties_data_modifier.py
M release/scripts/startup/bl_ui/properties_material_gpencil.py
M release/scripts/startup/bl_ui/properties_paint_common.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_outliner.py
M release/scripts/startup/bl_ui/space_sequencer.py
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M release/scripts/startup/bl_ui/space_topbar.py
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d.py
M release/windows/batch/blender_debug_log.cmd
M source/blender/alembic/ABC_alembic.h
M source/blender/alembic/intern/abc_mesh.cc
M source/blender/alembic/intern/abc_mesh.h
M source/blender/alembic/intern/abc_object.cc
M source/blender/alembic/intern/abc_object.h
M source/blender/alembic/intern/alembic_capi.cc
M source/blender/blenkernel/BKE_DerivedMesh.h
M source/blender/blenkernel/BKE_blender_version.h
M source/blender/blenkernel/BKE_cdderivedmesh.h
M source/blender/blenkernel/BKE_context.h
M source/blender/blenkernel/BKE_curve.h
M source/blender/blenkernel/BKE_key.h
M source/blender/blenkernel/BKE_lattice.h
M source/blender/blenkernel/BKE_material.h
M source/blender/blenkernel/BKE_mesh.h
M source/blender/blenkernel/BKE_node.h
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/intern/DerivedMesh.c
M source/blender/blenkernel/intern/armature_update.c
M source/blender/blenkernel/intern/cdderivedmesh.c
M source/blender/blenkernel/intern/context.c
M source/blender/blenkernel/intern/curve.c
M source/blender/blenkernel/intern/customdata.c
M source/blender/blenkernel/intern/editmesh.c
M source/blender/blenkernel/intern/gpencil.c
M source/blender/blenkernel/intern/image.c
M source/blender/blenkernel/intern/key.c
M source/blender/blenkernel/intern/lattice.c
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/mask.c
M source/blender/blenkernel/intern/material.c
M source/blender/blenkernel/intern/mball.c
M source/blender/blenkernel/intern/mesh.c
M source/blender/blenkernel/intern/mesh_evaluate.c
M source/blender/blenkernel/intern/node.c
M source/blender/blenkernel/intern/object.c
M source/blender/blenkernel/intern/object_update.c
M source/blender/blenkernel/intern/ocean.c
M source/blender/blenkernel/intern/pbvh.c
M source/blender/blenkernel/intern/softbody.c
M source/blender/blenkernel/intern/subsurf_ccg.c
M source/blender/blenlib/BLI_math_base.h
M source/blender/blenlib/BLI_math_matrix.h
M source/blender/blenlib/BLI_math_vector.h
M source/blender/blenlib/intern/BLI_ghash.c
M source/blender/blenlib/intern/boxpack_2d.c
M source/blender/blenlib/intern/delaunay_2d.c
M source/blender/blenlib/intern/freetypefont.c
M source/blender/blenlib/intern/math_base_inline.c
M source/blender/blenlib/intern/math_geom.c
M source/blender/blenlib/intern/math_matrix.c
M source/blender/blenlib/intern/math_vector.c
M source/blender/blenlib/intern/math_vector_inline.c
M source/blender/blenloader/BLO_blend_defs.h
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/blenloader/intern/versioning_cycles.c
M source/blender/blenloader/intern/versioning_userdef.c
M source/blender/blenloader/intern/writefile.c
M source/blender/blentranslation/msgfmt/msgfmt.c
M source/blender/bmesh/intern/bmesh_marking.c
M source/blender/bmesh/intern/bmesh_mesh_conv.c
M source/blender/bmesh/intern/bmesh_polygon.c
M source/blender/bmesh/intern/bmesh_query.c
M source/blender/bmesh/intern/bmesh_walkers_impl.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/bmesh/tools/bmesh_decimate_collapse.c
M source/blender/bmesh/tools/bmesh_decimate_unsubdivide.c
M source/blender/bmesh/tools/bmesh_region_match.c
M source/blender/compositor/CMakeLists.txt
M source/blender/compositor/intern/COM_CompositorContext.h
M source/blender/compositor/intern/COM_MemoryBuffer.h
M source/blender/compositor/intern/COM_NodeOperation.h
M source/blender/compositor/intern/COM_OpenCLDevice.cpp
M source/blender/compositor/intern/COM_OpenCLDevice.h
M source/blender/compositor/nodes/COM_ImageNode.cpp
M source/blender/compositor/nodes/COM_MathNode.cpp
M source/blender/compositor/operations/COM_ColorBalanceLGGOperation.cpp
M source/blender/compositor/operations/COM_CompositorOperation.cpp
M source/blender/compositor/operations/COM_DenoiseOperation.cpp
M source/blender/compositor/operations/COM_GlareGhostOperation.cpp
M source/blender/compositor/operations/COM_GlareSimpleStarOperation.cpp
M source/blender/compositor/operations/COM_GlareStreaksOperation.cpp
M source/blender/compositor/operations/COM_MaskOperation.cpp
M source/blender/compositor/operations/COM_ViewerOperation.cpp
M source/blender/compositor/operations/COM_WriteBufferOperation.cpp
M source/blender/depsgraph/intern/depsgraph_tag.cc
M source/blender/draw/DRW_engine.h
M source/blender/draw/DRW_select_buffer.h
M source/blender/draw/engines/eevee/eevee_effects.c
M source/blender/draw/engines/eevee/eevee_lightcache.c
M source/blender/draw/engines/eevee/eevee_lightprobes.c
M source/blender/draw/engines/eevee/eevee_lights.c
M source/blender/draw/engines/eevee/eevee_lookdev.c
M source/blender/draw/engines/select/select_draw_utils.c
M source/blender/draw/engines/select/select_engine.c
M source/blender/draw/engines/select/select_engine.h
M source/blender/draw/engines/select/select_private.h
M source/blender/draw/engines/select/shaders/selection_id_frag.glsl
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_cache.c
M source/blender/draw/intern/draw_cache.h
M source/blender/draw/intern/draw_cache_extract_mesh.c
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/draw/intern/draw_common.h
M source/blender/draw/intern/draw_hair.c
M source/blender/draw/intern/draw_instance_data.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/intern/draw_manager_exec.c
M source/blender/draw/intern/draw_manager_profiling.c
M source/blender/draw/intern/draw_manager_profiling.h
M source/blender/draw/intern/draw_manager_shader.c
M source/blender/draw/intern/draw_select_buffer.c
M source/blender/draw/modes/object_mode.c
M source/blender/draw/modes/shaders/common_globals_lib.glsl
M source/blender/draw/modes/shaders/object_grid_frag.glsl
M source/blender/draw/modes/shaders/object_grid_vert.glsl
M source/blender/editors/animation/anim_motion_paths.c
M source/blender/editors/animation/drivers.c
M source/blender/editors/animation/keyframing.c
M source/blender/editors/animation/keyingsets.c
M source/blender/editors/armature/armature_add.c
M source/blender/editors/armature/armature_select.c
M source/blender/editors/armature/armature_utils.c
M source/blender/editors/armature/pose_select.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/curve/editcurve_paint.c
M source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.c
M source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.c
M source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.c
M source/blender/editors/gpencil/annotate_draw.c
M source/blender/editors/gpencil/annotate_paint.c
M source/blender/editors/gpencil/drawgpencil.c
M source/blender/editors/gpencil/gpencil_brush.c
M source/blender/editors/gpencil/gpencil_edit.c
M source/blender/editors/gpencil/gpencil_intern.h
M source/blender/editors/gpencil/gpencil_paint.c
M source/blender/editors/gpencil/gpencil_primitive.c
M source/blender/editors/gpencil/gpencil_select.c
M source/blender/editors/include/ED_armature.h
M source/blender/editors/include/ED_outliner.h
M source/blender/editors/include/ED_screen.h
M source/blender/editors/include/ED_transform_snap_object_context.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/include/UI_icons.h
M source/blender/editors/include/UI_resources.h
M source/blender/editors/interface/interface_eyedropper_datablock.c
M source/blender/editors/interface/interface_handlers.c
M source/blender/editors/interface/interface_layout.c
M source/blender/editors/interface/interface_ops.c
M source/blender/editors/interface/interface_region_popup.c
M source/blender/editors/interface/interface_templates.c
M source/blender/editors/interface/resources.c
M source/blender/editors/interface/view2d_gizmo_navigate.c
M source/blender/editors/interface/view2d_ops.c
M source/blender/editors/mesh/editmesh_extrude_spin_gizmo.c
M source/blender/editors/mesh/editmesh_knife.c
M source/blender/editors/mesh/editmesh_select.c
M source/blender/editors/mesh/editmesh_tools.c
M source/blender/editors/mesh/meshtools.c
M source/blender/editors/object/object_add.c
M source/blender/editors/object/object_edit.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/object/object_remesh.c
M source/blender/editors/object/object_select.c
M source/blender/editors/object/object_vgroup.c
M source/blender/editors/render/render_view.c
M source/blender/editors/screen/area.c
M source/blender/editors/screen/screen_edit.c
M source/blender/editors/screen/screen_ops.c
M source/blender/editors/sculpt_paint/paint_image_proj.c
M source/blender/editors/sculpt_paint/paint_image_undo.c
M source/blender/editors/sculpt_paint/paint_utils.c
M source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_intern.h
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_image/image_draw.c
M source/blender/editors/space_image/space_image.c
M source/blender/editors/space_info/info_stats.c
M source/blender/editors/space_node/drawnode.c
M source/blender/editors/space_outliner/CMakeLists.txt
M source/blender/editors/space_outliner/outliner_dragdrop.c
M source/blender/editors/space_outliner/outliner_draw.c
M source/blender/editors/space_outliner/outliner_edit.c
M source/blender/editors/space_outliner/outliner_intern.h
M source/blender/editors/space_outliner/outliner_ops.c
M source/blender/editors/space_outliner/outliner_select.c
A source/blender/editors/space_outliner/outliner_sync.c
M source/blender/editors/space_outliner/outliner_tools.c
M source/blender/editors/space_outliner/outliner_tree.c
M source/blender/editors/space_outliner/outliner_utils.c
M source/blender/editors/space_outliner/space_outliner.c
M source/blender/editors/space_sequencer/sequencer_draw.c
M source/blender/editors/space_sequencer/sequencer_select.c
M source/blender/editors/space_sequencer/space_sequencer.c
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/view3d_camera_control.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_draw_legacy.c
M source/blender/editors/space_view3d/view3d_edit.c
M source/blender/editors/space_view3d/view3d_gizmo_navigate.c
M source/blender/editors/space_view3d/view3d_gizmo_ruler.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/space_view3d/view3d_utils.c
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_input.c
M source/blender/editors/transform/transform_ops.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/transform/transform_snap_object.c
M source/blender/editors/undo/ed_undo.c
M source/blender/editors/uvedit/uvedit_draw.c
M source/blender/editors/uvedit/uvedit_unwrap_ops.c
M source/blender/freestyle/intern/scene_graph/FrsMaterial.h
M source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
M source/blender/freestyle/intern/scene_graph/NodeTransform.h
M source/blender/freestyle/intern/stroke/Curve.h
M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.c
M source/blender/gpencil_modifiers/intern/MOD_gpencil_util.h
M source/blender/gpencil_modifiers/intern/MOD_gpencilarray.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilcolor.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilhook.c
M source/blender/gpencil_modifiers/intern/MOD_gpencillattice.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilmirror.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilnoise.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciloffset.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilopacity.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsimplify.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsmooth.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilsubdiv.c
M source/blender/gpencil_modifiers/intern/MOD_gpencilthick.c
M source/blender/gpencil_modifiers/intern/MOD_gpenciltint.c
M source/blender/gpu/intern/gpu_element.c
M source/blender/gpu/intern/gpu_extensions.c
M source/blender/gpu/intern/gpu_texture.c
M source/blender/gpu/intern/gpu_vertex_format.c
M source/blender/gpu/shaders/gpu_shader_material.glsl
M source/blender/imbuf/IMB_imbuf.h
M source/blender/imbuf/intern/scaling.c
M source/blender/makesdna/DNA_documentation.h
M source/blender/makesdna/DNA_gpencil_modifier_types.h
M source/blender/makesdna/DNA_meshdata_types.h
M source/blender/makesdna/DNA_node_types.h
M source/blender/makesdna/DNA_outliner_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_screen_types.h
M source/blender/makesdna/DNA_space_types.h
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesdna/DNA_windowmanager_types.h
M source/blender/makesdna/intern/dna_genfile.c
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_armature.c
M source/blender/makesrna/intern/rna_camera.c
M source/blender/makesrna/intern/rna_cloth.c
M source/blender/makesrna/intern/rna_collection.c
M source/blender/makesrna/intern/rna_constraint.c
M source/blender/makesrna/intern/rna_curve.c
M source/blender/makesrna/intern/rna_gpencil.c
M source/blender/makesrna/intern/rna_gpencil_modifier.c
M source/blender/makesrna/intern/rna_key.c
M source/blender/makesrna/intern/rna_lightprobe.c
M source/blender/makesrna/intern/rna_material.c
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_nodetree.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_object_force.c
M source/blender/makesrna/intern/rna_particle.c
M source/blender/makesrna/intern/rna_pose.c
M source/blender/makesrna/intern/rna_rigidbody.c
M source/blender/makesrna/intern/rna_rna.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_sculpt_paint.c
M source/blender/makesrna/intern/rna_shader_fx.c
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_speaker.c
M source/blender/makesrna/intern/rna_texture.c
M source/blender/makesrna/intern/rna_timeline.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/modifiers/intern/MOD_mask.c
M source/blender/modifiers/intern/MOD_meshsequencecache.c
M source/blender/nodes/shader/nodes/node_shader_math.c
M source/blender/nodes/shader/nodes/node_shader_normal.c
M source/blender/nodes/shader/nodes/node_shader_normal_map.c
M source/blender/nodes/texture/nodes/node_texture_math.c
M source/blender/physics/intern/BPH_mass_spring.cpp
M source/blender/python/bmesh/bmesh_py_types_meshdata.c
M source/blender/python/intern/bpy_app_translations.c
M source/blender/python/intern/bpy_operator_wrap.c
M source/blender/python/intern/bpy_rna.c
M source/blender/python/mathutils/mathutils_Quaternion.c
M source/blender/python/mathutils/mathutils_Vector.c
M source/blender/python/mathutils/mathutils_geometry.c
M source/blender/render/extern/include/RE_pipeline.h
M source/blender/render/intern/source/imagetexture.c
M source/blender/render/intern/source/pipeline.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_files.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/intern/wm_window.c
M source/creator/creator.c
M source/tools
M tests/gtests/blenlib/BLI_delaunay_2d_test.cc
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2a7a020c428..16ac322ebdd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -182,6 +182,8 @@ if(UNIX AND NOT APPLE)
set(_init_SDL OFF)
set(_init_FFTW3 OFF)
set(_init_OPENSUBDIV OFF)
+ set(_init_OPENVDB OFF)
+ set(_init_OPENIMAGEDENOISE OFF)
elseif(WIN32)
set(_init_JACK OFF)
elseif(APPLE)
@@ -237,12 +239,12 @@ option(WITH_OPENCOLORIO "Enable OpenColorIO color management" ${_init_OPENCOLO
# Compositor
option(WITH_COMPOSITOR "Enable the tile based nodal compositor" ON)
-option(WITH_OPENIMAGEDENOISE "Enable the OpenImageDenoise compositing node" OFF)
+option(WITH_OPENIMAGEDENOISE "Enable the OpenImageDenoise compositing node" ${_init_OPENIMAGEDENOISE})
option(WITH_OPENSUBDIV "Enable OpenSubdiv for surface subdivision" ${_init_OPENSUBDIV})
-option(WITH_OPENVDB "Enable features relying on OpenVDB" OFF)
-option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" OFF)
+option(WITH_OPENVDB "Enable features relying on OpenVDB" ${_init_OPENVDB})
+option(WITH_OPENVDB_BLOSC "Enable blosc compression for OpenVDB, only enable if OpenVDB was built with blosc support" ${_init_OPENVDB})
option(WITH_OPENVDB_3_ABI_COMPATIBLE "Assume OpenVDB library has been compiled with version 3 ABI compatibility" OFF)
mark_as_advanced(WITH_OPENVDB_3_ABI_COMPATIBLE)
diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake
index b8268f90c33..4e0a924530a 100644
--- a/build_files/build_environment/cmake/osl.cmake
+++ b/build_files/build_environment/cmake/osl.cmake
@@ -87,6 +87,7 @@ elseif(APPLE)
set(OSL_EXTRA_ARGS
${OSL_EXTRA_ARGS}
-DHIDE_SYMBOLS=OFF
+ -DPUGIXML_HOME=${LIBDIR}/pugixml
)
endif()
diff --git a/build_files/build_environment/install_deps.sh b/build_files/build_environment/install_deps.sh
index 1324616ca35..a9118be93c7 100755
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@ -26,17 +26,17 @@ ARGS=$( \
getopt \
-o s:i:t:h \
--long source:,install:,tmp:,info:,threads:,help,show-deps,no-sudo,no-build,no-confirm,\
-with-all,with-opencollada,with-jack,with-embree,\
+with-all,with-opencollada,with-jack,with-embree,with-oidn,\
ver-ocio:,ver-oiio:,ver-llvm:,ver-osl:,ver-osd:,ver-openvdb:,\
force-all,force-python,force-numpy,force-boost,\
force-ocio,force-openexr,force-oiio,force-llvm,force-osl,force-osd,force-openvdb,\
-force-ffmpeg,force-opencollada,force-alembic,force-embree,\
+force-ffmpeg,force-opencollada,force-alembic,force-embree,force-oidn,\
build-all,build-python,build-numpy,build-boost,\
build-ocio,build-openexr,build-oiio,build-llvm,build-osl,build-osd,build-openvdb,\
-build-ffmpeg,build-opencollada,build-alembic,build-embree,\
+build-ffmpeg,build-opencollada,build-alembic,build-embree,build-oidn,\
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-ffmpeg,skip-opencollada,skip-alembic,skip-embree,skip-oidn \
-- "$@" \
)
@@ -57,6 +57,7 @@ WITH_ALL=false
# Do not yet enable opencollada or embree, use --with-opencollada/--with-embree (or --with-all) option to try it.
WITH_OPENCOLLADA=false
WITH_EMBREE=false
+WITH_OIDN=false
THREADS=$(nproc)
@@ -69,6 +70,7 @@ Number of threads for building: \$THREADS (automatically detected, use --threads
Full install: \$WITH_ALL (use --with-all option to enable it).
Building OpenCOLLADA: \$WITH_OPENCOLLADA (use --with-opencollada option to enable it).
Building Embree: \$WITH_EMBREE (use --with-embree option to enable it).
+Building OpenImageDenoise: \$WITH_OIDN (use --with-oidn option to enable it).
Example:
Full install without OpenCOLLADA: --with-all --skip-opencollada
@@ -118,6 +120,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
--with-embree
Build and install the Embree libraries.
+ --with-oidn
+ Build and install the OpenImageDenoise libraries.
+
--with-jack
Install the jack libraries.
@@ -185,6 +190,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
--build-embree
Force the build of Embree.
+ --build-oidn
+ Force the build of OpenImageDenoise.
+
--build-ffmpeg
Force the build of FFMpeg.
@@ -240,6 +248,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
--force-embree
Force the rebuild of Embree.
+ --force-oidn
+ Force the rebuild of OpenImageDenoise.
+
--force-ffmpeg
Force the rebuild of FFMpeg.
@@ -288,6 +299,9 @@ ARGUMENTS_INFO="\"COMMAND LINE ARGUMENTS:
--skip-Embree
Unconditionally skip Embree installation/building.
+ --skip-oidn
+ Unconditionally skip OpenImageDenoise installation/building.
+
--skip-ffmpeg
Unconditionally skip FFMpeg installation/building.\""
@@ -390,6 +404,11 @@ EMBREE_FORCE_BUILD=false
EMBREE_FORCE_REBUILD=false
EMBREE_SKIP=false
+OIDN_VERSION="1.0.0"
+OIDN_FORCE_BUILD=false
+OIDN_FORCE_REBUILD=false
+OIDN_SKIP=false
+
FFMPEG_VERSION="4.0.2"
FFMPEG_VERSION_MIN="2.8.4"
FFMPEG_FORCE_BUILD=false
@@ -526,6 +545,9 @@ while true; do
--with-embree)
WITH_EMBREE=true; shift; continue
;;
+ --with-oidn)
+ WITH_OIDN=true; shift; continue
+ ;;
--with-jack)
WITH_JACK=true; shift; continue;
;;
@@ -572,6 +594,7 @@ while true; do
OPENVDB_FORCE_BUILD=true
OPENCOLLADA_FORCE_BUILD=true
EMBREE_FORCE_BUILD=true
+ OIDN_FORCE_BUILD=true
FFMPEG_FORCE_BUILD=true
ALEMBIC_FORCE_BUILD=true
shift; continue
@@ -616,6 +639,9 @@ while true; do
--build-embree)
EMBREE_FORCE_BUILD=true; shift; continue
;;
+ --build-oidn)
+ OIDN_FORCE_BUILD=true; shift; continue
+ ;;
--build-ffmpeg)
FFMPEG_FORCE_BUILD=true; shift; continue
;;
@@ -635,6 +661,7 @@ while true; do
OPENVDB_FORCE_REBUILD=true
OPENCOLLADA_FORCE_REBUILD=true
EMBREE_FORCE_REBUILD=true
+ OIDN_FORCE_REBUILD=true
FFMPEG_FORCE_REBUILD=true
ALEMBIC_FORCE_REBUILD=true
shift; continue
@@ -677,6 +704,9 @@ while true; do
--force-embree)
EMBREE_FORCE_REBUILD=true; shift; continue
;;
+ --force-oidn)
+ OIDN_FORCE_REBUILD=true; shift; continue
+ ;;
--force-ffmpeg)
FFMPEG_FORCE_REBUILD=true; shift; continue
;;
@@ -719,6 +749,9 @@ while true; do
--skip-embree)
EMBREE_SKIP=true; shift; continue
;;
+ --skip-oidn)
+ OIDN_SKIP=true; shift; continue
+ ;;
--skip-ffmpeg)
FFMPEG_SKIP=true; shift; continue
;;
@@ -746,6 +779,9 @@ fi
if [ "$WITH_ALL" = true -a "$EMBREE_SKIP" = false ]; then
WITH_EMBREE=true
fi
+if [ "$WITH_ALL" = true -a "$OIDN_SKIP" = false ]; then
+ WITH_OIDN=true
+fi
if [ "$WITH_ALL" = true ]; then
WITH_JACK=true
fi
@@ -840,6 +876,11 @@ EMBREE_SOURCE=( "https://github.com/embree/embree/archive/v${EMBREE_VERSION}.tar
#~ EMBREE_REPO_UID="4a12bfed63c90e85b6eab98b8cdd8dd2a3ba5809"
#~ EMBREE_REPO_BRANCH="master"
+OIDN_USE_REPO=false
+OIDN_SOURCE=( "https://github.com/OpenImageDenoise/oidn/releases/download/v${OIDN_VERSION}/oidn-${OIDN_VERSION}.src.tar.gz" )
+#~ OIDN_SOURCE_REPO=( "https://github.com/OpenImageDenoise/oidn.git" )
+#~ OIDN_REPO_UID="dabfd9c80101edae9d25a710160d12d6d963c591"
+#~ OIDN_REPO_BRANCH="master"
FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
@@ -882,6 +923,7 @@ You may also want to build them yourself (optional ones are [between brackets]):
* [OpenVDB $OPENVDB_VERSION_MIN] (from $OPENVDB_SOURCE), [Blosc $OPENVDB_BLOSC_VERSION] (from $OPENVDB_BLOSC_SOURCE).
* [OpenCollada $OPENCOLLADA_VERSION] (from $OPENCOLLADA_SOURCE).
* [Embree $EMBREE_VERSION] (from $EMBREE_SOURCE).
+ * [OpenImageDenoise $OIDN_VERSION] (from $OIDN_SOURCE).
* [Alembic $ALEMBIC_VERSION] (from $ALEMBIC_SOURCE).\""
if [ "$DO_SHOW_DEPS" = true ]; then
@@ -2552,6 +2594,96 @@ compile_Embree() {
fi
}
+#### Build OpenImageDenoise ####
+_init_oidn() {
+ _src=$SRC/oidn-$OIDN_VERSION
+ _git=true
+ _inst=$INST/oidn-$OIDN_VERSION
+ _inst_shortcut=$INST/oidn
+}
+
+clean_oidn() {
+ _init_oidn
+ _clean
+}
+
+compile_OIDN() {
+ if [ "$NO_BUILD" = true ]; then
+ WARNING "--no-build enabled, OpenImageDenoise will not be compiled!"
+ return
+ fi
+
+ # To be changed each time we make edits that would modify the compiled results!
+ oidn_magic=9
+ _init_oidn
+
+ # Clean install if needed!
+ magic_compile_check oidn-$OIDN_VERSION $oidn_magic
+ if [ $? -eq 1 -o "$OIDN_FORCE_REBUILD" = true ]; then
+ clean_oidn
+ fi
+
+ if [ ! -d $_inst ]; then
+ INFO "Building OpenImageDenoise-$OIDN_VERSION"
+
+ prepare_opt
+
+ if [ ! -d $_src ]; then
+ mkdir -p $SRC
+ if [ "OIDN_USE_REPO" = true ]; then
+ git clone $OIDN_SOURCE_REPO $_src
+ else
+ download OIDN_SOURCE[@] "$_src.tar.gz"
+ INFO "Unpacking OpenImageDenoise-$OIDN_VERSION"
+ tar -C $SRC -xf $_src.tar.gz
+ fi
+ fi
+
+ cd $_src
+
+ if [ "$OIDN_USE_REPO" = true ]; then
+ git pull origin $OIDN_REPO_BRANCH
+
+ # Stick to same rev as windows' libs...
+ git checkout $OIDN_REPO_UID
+ git reset --hard
+ fi
+
+ # Always refresh the whole build!
+ if [ -d build ]; then
+ rm -rf build
+ fi
+ mkdir build
+ cd build
+
+ cmake_d="-D CMAKE_BUILD_TYPE=Release"
+ cmake_d="$cmake_d -D CMAKE_INSTALL_PREFIX=$_inst"
+ cmake_d="$cmake_d -D WITH_EXAMPLE=OFF"
+ cmake_d="$cmake_d -D WITH_TEST=OFF"
+ cmake_d="$cmake_d -D OIDN_STATIC_LIB=ON"
+
+ cmake $cmake_d ../
+
+ make -j$THREADS && make install
+ make clean
+
+ if [ -d $_inst ]; then
+ _create_inst_shortcut
+ else
+ ERROR "OpenImageDenoise-$OIDN_VERSION failed to compile, exiting"
+ exit 1
+ fi
+
+ magic_compile_set oidn-$OIDN_VERSION $oidn_magic
+
+ cd $CWD
+ INFO "Done compiling Op
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list