Merge branch 'postprocessorhud' into 'master'

Sort inactive shader list (#7652)

Closes #7652

See merge request OpenMW/openmw!3534
macos_ci_fix
AnyOldName3 1 year ago
commit d84caff94d

@ -117,6 +117,7 @@
Feature #7618: Show the player character's health in the save details Feature #7618: Show the player character's health in the save details
Feature #7625: Add some missing console error outputs Feature #7625: Add some missing console error outputs
Feature #7634: Support NiParticleBomb Feature #7634: Support NiParticleBomb
Feature #7652: Sort inactive post processing shaders list properly
Task #5896: Do not use deprecated MyGUI properties Task #5896: Do not use deprecated MyGUI properties
Task #7113: Move from std::atoi to std::from_char Task #7113: Move from std::atoi to std::from_char
Task #7117: Replace boost::scoped_array with std::vector Task #7117: Replace boost::scoped_array with std::vector

@ -20,6 +20,7 @@
#include <components/fx/technique.hpp> #include <components/fx/technique.hpp>
#include <components/fx/widgets.hpp> #include <components/fx/widgets.hpp>
#include <components/misc/strings/algorithm.hpp>
#include <components/misc/utf8stream.hpp> #include <components/misc/utf8stream.hpp>
#include <components/widgets/box.hpp> #include <components/widgets/box.hpp>
@ -421,7 +422,12 @@ namespace MWGui
auto* processor = MWBase::Environment::get().getWorld()->getPostProcessor(); auto* processor = MWBase::Environment::get().getWorld()->getPostProcessor();
std::vector<std::string> techniques;
for (const auto& [name, _] : processor->getTechniqueMap()) for (const auto& [name, _] : processor->getTechniqueMap())
techniques.push_back(name);
std::sort(techniques.begin(), techniques.end(), Misc::StringUtils::ciLess);
for (const std::string& name : techniques)
{ {
auto technique = processor->loadTechnique(name); auto technique = processor->loadTechnique(name);

Loading…
Cancel
Save