Add viewport denoiser support.

3 files changed, 34 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1d849354a50e..e5a8a81b6e79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = blender-plugin-luxcorerender
 	pkgdesc = LuxCoreRender exporter plugin for Blender
 	pkgver = 2.2
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 2
 	url = https://luxcorerender.org/
 	arch = any
@@ -9,7 +9,9 @@ pkgbase = blender-plugin-luxcorerender
 	conflicts = luxblend25
 	conflicts = luxblend25-hg
 	source = https://github.com/LuxCoreRender/BlendLuxCore/archive/blendluxcore_v2.2.tar.gz
+	source = denoise.patch
 	sha256sums = 92c2a1669f23bca58b3bef324676d1849775d996c96b8c35af1a97a0fed4e27e
+	sha256sums = 63103ec3bf77c502a54f6f74cad020a448c9641be90202944c46bda0a1ff8bfe
 
 pkgname = blender-plugin-luxcorerender
 	depends = blender>=2.80
diff --git a/PKGBUILD b/PKGBUILD
index bda32bf89794..2af9ccb9105e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,14 +7,21 @@ pkgver=2.2
 #_rel="rc1"
 [ -n "${_rel}" ] && _pkgver=${pkgver}${_rel} && pkgver+=".${_rel}" || _pkgver=${pkgver}
 epoch=2
-pkgrel=1
+pkgrel=2
 pkgdesc="LuxCoreRender exporter plugin for Blender"
 arch=('any')
 url="https://luxcorerender.org/"
 license=('GPL')
 conflicts=(luxblend25 luxblend25-hg)
-source=("https://github.com/LuxCoreRender/BlendLuxCore/archive/blendluxcore_v${_pkgver}.tar.gz")
-sha256sums=('92c2a1669f23bca58b3bef324676d1849775d996c96b8c35af1a97a0fed4e27e')
+source=("https://github.com/LuxCoreRender/BlendLuxCore/archive/blendluxcore_v${_pkgver}.tar.gz"
+        "denoise.patch")
+sha256sums=('92c2a1669f23bca58b3bef324676d1849775d996c96b8c35af1a97a0fed4e27e'
+            '63103ec3bf77c502a54f6f74cad020a448c9641be90202944c46bda0a1ff8bfe')
+
+prepare() {
+  cd "${srcdir}/BlendLuxCore-blendluxcore_v${_pkgver}"
+  patch -Np1 -i "${srcdir}/denoise.patch"
+}
 
 package() {
   depends=('blender>=2.80' 'luxcorerender>2:2.2')
diff --git a/denoise.patch b/denoise.patch
new file mode 100644
index 000000000000..4c74a4a1690e
--- /dev/null
+++ b/denoise.patch
@@ -0,0 +1,21 @@
+diff -Naur BlendLuxCore-blendluxcore_v2.2/draw/viewport.py BlendLuxCore-blendluxcore_v2.2-patch/draw/viewport.py
+--- BlendLuxCore-blendluxcore_v2.2/draw/viewport.py	2019-09-30 12:40:01.000000000 +0200
++++ BlendLuxCore-blendluxcore_v2.2-patch/draw/viewport.py	2019-11-28 08:19:28.433741235 +0100
+@@ -8,6 +8,7 @@
+ from ..bin import pyluxcore
+ from .. import utils
+ from ..utils import pfm
++from shutil import which
+ 
+ NULL = 0
+ 
+@@ -72,8 +73,7 @@
+         self._albedo_file_path = self._make_denoiser_filepath("albedo")
+         self._normal_file_path = self._make_denoiser_filepath("normal")
+         self._denoised_file_path = self._make_denoiser_filepath("denoised")
+-        current_dir = os.path.dirname(os.path.realpath(__file__))
+-        self._denoiser_path = os.path.join(os.path.dirname(current_dir), "bin", "denoise")
++        self._denoiser_path = which('denoise')
+         if platform.system() == "Windows":
+             self._denoiser_path += ".exe"
+         self._denoiser_process = None