Tech ENABLE_GIZMO_MEASURE_WORLD_COORDINATES set as default

Fixed conflicts during rebase to master
This commit is contained in:
enricoturri1966 2022-11-16 08:53:02 +01:00
parent 5382f4077a
commit 075c241906
7 changed files with 323 additions and 637 deletions

View file

@ -613,7 +613,6 @@ bool Selection::contains_any_volume(const std::vector<unsigned int>& volume_idxs
return false;
}
#if ENABLE_GIZMO_MEASURE_WORLD_COORDINATES
bool Selection::contains_sinking_volumes(bool ignore_modifiers) const
{
for (const GLVolume* v : *m_volumes) {
@ -624,7 +623,6 @@ bool Selection::contains_sinking_volumes(bool ignore_modifiers) const
}
return false;
}
#endif // ENABLE_GIZMO_MEASURE_WORLD_COORDINATES
bool Selection::matches(const std::vector<unsigned int>& volume_idxs) const
{