From a52b5458f8635a018b38e887f79dc9fa4c25f77d Mon Sep 17 00:00:00 2001 From: cutealien Date: Thu, 2 Oct 2014 19:11:45 +0000 Subject: [PATCH] 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 --- examples/22.MaterialViewer/main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/22.MaterialViewer/main.cpp b/examples/22.MaterialViewer/main.cpp index e8adf737..cccca428 100755 --- a/examples/22.MaterialViewer/main.cpp +++ b/examples/22.MaterialViewer/main.cpp @@ -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