Update embree.patch

3 files changed, 10 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61551b2d3309..c171c87d6133 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = blender-git
 	pkgdesc = A fully integrated 3D graphics creation suite (development)
-	pkgver = 3.1.r111110.gf32b63ec583
+	pkgver = 3.2.r112632.g5b3a415a59c
 	pkgrel = 1
 	url = https://blender.org/
 	arch = i686
@@ -54,7 +54,7 @@ pkgbase = blender-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = 333b6fd864d55da2077bc85c55af1a27d4aee9764a1a839df26873a9f19b8703
-	sha256sums = ab353b7a9fdb5e9a87fefdade6915f44660299b67446735a9720833aa45f6be8
+	sha256sums = d587135fd9b815d60e8b7f48976aa835472922fc8f64c256dc397bfcd3c2642a
 	sha256sums = 5297dc61cc4edcc1d5bad3474ab882264b69d68036cebbd0f2600d9fe21d5a1b
 
 pkgname = blender-git
diff --git a/PKGBUILD b/PKGBUILD
index 1675dcc985ff..9e9da23f27b1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -20,7 +20,7 @@ _fragment="${FRAGMENT:-#branch=master}"
 _CMAKE_FLAGS+=( -DWITH_CYCLES_NETWORK=OFF )
 
 pkgname=blender-git
-pkgver=3.1.r111110.gf32b63ec583
+pkgver=3.2.r112632.g5b3a415a59c
 pkgrel=1
 pkgdesc="A fully integrated 3D graphics creation suite (development)"
 arch=('i686' 'x86_64')
@@ -56,7 +56,7 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             '333b6fd864d55da2077bc85c55af1a27d4aee9764a1a839df26873a9f19b8703'
-            'ab353b7a9fdb5e9a87fefdade6915f44660299b67446735a9720833aa45f6be8'
+            'd587135fd9b815d60e8b7f48976aa835472922fc8f64c256dc397bfcd3c2642a'
             '5297dc61cc4edcc1d5bad3474ab882264b69d68036cebbd0f2600d9fe21d5a1b')
 
 pkgver() {
diff --git a/embree.patch b/embree.patch
index 4790c4ea873a..e6cee1fb8a62 100644
--- a/embree.patch
+++ b/embree.patch
@@ -1,8 +1,8 @@
 diff --git a/build_files/cmake/Modules/FindEmbree.cmake b/build_files/cmake/Modules/FindEmbree.cmake
-index 90cf23d3e13..f625efaa542 100644
+index bb65a24c4b5..5d1ba7b459a 100644
 --- a/build_files/cmake/Modules/FindEmbree.cmake
 +++ b/build_files/cmake/Modules/FindEmbree.cmake
-@@ -7,6 +7,9 @@
+@@ -10,6 +10,9 @@
  #  EMBREE_ROOT_DIR, The base directory to search for Embree.
  #                        This can also be an environment variable.
  #  EMBREEFOUND, If false, do not try to use Embree.
@@ -10,9 +10,9 @@ index 90cf23d3e13..f625efaa542 100644
 +# also defined, but not for general use are
 +#  EMBREE_LIBRARY, where to find the Embree library.
  
- #=============================================================================
- # Copyright 2018 Blender Foundation.
-@@ -67,14 +70,23 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
+ # If EMBREE_ROOT_DIR was defined in the environment, use it.
+ IF(NOT EMBREE_ROOT_DIR AND NOT $ENV{EMBREE_ROOT_DIR} STREQUAL "")
+@@ -72,15 +75,24 @@ FOREACH(COMPONENT ${_embree_FIND_COMPONENTS})
  ENDFOREACH()
  
  
@@ -38,6 +38,7 @@ index 90cf23d3e13..f625efaa542 100644
    SET(EMBREE_INCLUDE_DIRS ${EMBREE_INCLUDE_DIR})
  ENDIF()
  
+ MARK_AS_ADVANCED(
 diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt
 index 2316800e21e..591841152e2 100644
 --- a/intern/cycles/blender/CMakeLists.txt