Pantyhose-X
/
vengi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VOXCONVERT: check return value of merge

master
Martin Gerhardy 2020-05-20 00:15:31 +02:00
parent 982e9083d6
commit 788f452f41
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/voxconvert/VoxConvert.cpp
View File

@ -73,6 +73,10 @@ core::AppState VoxConvert::onInit() {
if (hasArg("--merge")) {
voxel::RawVolume* merged = volumes.merge();
if (merged == nullptr) {
Log::error("Failed to merge volumes");
return core::AppState::InitFailure;
}
voxelformat::clearVolumes(volumes);
volumes.push_back(voxel::VoxelVolume(merged));
}