mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-04 02:42:49 -04:00
type should not necessarily inherit when we read a file
This commit is contained in:
parent
ba755587b7
commit
adffbe7add
@ -195,7 +195,6 @@ read(PNMReader *reader) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
copy_header_from(*reader);
|
copy_header_from(*reader);
|
||||||
_type = reader->get_type();
|
|
||||||
|
|
||||||
// We reassign y_size after reading because we might have read a
|
// We reassign y_size after reading because we might have read a
|
||||||
// truncated file.
|
// truncated file.
|
||||||
|
@ -38,7 +38,6 @@ read_header(const Filename &filename, PNMFileType *type) {
|
|||||||
PNMReader *reader = make_reader(filename, type);
|
PNMReader *reader = make_reader(filename, type);
|
||||||
if (reader != (PNMReader *)NULL) {
|
if (reader != (PNMReader *)NULL) {
|
||||||
(*this) = (*reader);
|
(*this) = (*reader);
|
||||||
_type = reader->get_type();
|
|
||||||
delete reader;
|
delete reader;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user