TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix crash on exit

Browse Source
This commit is contained in:
David Rose 2005-10-06 00:16:24 +00:00
parent ce4e89c475
commit c4b11604ec
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandatool/src/softegg/softNodeDesc.cxx
View File

@ -78,9 +78,16 @@ SoftNodeDesc(SoftNodeDesc *parent, const string &name) :
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
SoftNodeDesc:: SoftNodeDesc::
~SoftNodeDesc() { ~SoftNodeDesc() {
// I think it is a mistake to try to delete this. This was one
// member of an entire array allocated at once; you can't delete
// individual elements of an array.
// Screw cleanup, anyway--we'll just let the array leak.
/*
if (_model != (SAA_Elem *)NULL) { if (_model != (SAA_Elem *)NULL) {
delete _model; delete _model;
} }
*/
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

6
pandatool/src/softegg/softToEggConverter.cxx
View File

@ -572,6 +572,7 @@ convert_file(const Filename &filename) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
bool SoftToEggConverter:: bool SoftToEggConverter::
convert_soft(bool from_selection) { convert_soft(bool from_selection) {
cerr <<" startup\n";
bool all_ok = true; bool all_ok = true;
_from_selection = from_selection; _from_selection = from_selection;
@ -629,13 +630,18 @@ convert_soft(bool from_selection) {
softegg_cat.info() << "Converted Softimage file\n"; softegg_cat.info() << "Converted Softimage file\n";
// write out the egg model file // write out the egg model file
cerr << "writing egg file\n";
_egg_data->write_egg(output_filename); _egg_data->write_egg(output_filename);
softegg_cat.info() << "Wrote Egg file " << output_filename << endl; softegg_cat.info() << "Wrote Egg file " << output_filename << endl;
cerr <<" done\n";
} }
if (make_anim) { if (make_anim) {
cerr << "making anim\n";
if (!convert_char_chan()) { if (!convert_char_chan()) {
cerr << "failed to convert char\n";
all_ok = false; all_ok = false;
} }
cerr << "done convert_char_chan\n";
// reparent_decals(get_egg_data()); // reparent_decals(get_egg_data());
softegg_cat.info() << "Converted Softimage file\n"; softegg_cat.info() << "Converted Softimage file\n";