[blender] Minor upstream bugfix update
Jochen Schmitt
s4504kr at fedoraproject.org
Fri Jun 14 14:40:26 UTC 2013
commit d26c77a3364229ee046d0a69f9a016937d273de9
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Fri Jun 14 16:40:06 2013 +0200
Minor upstream bugfix update
blender-2.67a-rna.patch | 15 ---------------
blender-2.67b-rna.patch | 23 +++++++++++++++++++++++
blender.spec | 4 ++--
3 files changed, 25 insertions(+), 17 deletions(-)
---
diff --git a/blender-2.67b-rna.patch b/blender-2.67b-rna.patch
new file mode 100644
index 0000000..9915720
--- /dev/null
+++ b/blender-2.67b-rna.patch
@@ -0,0 +1,23 @@
+diff -up blender-2.67b/source/blender/makesrna/intern/rna_access.c.rna blender-2.67b/source/blender/makesrna/intern/rna_access.c
+--- blender-2.67b/source/blender/makesrna/intern/rna_access.c.rna 2013-05-16 12:43:18.000000000 +0200
++++ blender-2.67b/source/blender/makesrna/intern/rna_access.c 2013-06-14 16:35:39.263926932 +0200
+@@ -1273,13 +1273,15 @@ void RNA_property_enum_items_gettexted(b
+ int totitem = 0;
+
+ /* count */
+- for (i = 0; (*item)[i].identifier; i++)
+- totitem++;
++ if (*item)
++ for (i = 0; (*item)[i].identifier; i++)
++ totitem++;
+
+ nitem = MEM_callocN(sizeof(EnumPropertyItem) * (totitem + 1), "enum_items_gettexted");
+
+- for (i = 0; (*item)[i].identifier; i++)
+- nitem[i] = (*item)[i];
++ if (*item)
++ for (i = 0; (*item)[i].identifier; i++)
++ nitem[i] = (*item)[i];
+
+ *free = TRUE;
+ }
diff --git a/blender.spec b/blender.spec
index 0921990..da8b443 100644
--- a/blender.spec
+++ b/blender.spec
@@ -14,7 +14,7 @@
Name: blender
Epoch: 1
Version: %{blender_api}b
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: 3D modeling, animation, rendering and post-production
@@ -30,7 +30,7 @@ Source10: macros.blender
Patch1: blender-2.67-syspath.patch
Patch2: blender-2.67-droid.patch
-Patch3: blender-2.67a-rna.patch
+Patch3: blender-2.67b-rna.patch
Patch4: blender-2.67a-non-x86.patch
BuildRequires: desktop-file-utils
More information about the scm-commits
mailing list