#2 Apply workaround for "no text in GUI" bug (#1631922)
Merged 2 years ago by luya. Opened 2 years ago by pviktori.
rpms/ pviktori/blender workaround  into  f29

@@ -0,0 +1,23 @@ 

+ diff -r -U3 blender-2.79b-orig/source/blender/python/intern/bpy_rna.c blender-2.79b/source/blender/python/intern/bpy_rna.c

+ --- blender-2.79b-orig/source/blender/python/intern/bpy_rna.c	2018-03-23 16:22:25.000000000 +0100

+ +++ blender-2.79b/source/blender/python/intern/bpy_rna.c	2018-11-02 14:15:34.311361383 +0100

+ @@ -7389,6 +7389,7 @@

+  		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)                         \

+ @@ -7418,8 +7419,9 @@

+  				             class_type, py_class_name, identifier);

+  				return -1;

+  			}

+ -

+ -			PyErr_Clear();

+ +			else {

+ +				PyErr_Clear();

+ +			}

+  		}

+  		else {

+  			if (pyrna_py_to_prop(dummyptr, prop, NULL, item, "validating class:") != 0) {

file modified
+6 -1
@@ -22,7 +22,7 @@ 

  Name:       blender

  Epoch:      1

  Version:    %{blender_api}

- Release:    7%{?dist}

+ Release:    8%{?dist}

  

  Summary:    3D modeling, animation, rendering and post-production

  License:    GPLv2
@@ -47,6 +47,8 @@ 

  Patch7:     blender-2.79-openjpeg2.patch

  Patch8:     util_sseb.patch

  Patch9:     tree_hpp.patch

+ # Backported from https://developer.blender.org/rB1db47a2ccd1e68994bf8140eba6cc2a26a2bc91f

+ Patch10:     %{name}-2.79-python37.patch

  

  # Development stuff

  BuildRequires:  boost-devel
@@ -304,6 +306,9 @@ 

  %{_fontbasedir}/%{name}/

  

  %changelog

+ * Fri Nov 02 2018 Petr Viktorin <pviktori@redhat.com> - 1:2.79b-8

+ - Apply workaround for "no text in GUI" bug (#1631922)

+ 

  * Thu Aug 23 2018 Nicolas Chauvet <kwizart@gmail.com> - 1:2.79b-7

  - Rebuilt for glew-2.1.0

  

no initial comment

Pull-Request has been merged by luya

2 years ago