3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-24 09:11:23 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge remote-tracking branch 'origin/ys_undo_redo' into vb_undo_redo

Browse source
This commit is contained in:
bubnikv 2019-07-04 20:15:50 +02:00
commit 1070991149
8 changed files with 89 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libslic3r/Model.hpp
View file

@ -508,8 +508,8 @@ private:
ModelVolume(ModelObject *object, const ModelVolume &other, const TriangleMesh &&mesh) :
name(other.name), m_mesh(new TriangleMesh(std::move(mesh))), config(other.config), m_type(other.m_type), object(object), m_transformation(other.m_transformation)
{
assert(this->id().valid()); assert(this->config.id().valid()); assert(this->id() != this->config.id());
assert(this->id() == other.id() && this->config.id() == other.config.id());
// assert(this->id().valid()); assert(this->config.id().valid()); assert(this->id() != this->config.id());
// assert(this->id() == other.id() && this->config.id() == other.config.id());
this->set_material_id(other.material_id());
this->config.set_new_unique_id();
if (mesh.stl.stats.number_of_facets > 1)