[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35813] trunk/blender/source/blender/ python/intern/bpy_rna.c: fix [#26616] Line of code make Blender crash

Campbell Barton ideasman42 at gmail.com
Sun Mar 27 08:56:37 CEST 2011


Revision: 35813
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35813
Author:   campbellbarton
Date:     2011-03-27 06:56:37 +0000 (Sun, 27 Mar 2011)
Log Message:
-----------
fix [#26616] Line of code make Blender crash

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2011-03-27 06:21:50 UTC (rev 35812)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2011-03-27 06:56:37 UTC (rev 35813)
@@ -3861,11 +3861,11 @@
 {
 	if(PyTuple_GET_SIZE(args) == 1) {
 		BPy_StructRNA *base= (BPy_StructRNA *)PyTuple_GET_ITEM(args, 0);
-		if (type == Py_TYPE(base)) {
+		if (Py_TYPE(base) == type) {
 			Py_INCREF(base);
 			return (PyObject *)base;
 		}
-		else if (PyType_IsSubtype(type, &pyrna_struct_Type)) {
+		else if (PyType_IsSubtype(Py_TYPE(base), &pyrna_struct_Type)) {
 			/* this almost never runs, only when using user defined subclasses of built-in object.
 			 * this isnt common since its NOT related to registerable subclasses. eg:
 




More information about the Bf-blender-cvs mailing list