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

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
2022-01-24 10:54:03 -08:00
parent 3e5c1cee1e 8d0dce2613
commit fec2b889a3
408 changed files with 7668 additions and 3376 deletions
@@ -6,6 +6,3 @@
 *
 */
 #pragma once
-
-#define AZ_TRAIT_MATERIALEDITOR_EXT ""
-
@@ -6,6 +6,3 @@
 *
 */
 #pragma once
-
-#define AZ_TRAIT_MATERIALEDITOR_EXT ".app"
-
@@ -6,6 +6,3 @@
 *
 */
 #pragma once
-
-#define AZ_TRAIT_MATERIALEDITOR_EXT ".exe"
-