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

Fix null ref during load.

Browse Source 
This happened a few times
This commit is contained in:
Richard Harrison
2019-01-20 18:28:37 +01:00
parent 8707005a97
commit 8e57a61aed
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/scene/sky/cloud.cxx
+5 -3
View File
@@ -485,9 +485,11 @@ SGCloudLayer::rebuild()
// repaint the cloud layer colors // repaint the cloud layer colors
bool SGCloudLayer::repaint( const SGVec3f& fog_color ) { bool SGCloudLayer::repaint( const SGVec3f& fog_color ) {
osg::Vec4f combineColor(toOsg(fog_color), cloud_alpha); osg::Vec4f combineColor(toOsg(fog_color), cloud_alpha);
osg::TexEnvCombine* combiner osg::StateAttribute* textureAtt = layer_root->getStateSet()->getTextureAttribute(1, osg::StateAttribute::TEXENV);
= dynamic_cast<osg::TexEnvCombine*>(layer_root->getStateSet() osg::TexEnvCombine* combiner = dynamic_cast<osg::TexEnvCombine*>(textureAtt);
->getTextureAttribute(1, osg::StateAttribute::TEXENV));
if (combiner == nullptr)
return false;
combiner->setConstantColor(combineColor); combiner->setConstantColor(combineColor);
// Set the fog color for the 3D clouds too. // Set the fog color for the 3D clouds too.