Merged changes in the trunk up to revision 28600.

2010-05-05 22:57:58 +00:00
parent a1d0913afe 09e6190b49
commit 8a20433f0f
118 changed files with 9245 additions and 7141 deletions
--- a/source/blender/python/intern/bpy_rna.c
+++ b/source/blender/python/intern/bpy_rna.c
@@ -2335,6 +2335,10 @@ static PyObject *pyrna_struct_getattro( BPy_StructRNA *self, PyObject *pyname )
 						}
 					}
 					break;
+				default:
+					/* should never happen */
+					PyErr_Format(PyExc_AttributeError, "bpy_struct: Context type invalid %d, can't get \"%.200s\" from context", newtype, name);
+					ret= NULL;
 				}
 			}
 			else if (done==-1) { /* found but not set */