From e3b8f1e63a0a9fdd0e7b22a2ea38527b111bd428 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Sun, 17 Dec 2023 11:12:50 +0200 Subject: [PATCH] Fix a use-after-move issue from earlier refactoring It was causing SplatMaterial to not create its texture arrays, because the submaterial source filenames were empty after being moved from. --- source/materials/splatmaterial.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/materials/splatmaterial.cpp b/source/materials/splatmaterial.cpp index 6a320284..9e5e665c 100644 --- a/source/materials/splatmaterial.cpp +++ b/source/materials/splatmaterial.cpp @@ -240,7 +240,6 @@ void SplatMaterial::Loader::sub_mat() { SubMaterial sm; sub(sm).load(); - obj.sub_materials.emplace_back(move(sm)); if(!sm.base_color_map.source_fn.empty()) ++obj.base_color_array.max_layers; @@ -254,6 +253,8 @@ void SplatMaterial::Loader::sub_mat() ++obj.occlusion_array.max_layers; if(!sm.emission_map.source_fn.empty()) ++obj.emission_array.max_layers; + + obj.sub_materials.emplace_back(move(sm)); } -- 2.45.2