Merge branch 'stabilization/2106' into Helios_TransformImporterFixV2_stabilization_2106

Code/Tools/AssetBundler/tests/DummyProject/project.json

@@ -10,5 +10,6 @@
         "version_number" : 1,
         "version_name" : "1.0.0.0",
         "orientation" : "landscape"
-    }
+    },
+    "engine" : "o3de"
 }

Code/Tools/AssetProcessor/native/ui/SourceAssetTreeModel.cpp

@@ -63,7 +63,7 @@ namespace AssetProcessor
         }
 
 
-        AZ::IO::Path fullPath = AZ::IO::Path(scanFolder.m_scanFolder, AZ::IO::PosixPathSeparator) / source.m_sourceName;
+        AZ::IO::Path fullPath = AZ::IO::Path(scanFolder.m_scanFolder) / source.m_sourceName;
 
         // It's common for Open 3D Engine game projects and scan folders to be in a subfolder
         // of the engine install. To improve readability of the source files, strip out
@@ -74,7 +74,7 @@ namespace AssetProcessor
         }
         if (m_assetRootSet)
         {
-            AzFramework::StringFunc::Replace(fullPath.Native(), m_assetRoot.absolutePath().toUtf8(), "");
+            fullPath = fullPath.LexicallyProximate(m_assetRoot.absolutePath().toUtf8().constData());
         }
 
         if (fullPath.empty())
@@ -88,11 +88,12 @@ namespace AssetProcessor
         QModelIndex newIndicesStart;
 
         AssetTreeItem* parentItem = m_root.get();
-        AZ::IO::Path currentFullFolderPath;
-        const AZ::IO::PathView filename = fullPath.Filename();
-        const AZ::IO::PathView fullPathWithoutFilename = fullPath.RemoveFilename();
+        // Use posix path separator for each child item
+        AZ::IO::Path currentFullFolderPath(AZ::IO::PosixPathSeparator);
+        const AZ::IO::FixedMaxPath filename = fullPath.Filename();
+        fullPath.RemoveFilename();
         AZStd::fixed_string<AZ::IO::MaxPathLength> currentPath;
-        for (auto pathIt = fullPathWithoutFilename.begin(); pathIt != fullPathWithoutFilename.end(); ++pathIt)
+        for (auto pathIt = fullPath.begin(); pathIt != fullPath.end(); ++pathIt)
         {
             currentPath = pathIt->FixedMaxPathString();
             currentFullFolderPath /= currentPath;

Code/Tools/ProjectManager/Source/CreateProjectCtrl.cpp

@@ -77,6 +77,7 @@ namespace O3DE::ProjectManager
         return ProjectManagerScreen::CreateProject;
     }
 
+    // Called when pressing "Create New Project"
     void CreateProjectCtrl::NotifyCurrentScreen()
     {
         ScreenWidget* currentScreen = reinterpret_cast<ScreenWidget*>(m_stack->currentWidget());
@@ -84,6 +85,11 @@ namespace O3DE::ProjectManager
         {
             currentScreen->NotifyCurrentScreen();
         }
+
+        // Gather the gems from the project template. When we will have multiple project templates, we need to re-gather them
+        // on changing the template and let the user know that any further changes on top of the template will be lost.
+        QString projectTemplatePath = m_newProjectSettingsScreen->GetProjectTemplatePath();
+        m_gemCatalogScreen->ReinitForProject(projectTemplatePath + "/Template", /*isNewProject=*/true);
     }
 
     void CreateProjectCtrl::HandleBackButton()
@@ -151,9 +157,6 @@ namespace O3DE::ProjectManager
             {
                 m_stack->setCurrentIndex(m_stack->currentIndex() + 1);
 
-                QString projectTemplatePath = m_newProjectSettingsScreen->GetProjectTemplatePath();
-                m_gemCatalogScreen->ReinitForProject(projectTemplatePath + "/Template", /*isNewProject=*/true);
-
                 Update();
             }
             else

Code/Tools/ProjectManager/Source/UpdateProjectCtrl.cpp

@@ -89,17 +89,18 @@ namespace O3DE::ProjectManager
         return ProjectManagerScreen::UpdateProject;
     }
 
+    // Called when pressing "Edit Project Settings..."
     void UpdateProjectCtrl::NotifyCurrentScreen()
     {
         m_stack->setCurrentIndex(ScreenOrder::Settings);
         Update();
+
+        // Gather the available gems that will be shown in the gem catalog.
+        m_gemCatalogScreen->ReinitForProject(m_projectInfo.m_path, /*isNewProject=*/false);
     }
 
     void UpdateProjectCtrl::HandleGemsButton()
     {
-        // The next page is the gem catalog. Gather the available gems that will be shown in the gem catalog.
-        m_gemCatalogScreen->ReinitForProject(m_projectInfo.m_path, /*isNewProject=*/false);
-
         m_stack->setCurrentWidget(m_gemCatalogScreen);
         Update();
     }