drop openvdb4.revert.patch as it is no longer required

3 files changed, 7 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1317dfccdfb6..c5a8c57c18b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = blender-2.8-git
 	pkgdesc = Development version of Blender 2.8 branch
-	pkgver = 2.8_r74406.7ecc7c46af4
-	pkgrel = 1
+	pkgver = 2.8_r74789.cd6daea7d32
+	pkgrel = 2
 	url = http://blender.org/
 	install = blender.install
 	arch = i686
@@ -39,7 +39,6 @@ pkgbase = blender-2.8-git
 	source = blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git
 	source = blender-2.8.desktop
 	source = SelectCudaComputeArch.patch
-	source = openvdb4.revert.patch
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
@@ -47,7 +46,6 @@ pkgbase = blender-2.8-git
 	md5sums = SKIP
 	md5sums = cd108dca1c77607c6a7cc45aa284ea97
 	md5sums = 9454ff7e994f72ead5027356e227cbd2
-	md5sums = 449373d2fdf2af6b357101fc10e3d573
 
 pkgname = blender-2.8-git
 
diff --git a/PKGBUILD b/PKGBUILD
index d4b00c3dfaa8..da17076abead 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 
 pkgname=blender-2.8-git
-pkgver=2.8_r74406.7ecc7c46af4
-pkgrel=1
+pkgver=2.8_r74789.cd6daea7d32
+pkgrel=2
 pkgdesc="Development version of Blender 2.8 branch"
 arch=('i686' 'x86_64')
 url="http://blender.org/"
@@ -28,7 +28,7 @@ source=('git://git.blender.org/blender.git#branch=blender2.8' \
         'blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git' \
         blender-2.8.desktop \
         SelectCudaComputeArch.patch \
-        openvdb4.revert.patch)
+        )
 md5sums=('SKIP'
          'SKIP'
          'SKIP'
@@ -36,7 +36,7 @@ md5sums=('SKIP'
          'SKIP'
          'cd108dca1c77607c6a7cc45aa284ea97'
          '9454ff7e994f72ead5027356e227cbd2'
-         '449373d2fdf2af6b357101fc10e3d573')
+         )
 
 # determine whether we can precompile CUDA kernels
 _CUDA_PKG=`pacman -Qq cuda 2>/dev/null` || true
@@ -56,8 +56,7 @@ prepare() {
   git submodule update --init --recursive
   git submodule foreach git checkout master
   git submodule foreach git pull --rebase origin master
-  patch -Np1 -i ../SelectCudaComputeArch.patch
-  patch -Np1 -i ../openvdb4.revert.patch
+  git apply ${srcdir}/SelectCudaComputeArch.patch
 }
 
 build() {
diff --git a/openvdb4.revert.patch b/openvdb4.revert.patch
deleted file mode 100644
index 8c2818a9fc31..000000000000
--- a/openvdb4.revert.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/intern/openvdb/intern/openvdb_writer.cc b/intern/openvdb/intern/openvdb_writer.cc
-index e886c5a76a8..923752909d9 100644
---- a/intern/openvdb/intern/openvdb_writer.cc
-+++ b/intern/openvdb/intern/openvdb_writer.cc
-@@ -45,11 +45,7 @@ void OpenVDBWriter::insert(const openvdb::GridBase::Ptr &grid)
- 
- void OpenVDBWriter::insert(const openvdb::GridBase &grid)
- {
--#if (OPENVDB_LIBRARY_MAJOR_VERSION_NUMBER == 3)
- 	m_grids->push_back(grid.copyGrid());
--#else
--	m_grids->push_back(grid.copyGridWithNewTree());
--#endif
- }
- 
- void OpenVDBWriter::insertFloatMeta(const openvdb::Name &name, const float value)