Merge remote-tracking branch 'upstream/stabilization/2110' into Atom/santorac/MoveDoubleSided

2021-10-26 09:07:23 -07:00
parent eb542bfe69 22a287d046
commit b80e55229f
12 changed files with 82 additions and 149 deletions
@@ -208,7 +208,7 @@ namespace AZ
                return;
            }

-            const uint32_t originalVersion = m_materialTypeVersion;
+            [[maybe_unused]] const uint32_t originalVersion = m_materialTypeVersion;

            bool changesWereApplied = false;