From 0ac0ee88c2d3da36e53260e43665b0a8bcd06df4 Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Thu, 6 Mar 2025 20:55:40 -0600
Subject: [PATCH] BitfieldConsoleBaseType::setData definition also, preserve
 saved out 0 and -1 numbers to resrver 'none' and 'all' ditch 'no'
 materialdefinition::animtype

---
 Engine/source/console/dynamicTypes.h          | 30 +++++++++++++++++--
 .../source/materials/materialDefinition.cpp   |  5 +---
 Engine/source/materials/materialDefinition.h  |  1 -
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/Engine/source/console/dynamicTypes.h b/Engine/source/console/dynamicTypes.h
index b635ab7ea..7f0fdf4cc 100644
--- a/Engine/source/console/dynamicTypes.h
+++ b/Engine/source/console/dynamicTypes.h
@@ -223,6 +223,15 @@ class BitfieldConsoleBaseType : public ConsoleBaseType
          const U32 numEnums = tbl->getNumValues();
          bool first = true;
 
+         if (dptrVal.testStrict(-1)) //test for all
+         {
+            return Con::getReturnBuffer("-1");
+         }
+         else if (!dptrVal.test(-1)) //test for none
+         {
+            return Con::getReturnBuffer("0");
+         }
+
          for (U32 i = 0; i < numEnums; i++)
          {
             if (dptrVal.test(BIT(i)))
@@ -242,10 +251,25 @@ class BitfieldConsoleBaseType : public ConsoleBaseType
          return Con::getReturnBuffer(returnBuffer);
       }
 
-      void setData( void* dptr, S32 argc, const char** argv, const EnumTable*, BitSet32 ) override
+      void setData( void* dptr, S32 argc, const char** argv, const EnumTable* tbl, BitSet32 ) override
       {
-         if( argc != 1 ) return; \
-         *((S32 *) dptr) = dAtoui(argv[0]); \
+         if( argc != 1 ) return;
+         S32 retVal = dAtoui(argv[0]);
+         if (retVal == 0 && retVal != -1) //zero we need to double check. -1 we know is all on
+         {
+            BitSet32 mask;
+            if (!tbl) tbl = getEnumTable();
+            const U32 numEnums = tbl->getNumValues();
+            String inString(argv[0]);
+
+            for (U32 i = 0; i < numEnums; i++)
+            {
+               if (inString.find((*tbl)[i].getName()) != String::NPos)
+                  mask.set(BIT(i));
+            }
+            retVal = mask;
+         }
+         *((S32*)dptr) = retVal;
       }
 };
 
diff --git a/Engine/source/materials/materialDefinition.cpp b/Engine/source/materials/materialDefinition.cpp
index d8619f04b..70a3eabe6 100644
--- a/Engine/source/materials/materialDefinition.cpp
+++ b/Engine/source/materials/materialDefinition.cpp
@@ -71,7 +71,6 @@ ConsoleDocClass(Material,
 ImplementBitfieldType(MaterialAnimType,
    "The type of animation effect to apply to this material.\n"
    "@ingroup GFX\n\n")
-{ Material::No, "$No", "No animations.\n"},
 { Material::Scroll, "$Scroll", "Scroll the material along the X/Y axis.\n"},
 { Material::Rotate, "$Rotate" , "Rotate the material around a point.\n" },
 { Material::Wave, "$Wave" , "Warps the material with an animation using Sin, Triangle or Square mathematics.\n" },
@@ -82,9 +81,7 @@ EndImplementBitfieldType;
 ImplementEnumType(MaterialBlendOp,
    "The type of graphical blending operation to apply to this material\n"
    "@ingroup GFX\n\n")
-{
-   Material::None, "None", "Disable blending for this material."
-},
+{ Material::None, "None", "Disable blending for this material."},
 { Material::Mul,          "Mul", "Multiplicative blending." },
 { Material::PreMul,       "PreMul", "Premultiplied alpha." },
 { Material::Add,          "Add", "Adds the color of the material to the frame buffer with full alpha for each pixel." },
diff --git a/Engine/source/materials/materialDefinition.h b/Engine/source/materials/materialDefinition.h
index 1fbf0e81c..f8939af22 100644
--- a/Engine/source/materials/materialDefinition.h
+++ b/Engine/source/materials/materialDefinition.h
@@ -115,7 +115,6 @@ public:
 
    enum AnimType
    {
-      No = 0,
       Scroll = BIT(0),
       Rotate = BIT(1),
       Wave = BIT(2),