TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 08:15:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

gobj: Fix failure to async reload texture more than once

Browse Source 
Fixes #1354
This commit is contained in:
rdb 2022-10-28 13:16:07 +02:00
parent 4bdac5afac
commit 54e2ddfd1c
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
panda/src/gobj/texture.cxx
View File

@ -1069,10 +1069,16 @@ async_ensure_ram_image(bool allow_compression, int priority) {
if (delay != 0.0) { if (delay != 0.0) {
Thread::sleep(delay); Thread::sleep(delay);
} }
if (allow_compression) { if (allow_compression) {
get_ram_image(); CDWriter cdata(_cycler, unlocked_ensure_ram_image(true));
} else { cdata->_reload_task = nullptr;
get_uncompressed_ram_image(); do_get_ram_image(cdata);
}
else {
CDWriter cdata(_cycler, false);
cdata->_reload_task = nullptr;
do_get_uncompressed_ram_image(cdata);
} }
return AsyncTask::DS_done; return AsyncTask::DS_done;
}); });