3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

New selection -> Disabled instances synchronization

Browse source
This commit is contained in:
Enrico Turri 2018-10-31 09:39:43 +01:00
parent 503166a6a4
commit da4903a37f
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libslic3r/Technologies.hpp
View file

@ -19,6 +19,7 @@
#define ENABLE_USE_UNIQUE_GLCONTEXT (1 && ENABLE_1_42_0) #define ENABLE_USE_UNIQUE_GLCONTEXT (1 && ENABLE_1_42_0)
// New selections // New selections
#define ENABLE_EXTENDED_SELECTION (1 && ENABLE_1_42_0) #define ENABLE_EXTENDED_SELECTION (1 && ENABLE_1_42_0)
#define DISABLE_INSTANCES_SYNCH (1 && ENABLE_EXTENDED_SELECTION)
// Add mirror components along the three axes in ModelInstance and GLVolume // Add mirror components along the three axes in ModelInstance and GLVolume
#define ENABLE_MIRROR (1 && ENABLE_1_42_0) #define ENABLE_MIRROR (1 && ENABLE_1_42_0)
// Modified camera target behavior // Modified camera target behavior

12
src/slic3r/GUI/GLCanvas3D.cpp
View file

@ -1426,8 +1426,10 @@ void GLCanvas3D::Selection::rotate(const Vec3d& rotation)
} }
} }
#if !DISABLE_INSTANCES_SYNCH
if (m_mode == Instance) if (m_mode == Instance)
_synchronize_unselected_instances(); _synchronize_unselected_instances();
#endif // !DISABLE_INSTANCES_SYNCH
m_bounding_box_dirty = true; m_bounding_box_dirty = true;
} }
@ -1453,8 +1455,10 @@ void GLCanvas3D::Selection::scale(const Vec3d& scale)
} }
} }
#if !DISABLE_INSTANCES_SYNCH
if (m_mode == Instance) if (m_mode == Instance)
_synchronize_unselected_instances(); _synchronize_unselected_instances();
#endif // !DISABLE_INSTANCES_SYNCH
m_bounding_box_dirty = true; m_bounding_box_dirty = true;
} }
@ -1471,8 +1475,10 @@ void GLCanvas3D::Selection::mirror(Axis axis)
(*m_volumes)[i]->set_mirror(axis, -(*m_volumes)[i]->get_mirror(axis)); (*m_volumes)[i]->set_mirror(axis, -(*m_volumes)[i]->get_mirror(axis));
} }
#if !DISABLE_INSTANCES_SYNCH
if (m_mode == Instance) if (m_mode == Instance)
_synchronize_unselected_instances(); _synchronize_unselected_instances();
#endif // !DISABLE_INSTANCES_SYNCH
m_bounding_box_dirty = true; m_bounding_box_dirty = true;
} }
@ -1498,8 +1504,7 @@ void GLCanvas3D::Selection::translate(unsigned int object_idx, const Vec3d& disp
if (done.size() == m_volumes->size()) if (done.size() == m_volumes->size())
break; break;
const GLVolume* volume = (*m_volumes)[i]; int object_idx = (*m_volumes)[i]->object_idx();
int object_idx = volume->object_idx();
if (object_idx >= 1000) if (object_idx >= 1000)
continue; continue;
@ -1544,8 +1549,7 @@ void GLCanvas3D::Selection::translate(unsigned int object_idx, unsigned int inst
if (done.size() == m_volumes->size()) if (done.size() == m_volumes->size())
break; break;
const GLVolume* volume = (*m_volumes)[i]; int object_idx = (*m_volumes)[i]->object_idx();
int object_idx = volume->object_idx();
if (object_idx >= 1000) if (object_idx >= 1000)
continue; continue;