blender
/
blender
137
411
Fork 593
Code Issues 6.3k Pull Requests 768 Projects 19 Wiki Activity

Merge branch 'blender-v2.93-release'

This commit is contained in:
Philipp Oeser 2021-05-26 09:55:47 +02:00
parent c0bb7d9cb7 ebde6e1852
commit ff35332610
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/geometry/geometry_attributes.c
View File

@ -52,12 +52,16 @@ static const EnumPropertyItem *geometry_attribute_domain_itemf(bContext *C,
PropertyRNA *UNUSED(prop),
bool *r_free)
{
Object *ob = ED_object_context(C);
if (ob != NULL) {
return rna_enum_attribute_domain_itemf(ob->data, r_free);
if (C == NULL) {
return DummyRNA_NULL_items;
}
return DummyRNA_NULL_items;
Object *ob = ED_object_context(C);
if (ob == NULL) {
return DummyRNA_NULL_items;
}
return rna_enum_attribute_domain_itemf(ob->data, r_free);
}
static int geometry_attribute_add_exec(bContext *C, wmOperator *op)

4
source/blender/editors/object/object_vgroup.c
View File

@ -3985,6 +3985,10 @@ static const EnumPropertyItem *vgroup_itemf(bContext *C,
PropertyRNA *UNUSED(prop),
bool *r_free)
{
if (C == NULL) {
return DummyRNA_NULL_items;
}
Object *ob = ED_object_context(C);
EnumPropertyItem tmp = {0, "", 0, "", ""};
EnumPropertyItem *item = NULL;