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

*** empty log message ***

This commit is contained in:
David Rose 2001-03-23 21:56:32 +00:00
parent d2a9717904
commit 366b4a0d2c
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
pandatool/src/flt/fltRecord.cxx
View File

@ -710,23 +710,6 @@ write_record_and_children(FltRecordWriter &writer) const {
}
}
// Any subfaces?
if (!_subfaces.empty()) {
result = writer.write_record(FO_push_face);
if (result != FE_ok) {
return result;
}
for (ci = _subfaces.begin(); ci != _subfaces.end(); ++ci) {
(*ci)->write_record_and_children(writer);
}
result = writer.write_record(FO_pop_face);
if (result != FE_ok) {
return result;
}
}
// Any extensions?
if (!_extensions.empty()) {
result = writer.write_record(FO_push_face);
@ -761,6 +744,24 @@ write_record_and_children(FltRecordWriter &writer) const {
}
}
// We must write subfaces *after* the list of children, or Creator
// will crash trying to load the file.
if (!_subfaces.empty()) {
result = writer.write_record(FO_push_face);
if (result != FE_ok) {
return result;
}
for (ci = _subfaces.begin(); ci != _subfaces.end(); ++ci) {
(*ci)->write_record_and_children(writer);
}
result = writer.write_record(FO_pop_face);
if (result != FE_ok) {
return result;
}
}
return FE_ok;
}