From 5a76a4190da887435e484b05bbc32f7eb060fac0 Mon Sep 17 00:00:00 2001 From: Miguel Pozo Date: Mon, 19 Feb 2024 15:37:14 +0100 Subject: [PATCH] Fix: Workbench: Wrong volume shader Regression from 2a2effc0c2c6316f66e5d1e93a19c18fd5a347ac --- source/blender/draw/engines/workbench/workbench_private.hh | 2 +- source/blender/draw/engines/workbench/workbench_shader_cache.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/blender/draw/engines/workbench/workbench_private.hh b/source/blender/draw/engines/workbench/workbench_private.hh index b6129cea883..401a4428f15 100644 --- a/source/blender/draw/engines/workbench/workbench_private.hh +++ b/source/blender/draw/engines/workbench/workbench_private.hh @@ -56,7 +56,7 @@ class ShaderCache { StaticShader shadow_[2 /*depth_pass*/][2 /*manifold*/][2 /*cap*/]; - StaticShader volume_[2 /*smoke*/][3 /*interpolation*/][2 /*slice*/][2 /*coba*/]; + StaticShader volume_[2 /*smoke*/][3 /*interpolation*/][2 /*coba*/][2 /*slice*/]; public: static ShaderCache &get(); diff --git a/source/blender/draw/engines/workbench/workbench_shader_cache.cc b/source/blender/draw/engines/workbench/workbench_shader_cache.cc index e62ca5338de..003e4931339 100644 --- a/source/blender/draw/engines/workbench/workbench_shader_cache.cc +++ b/source/blender/draw/engines/workbench/workbench_shader_cache.cc @@ -77,7 +77,7 @@ ShaderCache::ShaderCache() } } - std::string smoke[] = {"_smoke", "_object"}; + std::string smoke[] = {"_object", "_smoke"}; std::string interpolation[] = {"_linear", "_cubic", "_closest"}; std::string coba[] = {"_no_coba", "_coba"}; std::string slice[] = {"_no_slice", "_slice"};