Relintai/terraman
1
0
Fork 0
mirror of https://github.com/Relintai/terraman.git synced 2025-05-01 22:07:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix potential race condition.

Browse Source
This commit is contained in:
Relintai 2021-08-03 00:24:15 +02:00
parent 66278f0ab8
commit 8f989f7ae0
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
world/jobs/terra_terrarin_job.cpp
View File

@ -22,9 +22,9 @@ SOFTWARE.
#include "terra_terrarin_job.h" #include "terra_terrarin_job.h"
#include "../../library/terra_material_cache.h"
#include "../../library/terra_surface.h" #include "../../library/terra_surface.h"
#include "../../library/terraman_library.h" #include "../../library/terraman_library.h"
#include "../../library/terra_material_cache.h"
#include "../../meshers/blocky/terra_mesher_blocky.h" #include "../../meshers/blocky/terra_mesher_blocky.h"
#include "../../meshers/default/terra_mesher_default.h" #include "../../meshers/default/terra_mesher_default.h"
@ -99,7 +99,23 @@ void TerraTerrarinJob::phase_library_setup() {
} }
if (lib->supports_caching()) { if (lib->supports_caching()) {
lib->material_cache_get_key(_chunk); if (!_chunk->material_cache_key_has()) {
lib->material_cache_get_key(_chunk);
} else {
Ref<TerraMaterialCache> cache = lib->material_cache_get(_chunk->material_cache_key_get());
if (!cache.is_valid()) {
next_phase();
return;
}
if (!cache->get_initialized()) {
//Means it's currently merging the atlases on a different thread.
//Let's just wait -> return.
//This method will get called again later.
return;
}
}
} }
next_phase(); next_phase();