]> git.tdb.fi Git - libs/gl.git/commitdiff
Fix a use-after-move issue from earlier refactoring
authorMikko Rasa <tdb@tdb.fi>
Sun, 17 Dec 2023 09:12:50 +0000 (11:12 +0200)
committerMikko Rasa <tdb@tdb.fi>
Sun, 17 Dec 2023 09:24:50 +0000 (11:24 +0200)
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

index 6a3202846e8f475c56897f138864526c7839c3b5..9e5e665ce62fb20ba8736e0155b922aa6836b0e6 100644 (file)
@@ -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));
 }