RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix crash when using pnmimage.write with unsupported format, also fix a minor issue in shader.set_filename

This commit is contained in:
rdb 2016-05-02 16:30:06 +02:00
parent d3172015d5
commit 910a50de16
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
panda/src/gobj/shader.I
View File

@ -56,6 +56,7 @@ get_filename(ShaderType type) const {
*/
INLINE void Shader::
set_filename(ShaderType type, const Filename &filename) {
_filename._separate = true;
switch (type) {
case ST_vertex:
_filename._vertex = filename;
@ -77,6 +78,7 @@ set_filename(ShaderType type, const Filename &filename) {
break;
default:
_filename._shared = filename;
_filename._separate = false;
}
}

2
panda/src/pnmimage/pnmImageHeader.cxx
View File

@ -343,7 +343,7 @@ make_writer(ostream *file, bool owns_file, const Filename &filename,
delete file;
}
if (!writer->is_valid()) {
if (writer != NULL && !writer->is_valid()) {
delete writer;
writer = NULL;
}