Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 64304b4e27 - Show all commits

4
source/blender/makesrna/intern/rna_mesh.c
View File

@ -1279,7 +1279,7 @@ static PointerRNA rna_Mesh_sculpt_vertex_color_active_get(PointerRNA *ptr)
{ {
Mesh *mesh = (Mesh *)ptr->data; Mesh *mesh = (Mesh *)ptr->data;
CustomDataLayer *layer = BKE_id_attribute_search( CustomDataLayer *layer = BKE_id_attribute_search(
&mesh->id, mesh->active_color_attribute, CD_MASK_PROP_COLOR, ATTR_DOMAIN_POINT); &mesh->id, mesh->active_color_attribute, CD_MASK_PROP_COLOR, ATTR_DOMAIN_MASK_POINT);
return rna_pointer_inherit_refine(ptr, &RNA_MeshVertColorLayer, layer); return rna_pointer_inherit_refine(ptr, &RNA_MeshVertColorLayer, layer);
} }
@ -1301,7 +1301,7 @@ static int rna_Mesh_sculpt_vertex_color_active_index_get(PointerRNA *ptr)
{ {
Mesh *mesh = (Mesh *)ptr->data; Mesh *mesh = (Mesh *)ptr->data;
CustomDataLayer *layer = BKE_id_attribute_search( CustomDataLayer *layer = BKE_id_attribute_search(
&mesh->id, mesh->active_color_attribute, CD_MASK_PROP_COLOR, ATTR_DOMAIN_POINT); &mesh->id, mesh->active_color_attribute, CD_MASK_PROP_COLOR, ATTR_DOMAIN_MASK_POINT);
if (!layer) { if (!layer) {
return 0; return 0;
} }