Merge remote-tracking branch 'upstream/development' into Atom/santorac/MaterialAssetDeferredBaking3

2022-01-19 12:30:58 -08:00
parent b61238e50c 5cac67bfad
commit fbe17b0022
134 changed files with 1730 additions and 1288 deletions
@@ -143,7 +143,7 @@ namespace AZ
                arguments.append(QString("--project-path=%1").arg(projectPath.c_str()));
            }

-            AtomToolsFramework::LaunchTool("MaterialEditor", AZ_TRAIT_OS_EXECUTABLE_EXTENSION, arguments);
+            AtomToolsFramework::LaunchTool("MaterialEditor", arguments);
        }

        void EditorMaterialSystemComponent::OpenMaterialInspector(