[arch-commits] Commit in blender/trunk (PKGBUILD stl_export_iter.patch)

[Sven-Hendrik Haase]

    Date: Sunday, October 7, 2018 @ 21:41:13
  Author: svenstaro
Revision: 391052

upgpkg: blender 17:2.79.b.git3.32432d91-10

Try to fix FS#60249

Added:
  blender/trunk/stl_export_iter.patch
Modified:
  blender/trunk/PKGBUILD

-----------------------+
 PKGBUILD              |    7 +++++--
 stl_export_iter.patch |   13 +++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-10-07 21:33:46 UTC (rev 391051)
+++ PKGBUILD	2018-10-07 21:41:13 UTC (rev 391052)
@@ -16,7 +16,7 @@
 pkgname=blender
 pkgver=2.79.b
 [[ -n $_gitcommit ]] && pkgver=${pkgver}.git3.${_gitcommit:0:8}
-pkgrel=9
+pkgrel=10
 epoch=17
 pkgdesc="A fully integrated 3D graphics creation suite"
 arch=('x86_64')
@@ -39,7 +39,8 @@
         ffmpeg4.0.patch
         tree_hpp.patch
         util_sseb.patch
-        openvdb3-abi.patch)
+        openvdb3-abi.patch
+        stl_export_iter.patch)
 if [[ -n $_gittag ]]; then
     source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
 elif [[ -n $_gitcommit ]]; then
@@ -55,6 +56,7 @@
          'feea89510de171946c41c6208461f453'
          '53da216adbc2a9d555a59c15b8f0ef08'
          '3f9613fcb7ea61214982272e9c20a294'
+         'f21e971208232d8d78d1a4c41013a101'
          'SKIP')
 
 prepare() {
@@ -73,6 +75,7 @@
   patch -Np1 -i "$srcdir"/tree_hpp.patch
   patch -Np1 -i "$srcdir"/util_sseb.patch
   patch -Np1 -i "$srcdir"/openvdb3-abi.patch
+  patch -Np1 -i "$srcdir"/stl_export_iter.patch
 }
 
 build() {

Added: stl_export_iter.patch
===================================================================
--- stl_export_iter.patch	                        (rev 0)
+++ stl_export_iter.patch	2018-10-07 21:41:13 UTC (rev 391052)
@@ -0,0 +1,13 @@
+diff --git a/release/scripts/addons/io_mesh_stl/blender_utils.py b/release/scripts/addons/io_mesh_stl/blender_utils.py
+index 864335ab..c74853db 100644
+--- a/release/scripts/addons/io_mesh_stl/blender_utils.py
++++ b/release/scripts/addons/io_mesh_stl/blender_utils.py
+@@ -86,7 +86,7 @@ def faces_from_mesh(ob, global_matrix, use_mesh_modifiers=False, triangulate=Tru
+     try:
+         mesh = ob.to_mesh(bpy.context.scene, use_mesh_modifiers, "PREVIEW")
+     except RuntimeError:
+-        raise StopIteration
++        return
+ 
+     mat = global_matrix * ob.matrix_world
+     mesh.transform(mat)