Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements

Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>
2021-08-06 10:32:38 -04:00
parent 6e59b1f519 053c4af66d
commit fd616fdcfb
425 changed files with 2145 additions and 1758 deletions
@@ -804,7 +804,7 @@ void SandboxIntegrationManager::SetupLayerContextMenu(QMenu* menu)

    menu->addSeparator();

-    const int selectedLayerCount = layersInSelection.size();
+    const int selectedLayerCount = static_cast<int>(layersInSelection.size());
    QString saveTitle = QObject::tr("Save layer");
    if(selectedLayerCount > 1)
    {