From d2919556659dd8d1e481d9b2d77bf125e48db900 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 28 Feb 2023 10:03:05 +1100 Subject: [PATCH 1/2] Fix setting the active vertex color when assigning false Oversight in c517e4a5019102a24fe6b1ed54955788e97dfa81. --- source/blender/makesrna/intern/rna_mesh.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index f37df9019a3..dae8db1f81d 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1233,14 +1233,19 @@ static bool rna_mesh_color_active_get(PointerRNA *ptr) static void rna_mesh_color_active_render_set(PointerRNA *ptr, bool value) { + if (!value) { + return; + } Mesh *mesh = (Mesh *)ptr->owner_id; CustomDataLayer *layer = (CustomDataLayer *)ptr->data; - BKE_id_attributes_default_color_set(&mesh->id, layer->name); } static void rna_mesh_color_active_set(PointerRNA *ptr, bool value) { + if (!value) { + return; + } Mesh *mesh = (Mesh *)ptr->owner_id; CustomDataLayer *layer = (CustomDataLayer *)ptr->data; From de12ea7226759b3a32ff6f97aab2612eb8af7ac6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 28 Feb 2023 10:04:47 +1100 Subject: [PATCH 2/2] Cleanup: quiet unused warnings --- source/blender/makesrna/intern/rna_mesh.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c index dae8db1f81d..22b2fa7b7da 100644 --- a/source/blender/makesrna/intern/rna_mesh.c +++ b/source/blender/makesrna/intern/rna_mesh.c @@ -1160,7 +1160,7 @@ static PointerRNA rna_Mesh_vertex_color_active_get(PointerRNA *ptr) static void rna_Mesh_vertex_color_active_set(PointerRNA *ptr, const PointerRNA value, - ReportList *reports) + ReportList *UNUSED(reports)) { Mesh *mesh = (Mesh *)ptr->data; CustomDataLayer *layer = (CustomDataLayer *)value.data; @@ -1272,7 +1272,7 @@ static PointerRNA rna_Mesh_sculpt_vertex_color_active_get(PointerRNA *ptr) static void rna_Mesh_sculpt_vertex_color_active_set(PointerRNA *ptr, const PointerRNA value, - ReportList *reports) + ReportList *UNUSED(reports)) { Mesh *mesh = (Mesh *)ptr->data; CustomDataLayer *layer = (CustomDataLayer *)value.data;