[Bf-blender-cvs] [1d3c721b05d] temp-lineart-contained: Merge branch 'master' into temp-lineart-contained

[Sebastian Parborg]

Commit: 1d3c721b05d96f8faf579217f05c065d920354c7
Author: Sebastian Parborg
Date:   Sun Feb 7 18:55:44 2021 +0100
Branches: temp-lineart-contained
https://developer.blender.org/rB1d3c721b05d96f8faf579217f05c065d920354c7

Merge branch 'master' into temp-lineart-contained

===================================================================



===================================================================

diff --cc build_files/cmake/config/blender_full.cmake
index 62145d0408a,75f78befb60..bca42b91b8e
--- a/build_files/cmake/config/blender_full.cmake
+++ b/build_files/cmake/config/blender_full.cmake
@@@ -18,8 -18,8 +18,9 @@@ set(WITH_CYCLES_OSL          ON  CACHE 
  set(WITH_DRACO               ON  CACHE BOOL "" FORCE)
  set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
  set(WITH_FREESTYLE           ON  CACHE BOOL "" FORCE)
 +set(WITH_LINEART             ON  CACHE BOOL "" FORCE)
  set(WITH_GMP                 ON  CACHE BOOL "" FORCE)
+ set(WITH_HARU                ON  CACHE BOOL "" FORCE)
  set(WITH_IK_ITASC            ON  CACHE BOOL "" FORCE)
  set(WITH_IK_SOLVER           ON  CACHE BOOL "" FORCE)
  set(WITH_IMAGE_CINEON        ON  CACHE BOOL "" FORCE)
diff --cc build_files/cmake/config/blender_lite.cmake
index 8320acd30b1,680734aba6e..245a9b16777
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@@ -23,8 -23,8 +23,9 @@@ set(WITH_CYCLES_DEVICE_OPTIX OFF CACHE 
  set(WITH_DRACO               OFF CACHE BOOL "" FORCE)
  set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
  set(WITH_FREESTYLE           OFF CACHE BOOL "" FORCE)
 +set(WITH_LINEART             OFF CACHE BOOL "" FORCE)
  set(WITH_GMP                 OFF CACHE BOOL "" FORCE)
+ set(WITH_HARU                OFF CACHE BOOL "" FORCE)
  set(WITH_IK_ITASC            OFF CACHE BOOL "" FORCE)
  set(WITH_IK_SOLVER           OFF CACHE BOOL "" FORCE)
  set(WITH_IMAGE_CINEON        OFF CACHE BOOL "" FORCE)
diff --cc build_files/cmake/config/blender_release.cmake
index aba29189dc5,973d6cdb34e..b7ebe40158b
--- a/build_files/cmake/config/blender_release.cmake
+++ b/build_files/cmake/config/blender_release.cmake
@@@ -19,8 -19,8 +19,9 @@@ set(WITH_CYCLES_OSL          ON  CACHE 
  set(WITH_DRACO               ON  CACHE BOOL "" FORCE)
  set(WITH_FFTW3               ON  CACHE BOOL "" FORCE)
  set(WITH_FREESTYLE           ON  CACHE BOOL "" FORCE)
 +set(WITH_LINEART             ON  CACHE BOOL "" FORCE)
  set(WITH_GMP                 ON  CACHE BOOL "" FORCE)
+ set(WITH_HARU                ON  CACHE BOOL "" FORCE)
  set(WITH_IK_SOLVER           ON  CACHE BOOL "" FORCE)
  set(WITH_IK_ITASC            ON  CACHE BOOL "" FORCE)
  set(WITH_IMAGE_CINEON        ON  CACHE BOOL "" FORCE)
diff --cc release/scripts/addons
index 67f1fbca148,dfeb905d62a..35d5df9bf44
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 67f1fbca1482d9d9362a4001332e785c3fd5d230
 -Subproject commit dfeb905d62ae6d759d8da930f291e73505e6ca67
++Subproject commit 35d5df9bf443b7f03857cffc45a1ba4f7e03de94
diff --cc source/tools
index 5cf2fc3e5dc,dd131bc4f95..3f8b3cfa3d1
--- a/source/tools
+++ b/source/tools
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 5cf2fc3e5dc28025394b57d8743401295528f310
 -Subproject commit dd131bc4f95103efa60ce11cafbf174efd7b3d4e
++Subproject commit 3f8b3cfa3d17de7f9b02b0755138e64745c6f7e8