FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a memory leak in random buildings.

Browse Source
This commit is contained in:
Stuart Buchanan
2012-07-04 19:50:20 +01:00
parent edcbfb52eb
commit 4838a9690e
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
simgear/scene/material/mat.cxx
View File

@@ -136,7 +136,7 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options,
tpath.append(tname);
string fullTexPath = SGModelLib::findDataFile(tpath.str(), options);
if (fullTexPath.empty()) {
tpath = SGPath("Textures");
tpath.set("Textures");
tpath.append(tname);
fullTexPath = SGModelLib::findDataFile(tpath.str(), options);
if (fullTexPath.empty()) {
@@ -173,7 +173,7 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options,
tpath.append(tname);
string fullTexPath = SGModelLib::findDataFile(tpath.str(), options);
if (fullTexPath.empty()) {
tpath = SGPath("Textures");
tpath.set("Textures");
tpath.append(tname);
fullTexPath = SGModelLib::findDataFile(tpath.str(), options);
if (fullTexPath.empty() ) {
@@ -217,7 +217,7 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options,
string fullMaskPath = SGModelLib::findDataFile(ompath.str(), options);
if (fullMaskPath.empty()) {
ompath = SGPath("Textures");
ompath.set("Textures");
ompath.append(omname);
fullMaskPath = SGModelLib::findDataFile(ompath.str(), options);
}
@@ -332,7 +332,7 @@ SGMaterial::read_properties(const SGReaderWriterOptions* options,
tree_texture = SGModelLib::findDataFile(treePath.str(), options);
if (tree_texture.empty()) {
treePath = SGPath("Textures");
treePath.set("Textures");
treePath.append(treeTexPath);
tree_texture = SGModelLib::findDataFile(treePath.str(), options);
}

8
simgear/scene/tgdb/SGBuildingBin.cxx
View File

@@ -79,10 +79,10 @@ void addBuildingToLeafGeode(Geode* geode, const SGBuildingBin::Building& buildin
// Get or create geometry.
osg::ref_ptr<osg::Geometry> geom;
osg::Vec3Array* v = new osg::Vec3Array;
osg::Vec2Array* t = new osg::Vec2Array;
osg::Vec4Array* c = new osg::Vec4Array; // single value
osg::Vec3Array* n = new osg::Vec3Array;
osg::Vec3Array* v;
osg::Vec2Array* t;
osg::Vec4Array* c;
osg::Vec3Array* n;
if (geode->getNumDrawables() == 0) {
geom = new osg::Geometry;