Migrate fixes from CodeCommit branch

2021-04-09 12:40:43 -07:00
parent e8f6463db0
commit 1dabb39b98
12 changed files with 94 additions and 154 deletions
@@ -142,7 +142,7 @@ namespace AZ
                params.renderScene
            );
            viewportContext->GetWindowContext()->RegisterAssociatedViewportContext(viewportContext);
-            RegisterViewportContext(contextName, viewportContext);
+            RegisterViewportContext(nameToUse, viewportContext);
            return viewportContext;
        }

@@ -170,7 +170,9 @@ namespace AZ
                AZ_Assert(false, "Attempted to rename ViewportContext \"%s\" to \"%s\", but \"%s\" is already assigned to another ViewportContext", viewportContext->m_name.GetCStr(), newContextName.GetCStr(), newContextName.GetCStr());
                return;
            }
-            RegisterViewportContext(newContextName, viewportContext);
+            GetOrCreateViewStackForContext(newContextName);
+            viewportContext->m_name = newContextName;
+            UpdateViewForContext(newContextName);
        }

        void ViewportContextManager::EnumerateViewportContexts(AZStd::function<void(ViewportContextPtr)> visitorFunction)