archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Partial revert of rev 23723

Browse Source 
BRECHT, CHECK THIS

The change made it return RNA python properties with null data pointer instead of None.

That would make the particles and physics properties crash like this:

1. A valid property instead of None makes is seem like smoke (or other) modifier data is in context when it is Null.
2. UI code would try to access RNA properties of the (Null) modifier, which would crash
This commit is contained in:
Martin Poirier
2009-10-09 01:34:46 +00:00
parent dadd8466d5
commit 1b6a09847a
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/python/intern/bpy_rna.c
View File

@@ -433,7 +433,7 @@ PyObject * pyrna_prop_to_py(PointerRNA *ptr, PropertyRNA *prop)
{
PointerRNA newptr;
newptr= RNA_property_pointer_get(ptr, prop);
if (newptr.type) {
if (newptr.data) {
ret = pyrna_struct_CreatePyObject(&newptr);
} else {
ret = Py_None;
@@ -1297,7 +1297,7 @@ static PyObject *pyrna_struct_getattro( BPy_StructRNA * self, PyObject *pyname )
CTX_data_get(self->ptr.data, name, &newptr, &newlb);
if (newptr.type) {
if (newptr.data) {
ret = pyrna_struct_CreatePyObject(&newptr);
}
else if (newlb.first) {