# HG changeset patch # User John Tsiombikas # Date 1389976235 -7200 # Node ID 6d514398a72829f2c092549b7fb45aaedaa2702b # Parent cb5414f406eb68d4619ca07abe719fcbaff94a33 fixed a merge mistake diff -r cb5414f406eb -r 6d514398a728 src/goat3d_readxml.cc --- a/src/goat3d_readxml.cc Fri Jan 17 18:27:47 2014 +0200 +++ b/src/goat3d_readxml.cc Fri Jan 17 18:30:35 2014 +0200 @@ -110,12 +110,6 @@ return true; } -bool Scene::load_anim_xml(goat3d_io *io) -{ - return false; -} - - static Material *read_material(Scene *scn, XMLElement *xml_mtl) { Material *mtl = new Material; diff -r cb5414f406eb -r 6d514398a728 src/goat3d_write.cc --- a/src/goat3d_write.cc Fri Jan 17 18:27:47 2014 +0200 +++ b/src/goat3d_write.cc Fri Jan 17 18:30:35 2014 +0200 @@ -225,8 +225,3 @@ return size; } #endif - -bool Scene::save_anim(const XFormNode *node, goat3d_io *io) const -{ - return false; -}