Merge branch 'DxcExperiment' of https://github.com/aws-lumberyard-dev/o3de into DxcExperiment

This commit is contained in:
moudgils
2021-05-18 20:43:07 -07:00
2 changed files with 3 additions and 4 deletions
@@ -269,13 +269,13 @@ namespace AZ
{
ImGui::BeginChild(heapMemoryId.c_str());
ImGui::SetScrollY(scrollingY);
ImGui::End();
ImGui::EndChild();
}
{
ImGui::BeginChild(scopesId.c_str());
ImGui::SetScrollX(scrollingX);
ImGui::End();
ImGui::EndChild();
}
ImGui::PopStyleVar(3);