Merge branch 'development' into Prefab/BestEffortPatching

Signed-off-by: srikappa <srikappa@amazon.com>
2021-07-13 11:52:07 -07:00
parent 86a6d75b40 177f532ffa
commit da11424119
263 changed files with 6733 additions and 11736 deletions
@@ -196,7 +196,7 @@ namespace AzToolsFramework

        AZStd::vector<AzToolsFramework::ActionOverride> PlaceHolderComponentMode::PopulateActionsImpl()
        {
-            const AZ::Crc32 placeHolderComponentModeAction = AZ_CRC_CE("com.amazon.action.placeholder.test");
+            const AZ::Crc32 placeHolderComponentModeAction = AZ_CRC_CE("com.o3de.action.placeholder.test");

            return AZStd::vector<AzToolsFramework::ActionOverride>
            {