blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 Projects 19 Wiki Activity

Fix issue in previous commit 

When `PointerRNA->data` was null, it was interpreted as being
`None` in Python. This caused the materials slots to not show
correctly in the ui.
This commit is contained in:
Jacques Lucke 2021-05-19 10:51:36 +02:00
parent 1a81d268a1
commit 02b80276b3
Notes: blender-bot 2023-02-13 17:50:16 +01:00 
Referenced by issue #90907, Change "Link materials to the object or the object's data" on multiple objects
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/makesrna/intern/rna_object.c
View File

@ -1257,7 +1257,8 @@ static int rna_Object_rotation_4d_editable(PointerRNA *ptr, int index)
static int rna_MaterialSlot_index(PointerRNA *ptr)
{
return POINTER_AS_INT(ptr->data);
/* There is an offset of one, so that `ptr->data` is not null. */
return POINTER_AS_INT(ptr->data) - 1;
}
static int rna_MaterialSlot_material_editable(PointerRNA *ptr, const char **UNUSED(r_info))
@ -1422,7 +1423,8 @@ static PointerRNA rna_Object_material_slots_get(CollectionPropertyIterator *iter
PointerRNA ptr;
RNA_pointer_create((ID *)iter->internal.count.ptr,
&RNA_MaterialSlot,
POINTER_FROM_INT(iter->internal.count.item),
/* Add one, so that `ptr->data` is not null. */
POINTER_FROM_INT(iter->internal.count.item + 1),
&ptr);
return ptr;
}