[Bf-blender-cvs] [7bea1416b6a] master: Transform: Fix reinitialization of custom data correction
Germano Cavalcante
noreply at git.blender.org
Fri Feb 21 14:05:00 CET 2020
Commit: 7bea1416b6a6622fc23679d65f369385de5a621f
Author: Germano Cavalcante
Date: Fri Feb 21 10:03:30 2020 -0300
Branches: master
https://developer.blender.org/rB7bea1416b6a6622fc23679d65f369385de5a621f
Transform: Fix reinitialization of custom data correction
===================================================================
M source/blender/editors/transform/transform_convert_mesh.c
===================================================================
diff --git a/source/blender/editors/transform/transform_convert_mesh.c b/source/blender/editors/transform/transform_convert_mesh.c
index 5d3d1d936a2..3d9a04c060b 100644
--- a/source/blender/editors/transform/transform_convert_mesh.c
+++ b/source/blender/editors/transform/transform_convert_mesh.c
@@ -1030,7 +1030,15 @@ static void create_trans_vert_customdata_layer(BMVert *v,
void trans_mesh_customdata_correction_init(TransInfo *t)
{
FOREACH_TRANS_DATA_CONTAINER (t, tc) {
- BLI_assert(tc->custom.type.data == NULL);
+ if (tc->custom.type.data) {
+ if (tc->custom.type.free_cb == trans_mesh_customdata_free_cb) {
+ /* Custom data correction has initiated before. */
+ continue;
+ }
+ else {
+ BLI_assert(false);
+ }
+ }
int i;
BMEditMesh *em = BKE_editmesh_from_object(tc->obedit);
More information about the Bf-blender-cvs
mailing list