diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2019-01-31 01:43:43 -0500 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2019-02-02 09:07:55 -0500 |
commit | 424bd40d884f503692d2bcab945375ecae07542e (patch) | |
tree | 44ce2ea92d49c8f1e583cc296cf1780ea77ab750 /libre/blender/python37.patch | |
parent | 2c38f92da499fb18e22123f76b3158c46e3247cc (diff) | |
download | abslibre-424bd40d884f503692d2bcab945375ecae07542e.tar.gz abslibre-424bd40d884f503692d2bcab945375ecae07542e.tar.bz2 abslibre-424bd40d884f503692d2bcab945375ecae07542e.zip |
[blender]: upgrade to git-2c0c1f494dcfadb3c01d23e2348e28bc8864e9f3
Diffstat (limited to 'libre/blender/python37.patch')
-rw-r--r-- | libre/blender/python37.patch | 40 |
1 files changed, 0 insertions, 40 deletions
diff --git a/libre/blender/python37.patch b/libre/blender/python37.patch deleted file mode 100644 index b3ce220b0..000000000 --- a/libre/blender/python37.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f Mon Sep 17 00:00:00 2001 -From: Campbell Barton <ideasman42@gmail.com> -Date: Thu, 12 Jul 2018 08:28:06 +0200 -Subject: [PATCH] Fix PyRNA class registration w/ Python 3.7 - -In Python3.7 this now raises an error. ---- - source/blender/python/intern/bpy_rna.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c -index 9052b6f580a..80b0aa7a51b 100644 ---- a/source/blender/python/intern/bpy_rna.c -+++ b/source/blender/python/intern/bpy_rna.c -@@ -7577,10 +7577,12 @@ static int bpy_class_validate_recursive(PointerRNA *dummyptr, StructRNA *srna, v - if (!(flag & PROP_REGISTER)) - continue; - -+ /* TODO(campbell): Use Python3.7x _PyObject_LookupAttr(), also in the macro below. */ - identifier = RNA_property_identifier(prop); - item = PyObject_GetAttrString(py_class, identifier); - - if (item == NULL) { -+ PyErr_Clear(); - /* Sneaky workaround to use the class name as the bl_idname */ - - #define BPY_REPLACEMENT_STRING(rna_attr, py_attr) \ -@@ -7596,6 +7598,9 @@ static int bpy_class_validate_recursive(PointerRNA *dummyptr, StructRNA *srna, v - } \ - Py_DECREF(item); \ - } \ -+ else { \ -+ PyErr_Clear(); \ -+ } \ - } /* intentionally allow else here */ - - if (false) {} /* needed for macro */ --- -2.18.0 - |