Merge remote-tracking branch 'remotes/origin/master' into vb_print_regions

This commit is contained in:
Vojtech Bubnik 2021-06-01 11:19:53 +02:00
commit 73e0099c55
11 changed files with 49 additions and 16 deletions

View file

@ -5373,8 +5373,7 @@ bool Plater::export_3mf(const boost::filesystem::path& output_path)
void Plater::export_3mf(const boost::filesystem::path& output_path)
#endif // ENABLE_PROJECT_DIRTY_STATE
{
if (p->model.objects.empty()
|| canvas3D()->get_gizmos_manager().is_in_editing_mode(true))
if (p->model.objects.empty())
#if ENABLE_PROJECT_DIRTY_STATE
return false;
#else