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

Add missing null check to SGLight's dim-factor expression

Browse Source
This commit is contained in:
Fernando García Liñán 2021-02-02 18:40:54 +01:00
parent a7a53921e4
commit 23a4fb1429
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
simgear/scene/model/SGLight.cxx
View File

@ -123,12 +123,14 @@ SGLight::appendLight(const SGPropertyNode *configNode,
if (dim_factor) { if (dim_factor) {
const SGExpressiond *expression = const SGExpressiond *expression =
read_value(dim_factor, modelRoot, "", 0, 1); read_value(dim_factor, modelRoot, "", 0, 1);
if (expression) {
light->setUpdateCallback( light->setUpdateCallback(
new SGLight::UpdateCallback(expression, new SGLight::UpdateCallback(expression,
light->getAmbient(), light->getAmbient(),
light->getDiffuse(), light->getDiffuse(),
light->getSpecular())); light->getSpecular()));
} }
}
osg::Shape *debug_shape = nullptr; osg::Shape *debug_shape = nullptr;
if (light->getType() == SGLight::Type::POINT) { if (light->getType() == SGLight::Type::POINT) {

2
simgear/scene/model/SGLightAnimation.cxx
View File

@ -56,12 +56,14 @@ SGLightAnimation::SGLightAnimation(simgear::SGTransientModelData &modelData) :
if (dim_factor) { if (dim_factor) {
const SGExpressiond *expression = const SGExpressiond *expression =
read_value(dim_factor, modelData.getModelRoot(), "", 0, 1); read_value(dim_factor, modelData.getModelRoot(), "", 0, 1);
if (expression) {
light->setUpdateCallback( light->setUpdateCallback(
new SGLight::UpdateCallback(expression, new SGLight::UpdateCallback(expression,
light->getAmbient(), light->getAmbient(),
light->getDiffuse(), light->getDiffuse(),
light->getSpecular())); light->getSpecular()));
} }
}
align->setName(getConfig()->getStringValue("name")); align->setName(getConfig()->getStringValue("name"));
_light = align; _light = align;