[Bf-blender-cvs] [17f37b43f1f] master: Cleanup: Remove unused face customdata for merging meshes
Hans Goudey
noreply at git.blender.org
Thu Sep 8 16:55:31 CEST 2022
Commit: 17f37b43f1f4aa2d2111a88e10dd0aaab659f203
Author: Hans Goudey
Date: Thu Sep 8 09:50:50 2022 -0500
Branches: master
https://developer.blender.org/rB17f37b43f1f4aa2d2111a88e10dd0aaab659f203
Cleanup: Remove unused face customdata for merging meshes
===================================================================
M source/blender/editors/mesh/meshtools.cc
===================================================================
diff --git a/source/blender/editors/mesh/meshtools.cc b/source/blender/editors/mesh/meshtools.cc
index 58702d9e966..9d1ea499e42 100644
--- a/source/blender/editors/mesh/meshtools.cc
+++ b/source/blender/editors/mesh/meshtools.cc
@@ -347,7 +347,7 @@ int ED_mesh_join_objects_exec(bContext *C, wmOperator *op)
int totloop = 0, totpoly = 0, vertofs, *matmap = nullptr;
int i, haskey = 0, edgeofs, loopofs, polyofs;
bool ok = false, join_parent = false;
- CustomData vdata, edata, fdata, ldata, pdata;
+ CustomData vdata, edata, ldata, pdata;
if (ob->mode & OB_MODE_EDIT) {
BKE_report(op->reports, RPT_WARNING, "Cannot join while in edit mode");
@@ -586,7 +586,6 @@ int ED_mesh_join_objects_exec(bContext *C, wmOperator *op)
/* setup new data for destination mesh */
CustomData_reset(&vdata);
CustomData_reset(&edata);
- CustomData_reset(&fdata);
CustomData_reset(&ldata);
CustomData_reset(&pdata);
More information about the Bf-blender-cvs
mailing list