Merge revision 4954:4959 from trunk to ogl-es:

Fix bug in MaterialViewer - light control colors got initialized wrong.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@4960 dfc29bdd-3216-0410-991c-e03cc46cb475
master
cutealien 2014-10-02 19:11:45 +00:00
parent f9806e994c
commit a52b5458f8
1 changed files with 2 additions and 2 deletions

View File

@ -302,8 +302,8 @@ void CTypicalColorsControl::updateMaterialColors(video::SMaterial & material) co
void CTypicalColorsControl::setColorsToLightDataColors(const video::SLight & lightData)
{
ControlAmbientColor->setColor(lightData.AmbientColor.toSColor());
ControlAmbientColor->setColor(lightData.DiffuseColor.toSColor());
ControlAmbientColor->setColor(lightData.SpecularColor.toSColor());
ControlDiffuseColor->setColor(lightData.DiffuseColor.toSColor());
ControlSpecularColor->setColor(lightData.SpecularColor.toSColor());
}
// Update all changed colors in the light data