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

Bug fix: Check for a valid effect before dereference

Browse Source 
Reported on the dev list as...
Crash with custom scenery
This commit is contained in:
Scott Giese 2020-07-03 13:23:23 -05:00
parent 6d8e9e5bbc
commit a3ffc77a9d
1 changed files with 40 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
simgear/scene/tgdb/SGTileGeometryBin.hxx
View File

@ -287,12 +287,18 @@ public:
} else { } else {
eg->setMaterial(NULL); eg->setMaterial(NULL);
} }
// If effect requests normal generation, we do not include terragear // If effect requests normal generation, we do not include terragear
// normals in the geometry // normals in the geometry
bool include_normals = true; bool include_normals = true;
int n = eg->getEffect()->getGenerator(Effect::NORMAL);
auto eff = eg->getEffect();
if (eff) {
int n = eff->getGenerator(Effect::NORMAL);
if (n != -1) if (n != -1)
include_normals = false; include_normals = false;
}
osg::Geometry* geometry = i->second.buildGeometry(useVBOs, include_normals); osg::Geometry* geometry = i->second.buildGeometry(useVBOs, include_normals);
eg->runGenerators(geometry); // Generate extra data needed by effect eg->runGenerators(geometry); // Generate extra data needed by effect
eg->addDrawable(geometry); eg->addDrawable(geometry);