Fixed build and warnings on Linux and Mac

Fixed conflicts during rebase with master
This commit is contained in:
enricoturri1966 2022-05-18 12:40:38 +02:00
parent e3d648c802
commit 3b3edb5a97
3 changed files with 3 additions and 2 deletions

View file

@ -1413,7 +1413,9 @@ void ObjectManipulation::on_change(const std::string& opt_key, int axis, double
void ObjectManipulation::set_uniform_scaling(const bool use_uniform_scale)
{
#if !ENABLE_TRANSFORMATIONS_BY_MATRICES
const Selection &selection = wxGetApp().plater()->canvas3D()->get_selection();
#endif // !ENABLE_TRANSFORMATIONS_BY_MATRICES
#if ENABLE_WORLD_COORDINATE
if (!use_uniform_scale) {
#if !ENABLE_TRANSFORMATIONS_BY_MATRICES