From 8b597112be0c2ef32b542981063c692f0e44bd15 Mon Sep 17 00:00:00 2001
From: Luke Street <luke.street@encounterpc.com>
Date: Thu, 24 Sep 2020 03:17:17 -0400
Subject: [PATCH] ParticleCommon: Fix IESampleAndHold element ordering

---
 DataSpec/DNACommon/ParticleCommon.hpp     | 2 +-
 Runtime/Particle/CParticleDataFactory.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DataSpec/DNACommon/ParticleCommon.hpp b/DataSpec/DNACommon/ParticleCommon.hpp
index 36e16ee7d..711ba1026 100644
--- a/DataSpec/DNACommon/ParticleCommon.hpp
+++ b/DataSpec/DNACommon/ParticleCommon.hpp
@@ -917,9 +917,9 @@ struct IEMultiply : IIntElement {
 
 struct IESampleAndHold : IIntElement {
   AT_DECL_DNA_YAMLV_NO_TYPE
-  IntElementFactory val;
   IntElementFactory waitMin;
   IntElementFactory waitMax;
+  IntElementFactory val;
   std::string_view ClassID() const override { return "SPAH"sv; }
 };
 
diff --git a/Runtime/Particle/CParticleDataFactory.cpp b/Runtime/Particle/CParticleDataFactory.cpp
index e847de1d9..fe8454601 100644
--- a/Runtime/Particle/CParticleDataFactory.cpp
+++ b/Runtime/Particle/CParticleDataFactory.cpp
@@ -662,7 +662,7 @@ std::unique_ptr<CIntElement> CParticleDataFactory::GetIntElement(CInputStream& i
     auto a = GetIntElement(in);
     auto b = GetIntElement(in);
     auto c = GetIntElement(in);
-    return std::make_unique<CIESampleAndHold>(std::move(a), std::move(b), std::move(c));
+    return std::make_unique<CIESampleAndHold>(std::move(c), std::move(a), std::move(b));
   }
   case SBIG('RAND'): {
     auto a = GetIntElement(in);