From 7bd73f562a906558abd0cd5cfd17ebc7a6068898 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcelo=20Demian=20G=C3=B3mez?= Date: Sat, 6 Jun 2020 10:15:54 +0200 Subject: [PATCH] Fix T77473: Removing GPencil vertex group mix data When removing a vertex group from a Grease Pencil object, if the vertex group is not the last one that was added, the information for the remaining groups weights gets mixed up. Minor edit of the patch for clang format. Differential Revision: https://developer.blender.org/D7943 --- source/blender/blenkernel/intern/gpencil.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index 122cc656bc2..75cd16f13a0 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -1453,13 +1453,11 @@ void BKE_gpencil_vgroup_remove(Object *ob, bDeformGroup *defgroup) if (dw != NULL) { BKE_defvert_remove_group(dvert, dw); } - else { - /* Reorganize weights for other groups after deleted one. */ - for (int g = 0; g < totgrp; g++) { - dw = BKE_defvert_find_index(dvert, g); - if ((dw != NULL) && (dw->def_nr > def_nr)) { - dw->def_nr--; - } + /* Reorganize weights for other groups after deleted one. */ + for (int g = 0; g < totgrp; g++) { + dw = BKE_defvert_find_index(dvert, g); + if ((dw != NULL) && (dw->def_nr > def_nr)) { + dw->def_nr--; } } }