Merge branch 'stabilization/2106' of https://github.com/o3de/o3de into cgalvan/FixLCGraphNotOpeningOnEdit

Code/Editor/TrackView/SequenceBatchRenderDialog.cpp

@@ -13,6 +13,7 @@
 
 #include "SequenceBatchRenderDialog.h"
 
+#include <AzCore/Component/ComponentApplication.h>
 #include <AzFramework/Windowing/WindowBus.h>
 
 // Qt
@@ -1215,6 +1216,18 @@ void CSequenceBatchRenderDialog::OnKickIdleTimout()
         // All done with our custom OnKickIdle, restore editor idle.
         SetEnableEditorIdleProcessing(true);
     }
+
+    //When we disable the editor idle processing. system tick is no longer invoked.
+    //so we call it here to ensure rendering + other systems are updated.
+    if (!m_editorIdleProcessingEnabled)
+    {
+        AZ::ComponentApplication* componentApplication = nullptr;
+        AZ::ComponentApplicationBus::BroadcastResult(componentApplication, &AZ::ComponentApplicationRequests::GetApplication);
+        if (componentApplication)
+        {
+            componentApplication->TickSystem();
+        }
+    }
 }
 
 void CSequenceBatchRenderDialog::OnKickIdle()

Code/Tools/SerializeContextTools/SliceConverter.cpp

@@ -330,6 +330,7 @@ namespace AZ
             prefabPlaceholderEntities.clear();
             for (size_t curEntityIdx = 0; curEntityIdx < sliceEntities.size(); curEntityIdx++)
             {
+                UpdateCachedTransform(*(sliceEntities[curEntityIdx]));
                 sourceInstance->AddEntity(*(sliceEntities[curEntityIdx]), entityAliases[curEntityIdx]);
             }
 
@@ -631,12 +632,14 @@ namespace AZ
                             AZ_Assert(false, "Couldn't find nested instance %s", it->c_str());
                         }
                     }
+                    UpdateCachedTransform(*entity);
                     addingInstance->AddEntity(*entity, mappingStruct.m_entityAlias);
                     addedEntityList.emplace_back(entity, addingInstance);
                 }
                 else
                 {
                     AZ_Assert(false, "Failed to find entity alias.");
+                    UpdateCachedTransform(*entity);
                     nestedInstance->AddEntity(*entity);
                     addedEntityList.emplace_back(entity, nestedInstance.get());
                 }
@@ -781,6 +784,16 @@ namespace AZ
             }
         }
 
+        void SliceConverter::UpdateCachedTransform(const AZ::Entity& entity)
+        {
+            AzToolsFramework::Components::TransformComponent* transformComponent =
+                entity.FindComponent<AzToolsFramework::Components::TransformComponent>();
+            if (transformComponent)
+            {
+                transformComponent->UpdateCachedWorldTransform();
+            }
+        }
+
         void SliceConverter::PrintPrefab(AzToolsFramework::Prefab::TemplateId templateId)
         {
             auto prefabSystemComponentInterface = AZ::Interface<AzToolsFramework::Prefab::PrefabSystemComponentInterface>::Get();

Code/Tools/SerializeContextTools/SliceConverter.h

@@ -72,6 +72,7 @@ namespace AZ
             bool ConvertSliceInstance(
                 AZ::SliceComponent::SliceInstance& instance, AZ::Data::Asset<AZ::SliceAsset>& sliceAsset,
                 AzToolsFramework::Prefab::TemplateReference nestedTemplate, AzToolsFramework::Prefab::Instance* topLevelInstance);
+            void UpdateCachedTransform(const AZ::Entity& entity);
             void SetParentEntity(const AZ::Entity& entity, const AZ::EntityId& parentId, bool onlySetIfInvalid);
             void PrintPrefab(AzToolsFramework::Prefab::TemplateId templateId);
             bool SavePrefab(AZ::IO::PathView outputPath, AzToolsFramework::Prefab::TemplateId templateId);

Gems/AtomLyIntegration/CommonFeatures/Code/Source/CoreLights/LightDelegateBase.inl

@@ -134,6 +134,11 @@ namespace AZ
                     // For lights that get their transform from the shape bus, force an OnShapeChanged to update the transform.
                     OnShapeChanged(ShapeChangeReasons::TransformChanged);
                 }
+                else
+                {
+                    // OnShapeChanged() already calls this for delegates with a shape bus
+                    HandleShapeChanged();
+                }
             }
         }
 

Gems/Multiplayer/Code/Source/MultiplayerSystemComponent.cpp

@@ -735,7 +735,7 @@ namespace Multiplayer
 
     NetworkEntityHandle MultiplayerSystemComponent::SpawnDefaultPlayerPrefab()
     {
-        PrefabEntityId playerPrefabEntityId(AZ::Name(static_cast<AZ::CVarFixedString>(sv_defaultPlayerSpawnAsset).c_str()), 1);
+        PrefabEntityId playerPrefabEntityId(AZ::Name(static_cast<AZ::CVarFixedString>(sv_defaultPlayerSpawnAsset).c_str()));
         INetworkEntityManager::EntityList entityList = m_networkEntityManager.CreateEntitiesImmediate(playerPrefabEntityId, NetEntityRole::Authority, AZ::Transform::CreateIdentity());
 
         NetworkEntityHandle controlledEntity;

Gems/ScriptCanvas/Code/Include/ScriptCanvas/Execution/RuntimeComponent.cpp

@@ -60,7 +60,7 @@ namespace ScriptCanvas
 
     void RuntimeComponent::Execute()
     {
-        AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::ScriptCanvas, "RuntimeComponent::Execute (%s)", m_runtimeAsset.GetId().ToString<AZStd::string>().c_str());
+        AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::ScriptCanvas, "RuntimeComponent::Execute (%s)", m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().c_str());
         AZ_Assert(m_executionState, "RuntimeComponent::Execute called without an execution state");
         SC_EXECUTION_TRACE_GRAPH_ACTIVATED(CreateActivationInfo());
         SCRIPT_CANVAS_PERFORMANCE_SCOPE_EXECUTION(m_executionState->GetScriptCanvasId(), m_runtimeOverrides.m_runtimeAsset.GetId());
@@ -116,7 +116,7 @@ namespace ScriptCanvas
         AZ_Assert(m_runtimeAsset.Get(), "RuntimeComponent::m_runtimeAsset AssetId: %s was valid, but the data was not pre-loaded, so this script will not run", m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().data());
 #endif
 
-        AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::ScriptCanvas, "RuntimeComponent::InitializeExecution (%s)", m_runtimeAsset.GetId().ToString<AZStd::string>().c_str());
+        AZ_PROFILE_SCOPE_DYNAMIC(AZ::Debug::ProfileCategory::ScriptCanvas, "RuntimeComponent::InitializeExecution (%s)", m_runtimeOverrides.m_runtimeAsset.GetId().ToString<AZStd::string>().c_str());
         SCRIPT_CANVAS_PERFORMANCE_SCOPE_INITIALIZATION(m_scriptCanvasId, m_runtimeOverrides.m_runtimeAsset.GetId());
         m_executionState = ExecutionState::Create(ExecutionStateConfig(m_runtimeOverrides.m_runtimeAsset, *this));
 

scripts/o3de/o3de/manifest.py

@@ -278,8 +278,10 @@ def get_repos() -> list:
 def get_engine_projects() -> list:
     engine_path = get_this_engine_path()
     engine_object = get_engine_json_data(engine_path=engine_path)
-    return list(map(lambda rel_path: (pathlib.Path(engine_path) / rel_path).as_posix(),
-                      engine_object['projects'])) if 'projects' in engine_object else []
+    if engine_object:
+        return list(map(lambda rel_path: (pathlib.Path(engine_path) / rel_path).as_posix(),
+                          engine_object['projects'])) if 'projects' in engine_object else []
+    return []
 
 
 def get_engine_gems() -> list:
@@ -289,22 +291,28 @@ def get_engine_gems() -> list:
 def get_engine_external_subdirectories() -> list:
     engine_path = get_this_engine_path()
     engine_object = get_engine_json_data(engine_path=engine_path)
-    return list(map(lambda rel_path: (pathlib.Path(engine_path) / rel_path).as_posix(),
-                    engine_object['external_subdirectories'])) if 'external_subdirectories' in engine_object else []
+    if engine_object:
+        return list(map(lambda rel_path: (pathlib.Path(engine_path) / rel_path).as_posix(),
+                        engine_object['external_subdirectories'])) if 'external_subdirectories' in engine_object else []
+    return []
 
 
 def get_engine_templates() -> list:
     engine_path = get_this_engine_path()
     engine_object = get_engine_json_data(engine_path=engine_path)
-    return list(map(lambda rel_path: (pathlib.Path(engine_path) / rel_path).as_posix(),
-                      engine_object['templates']))
+    if engine_object:
+        return list(map(lambda rel_path: (pathlib.Path(engine_path) / rel_path).as_posix(),
+                          engine_object['templates'])) if 'templates' in engine_object else []
+    return []
 
 
 def get_engine_restricted() -> list:
     engine_path = get_this_engine_path()
     engine_object = get_engine_json_data(engine_path=engine_path)
-    return list(map(lambda rel_path: (pathlib.Path(engine_path) / rel_path).as_posix(),
-                    engine_object['restricted'])) if 'restricted' in engine_object else []
+    if engine_object:
+        return list(map(lambda rel_path: (pathlib.Path(engine_path) / rel_path).as_posix(),
+                        engine_object['restricted'])) if 'restricted' in engine_object else []
+    return []
 
 
 # project.json queries
@@ -314,20 +322,26 @@ def get_project_gems(project_path: pathlib.Path) -> list:
 
 def get_project_external_subdirectories(project_path: pathlib.Path) -> list:
     project_object = get_project_json_data(project_path=project_path)
-    return list(map(lambda rel_path: (pathlib.Path(project_path) / rel_path).as_posix(),
-               project_object['external_subdirectories'])) if 'external_subdirectories' in project_object else []
+    if project_object:
+        return list(map(lambda rel_path: (pathlib.Path(project_path) / rel_path).as_posix(),
+                   project_object['external_subdirectories'])) if 'external_subdirectories' in project_object else []
+    return []
 
 
 def get_project_templates(project_path: pathlib.Path) -> list:
     project_object = get_project_json_data(project_path=project_path)
-    return list(map(lambda rel_path: (pathlib.Path(project_path) / rel_path).as_posix(),
-                      project_object['templates']))
+    if project_object:
+        return list(map(lambda rel_path: (pathlib.Path(project_path) / rel_path).as_posix(),
+                          project_object['templates'])) if 'templates' in project_object else []
+    return []
 
 
 def get_project_restricted(project_path: pathlib.Path) -> list:
     project_object = get_project_json_data(project_path=project_path)
-    return list(map(lambda rel_path: (pathlib.Path(project_path) / rel_path).as_posix(),
-                    project_object['restricted'])) if 'restricted' in project_object else []
+    if project_object:
+        return list(map(lambda rel_path: (pathlib.Path(project_path) / rel_path).as_posix(),
+                        project_object['restricted'])) if 'restricted' in project_object else []
+    return []
 
 
 # Combined manifest queries