Bladeren bron

Merge pull request #174 from nick-l-o3de/merge_from_development_to_main_25050

Merge from development to main for release 25.05.0
Nicholas Lawson 1 maand geleden
bovenliggende
commit
8d1af315fc
2 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 1 1
      Gems/O3DEPopcornFXPlugin
  2. 1 1
      Project/Assets/Materials/ArmorPowerUp/ArmorPowerUp.azsl

+ 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>