goat3d
diff src/goat3d_readxml.cc @ 53:6d514398a728
fixed a merge mistake
author | John Tsiombikas <nuclear@member.fsf.org> |
---|---|
date | Fri, 17 Jan 2014 18:30:35 +0200 |
parents | cb5414f406eb |
children | dad392c710df |
line diff
1.1 --- a/src/goat3d_readxml.cc Fri Jan 17 18:27:47 2014 +0200 1.2 +++ b/src/goat3d_readxml.cc Fri Jan 17 18:30:35 2014 +0200 1.3 @@ -110,12 +110,6 @@ 1.4 return true; 1.5 } 1.6 1.7 -bool Scene::load_anim_xml(goat3d_io *io) 1.8 -{ 1.9 - return false; 1.10 -} 1.11 - 1.12 - 1.13 static Material *read_material(Scene *scn, XMLElement *xml_mtl) 1.14 { 1.15 Material *mtl = new Material;