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

RNA

Browse Source 
* PROP_NEVER_NULL is now a flag instead of a subtype.
* It works for function parameters too now, so setting
  this flag can help avoid NULL checks in the function.
* Renamed LocalLamp to PointLamp, making it consistent
  with the UI name.
* Set icons for the different lamp struct types.
This commit is contained in:
Brecht Van Lommel
2009-09-16 18:04:01 +00:00
parent 6b5ba70059
commit feff78170d
24 changed files with 208 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -628,17 +628,18 @@ int pyrna_py_to_prop(PointerRNA *ptr, PropertyRNA *prop, void *data, PyObject *v
case PROP_POINTER:
{
StructRNA *ptype= RNA_property_pointer_type(ptr, prop);
int flag = RNA_property_flag(prop);
if(!BPy_StructRNA_Check(value) && value != Py_None) {
PointerRNA tmp;
RNA_pointer_create(NULL, ptype, NULL, &tmp);
PyErr_Format(PyExc_TypeError, "%.200s expected a %.200s type", error_prefix, RNA_struct_identifier(tmp.type));
PyErr_Format(PyExc_TypeError, "%.200s expected a %.200s type", error_prefix, RNA_struct_identifier(ptype));
return -1;
} else if((flag & PROP_NEVER_NULL) && value == Py_None) {
PyErr_Format(PyExc_TypeError, "property can't be assigned a None value");
return -1;
} else {
BPy_StructRNA *param= (BPy_StructRNA*)value;
int raise_error= FALSE;
if(data) {
int flag = RNA_property_flag(prop);
if(flag & PROP_RNAPTR) {
if(value == Py_None)