From ff48f3738a71ae80f9fe4f4f2adecd2a2ca55a09 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 5 Jul 2020 18:49:00 +0200 Subject: [PATCH] Update for the prop module's PropDataMesh rename. --- library/voxelman_library_merger.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/voxelman_library_merger.cpp b/library/voxelman_library_merger.cpp index 0887902..cd776c6 100644 --- a/library/voxelman_library_merger.cpp +++ b/library/voxelman_library_merger.cpp @@ -32,7 +32,7 @@ SOFTWARE. #endif #if MESH_DATA_RESOURCE_PRESENT -#include "../../mesh_data_resource/props/prop_data_mesh.h" +#include "../../mesh_data_resource/props/prop_data_mesh_data.h" #endif #include "../defines.h" @@ -372,7 +372,7 @@ bool VoxelmanLibraryMerger::process_prop_textures(Ref prop) { bool texture_added = false; for (int i = 0; i < prop->get_prop_count(); ++i) { - Ref pdm = prop->get_prop(i); + Ref pdm = prop->get_prop(i); if (pdm.is_valid()) { Ref tex = pdm->get_texture();