summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD21
-rw-r--r--python3.7.patch13
-rw-r--r--stl_export_iter.patch13
4 files changed, 44 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4547f30e134..9af138eb4c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -42,13 +42,17 @@ pkgbase = blender-2.7
source = blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git
source = blender-2.7.desktop
source = SelectCudaComputeArch.patch
+ source = stl_export_iter.patch
+ source = python3.7.patch
md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
md5sums = SKIP
md5sums = cef7a015d4ab57592b424ea06c8b576e
- md5sums = 2f1b08655352e70c7c74d4957d481dc8
+ md5sums = 8b22ddc71fb3a766029dc460bba49a0a
+ md5sums = f21e971208232d8d78d1a4c41013a101
+ md5sums = e0d4a0a876bcf48969613912f3463c01
pkgname = blender-2.7
diff --git a/PKGBUILD b/PKGBUILD
index 863299c665b..08cd99d32be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -27,13 +27,15 @@ install=blender.install
# the path in .gitmodules.
# More info:
# http://wiki.blender.org/index.php/Dev:Doc/Tools/Git
-source=("git://git.blender.org/blender.git${_fragment}" \
- 'blender-addons.git::git://git.blender.org/blender-addons.git' \
- 'blender-addons-contrib.git::git://git.blender.org/blender-addons-contrib.git' \
- 'blender-translations.git::git://git.blender.org/blender-translations.git' \
- 'blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git' \
- blender-2.7.desktop \
- SelectCudaComputeArch.patch \
+source=("git://git.blender.org/blender.git${_fragment}"
+ 'blender-addons.git::git://git.blender.org/blender-addons.git'
+ 'blender-addons-contrib.git::git://git.blender.org/blender-addons-contrib.git'
+ 'blender-translations.git::git://git.blender.org/blender-translations.git'
+ 'blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git'
+ blender-2.7.desktop
+ SelectCudaComputeArch.patch
+ stl_export_iter.patch
+ python3.7.patch
)
md5sums=('SKIP'
'SKIP'
@@ -41,7 +43,9 @@ md5sums=('SKIP'
'SKIP'
'SKIP'
'cef7a015d4ab57592b424ea06c8b576e'
- '8b22ddc71fb3a766029dc460bba49a0a')
+ '8b22ddc71fb3a766029dc460bba49a0a'
+ 'f21e971208232d8d78d1a4c41013a101'
+ 'e0d4a0a876bcf48969613912f3463c01')
pkgver() {
cd "$srcdir/blender"
@@ -55,6 +59,7 @@ prepare() {
if [ -z "$_cuda_capability" ] && grep -q nvidia <(lsmod); then
git apply -v ${srcdir}/SelectCudaComputeArch.patch
fi
+ git apply -v ${srcdir}/{python3.7,stl_export_iter}.patch
}
build() {
diff --git a/python3.7.patch b/python3.7.patch
new file mode 100644
index 00000000000..1b93964aeca
--- /dev/null
+++ b/python3.7.patch
@@ -0,0 +1,13 @@
+diff --git a/object_facemap_auto/auto_fmap_widgets.py b/object_facemap_auto/auto_fmap_widgets.py
+index 5b26f75..646e844 100644
+--- a/release/scripts/addons_contrib/object_facemap_auto/auto_fmap_widgets.py
++++ b/release/scripts/addons_contrib/object_facemap_auto/auto_fmap_widgets.py
+@@ -324,7 +324,7 @@ class AutoFaceMapWidgetGroup(ManipulatorGroup):
+
+ # foo;bar=baz;bonzo=bingo --> {"bar": baz", "bonzo": bingo}
+ mpr.fmap_target_rules = dict(
+- item.partition("=")[::2] for item in fmap_rules,
++ item.partition("=")[::2] for item in fmap_rules
+ )
+
+ # XXX, we might want to have some way to extract a 'center' from a face-map
diff --git a/stl_export_iter.patch b/stl_export_iter.patch
new file mode 100644
index 00000000000..edf985e88ca
--- /dev/null
+++ b/stl_export_iter.patch
@@ -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)