Răsfoiți Sursa

Merge from development to main for release 25.05.0

This makes `main` identical to `development`.

Signed-off-by: Nicholas Lawson <[email protected]>
Nicholas Lawson 2 luni în urmă
părinte
comite
a28187914d

+ 1 - 1
Gems/O3DEPopcornFXPlugin

@@ -1 +1 @@
-Subproject commit 8ec714f474dad27e837f5826bdfbf4db6964cf60
+Subproject commit 0b5d40f58aed075a234acd64f5895366efdb5512

+ 1 - 1
Project/Assets/Materials/ArmorPowerUp/ArmorPowerUp.azsl

@@ -1,5 +1,5 @@
 #pragma once
-#include <viewsrg.srgi>
+#include <viewsrg_all.srgi>
 #include <Atom/Features/PBR/DefaultObjectSrg.azsli>
 #define UNIFIED_FORWARD_OUTPUT
 #include <Atom/Features/PBR/ForwardPassOutput.azsli>