Commit b278c19e authored by Jan Möbius's avatar Jan Möbius

Merge branch 'fix-duplication' into 'master'

Fix a bug where objects were added to the merged object twice.

See merge request !1
parents 6538b9b1 cf9866cd
......@@ -246,7 +246,6 @@ int MergePlugin::mergeObjects(const std::vector< BaseObjectData* > & _objects, Q
// Convert PolyMeshes to TriMeshes
convertMeshes(DATA_POLY_MESH,convertedIds,triMeshes);
*triMergePtr = *triMeshes[1];
mergeMeshes(triMeshes);
(triMeshes[0])->update_normals();
BaseObject* bo;
......@@ -257,7 +256,6 @@ int MergePlugin::mergeObjects(const std::vector< BaseObjectData* > & _objects, Q
// Convert TriMeshes to PolyMeshes
convertMeshes(DATA_TRIANGLE_MESH,convertedIds,polyMeshes);
*polyMergePtr = *polyMeshes[1];
mergeMeshes(polyMeshes);
(polyMeshes[0])->update_normals();
BaseObject* bo;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment