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

gobj: Show better error if calling tex.write() with unknown extension

Browse Source
This commit is contained in:
rdb 2021-11-16 15:04:46 +01:00
parent 32584f0a68
commit ab6d3b2e15
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,7 @@
#include "pnmImage.h" #include "pnmImage.h"
#include "pnmReader.h" #include "pnmReader.h"
#include "pfmFile.h" #include "pfmFile.h"
#include "pnmFileTypeRegistry.h"
#include "virtualFileSystem.h" #include "virtualFileSystem.h"
#include "datagramInputFile.h" #include "datagramInputFile.h"
#include "datagramOutputFile.h" #include "datagramOutputFile.h"
@ -5176,11 +5177,19 @@ do_write_one(CData *cdata, const Filename &fullpath, int z, int n) {
success = pfm.write(fullpath); success = pfm.write(fullpath);
} else { } else {
// Writing a normal, integer texture. // Writing a normal, integer texture.
PNMFileType *type =
PNMFileTypeRegistry::get_global_ptr()->get_type_from_extension(fullpath);
if (type == nullptr) {
gobj_cat.error()
<< "Texture::write() - couldn't determine type from extension: " << fullpath << endl;
return false;
}
PNMImage pnmimage; PNMImage pnmimage;
if (!do_store_one(cdata, pnmimage, z, n)) { if (!do_store_one(cdata, pnmimage, z, n)) {
return false; return false;
} }
success = pnmimage.write(fullpath); success = pnmimage.write(fullpath, type);
} }
if (!success) { if (!success) {