#5565: Fix sort value not being set properly on the material

codereader · Mar 25, 2021 · 2b5faac · 2b5faac
1 parent e0fb7ce
commit 2b5faac
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/libs/materials/ParseLib.h b/libs/materials/ParseLib.h
@@ -142,6 +142,19 @@ inline std::string getStringForSortRequestValue(float value)
     return std::string();
 }
 
+inline float getSortRequestValueForString(const std::string& value)
+{
+    for (const auto& pair : PredefinedSortValues)
+    {
+        if (value == pair.first)
+        {
+            return static_cast<float>(pair.second);
+        }
+    }
+
+    return string::convert<float>(value, Material::SORT_OPAQUE);
+}
+
 constexpr std::pair<const char*, IShaderLayer::MapType> MapTypeNames[]
 {
     { "map", IShaderLayer::MapType::Map },

diff --git a/radiant/ui/materials/editor/MaterialEditor.cpp b/radiant/ui/materials/editor/MaterialEditor.cpp
@@ -307,7 +307,10 @@ void MaterialEditor::setupMaterialProperties()
             }
             else
             {
-                material->setSortRequest(Material::SORT_OPAQUE);
+                auto sortValue = getControl<wxComboBox>("MaterialSortValue")->GetValue().ToStdString();
+                material->setSortRequest(!sortValue.empty() ? 
+                    shaders::getSortRequestValueForString(sortValue) : 
+                    static_cast<float>(Material::SORT_OPAQUE));
             }
         },
         [this]() { onMaterialChanged(); }));
@@ -2056,7 +2059,9 @@ void MaterialEditor::_onSortRequestChanged(wxCommandEvent& ev)
     if (!_material || _materialUpdateInProgress) return;
 
     auto sortDropdown = getControl<wxComboBox>("MaterialSortValue");
-    _material->setSortRequest(string::convert<float>(sortDropdown->GetValue().ToStdString(), Material::SORT_OPAQUE));
+    auto value = sortDropdown->GetValue().ToStdString();
+    _material->setSortRequest(shaders::getSortRequestValueForString(value));
+
     onMaterialChanged();
 }