From 53c826e5ae03e9ac81c6f44b955d19448bdf5830 Mon Sep 17 00:00:00 2001 From: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> Date: Tue, 16 May 2023 08:59:16 -0500 Subject: [PATCH 1/3] Upgrade to PopcornFX 2.16.3. Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com> --- Gems/O3DEPopcornFXPlugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/O3DEPopcornFXPlugin b/Gems/O3DEPopcornFXPlugin index 92ea37a..7e3d9a2 160000 --- a/Gems/O3DEPopcornFXPlugin +++ b/Gems/O3DEPopcornFXPlugin @@ -1 +1 @@ -Subproject commit 92ea37adb2ad0ee94d4bfd3d4ea2dbbd0220094f +Subproject commit 7e3d9a2dbd4ce567e244423e0b8c96f015182dc6 From 980d9416d0554133453c89fa4fbfe707e891f4ed Mon Sep 17 00:00:00 2001 From: Akio Gaule <10719597+akioCL@users.noreply.github.com> Date: Tue, 30 May 2023 22:24:36 -0400 Subject: [PATCH 2/3] Update PopcornFXPlugin commit to include change needed for O3DE VMA feature Signed-off-by: Akio Gaule <10719597+akioCL@users.noreply.github.com> --- Gems/O3DEPopcornFXPlugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/O3DEPopcornFXPlugin b/Gems/O3DEPopcornFXPlugin index 7e3d9a2..4358ceb 160000 --- a/Gems/O3DEPopcornFXPlugin +++ b/Gems/O3DEPopcornFXPlugin @@ -1 +1 @@ -Subproject commit 7e3d9a2dbd4ce567e244423e0b8c96f015182dc6 +Subproject commit 4358cebeecc1f0060e20aa0694295e4a2dc5549e From c3132e8136b2f8ad6787a24ca0ae9bf8d4d9ef94 Mon Sep 17 00:00:00 2001 From: "T.J. Kotha" <112996779+tkothadev@users.noreply.github.com> Date: Mon, 17 Jul 2023 12:54:11 -0400 Subject: [PATCH 3/3] updating popcornfx submodule to include cmake fix Signed-off-by: T.J. Kotha <112996779+tkothadev@users.noreply.github.com> --- Gems/O3DEPopcornFXPlugin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gems/O3DEPopcornFXPlugin b/Gems/O3DEPopcornFXPlugin index 4358ceb..65cd36a 160000 --- a/Gems/O3DEPopcornFXPlugin +++ b/Gems/O3DEPopcornFXPlugin @@ -1 +1 @@ -Subproject commit 4358cebeecc1f0060e20aa0694295e4a2dc5549e +Subproject commit 65cd36acc93ab227534d092092c7a1114840bd67