From 3407db3dd6fdfabb85a48f4aaf03f0531de1cdc0 Mon Sep 17 00:00:00 2001 From: Frederic Bouvier Date: Sun, 17 Jun 2012 17:52:17 +0200 Subject: [PATCH] Avoid an annoying OSG warning --- simgear/scene/model/SGLightAnimation.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/simgear/scene/model/SGLightAnimation.cxx b/simgear/scene/model/SGLightAnimation.cxx index 8e972c1e..69c2e683 100644 --- a/simgear/scene/model/SGLightAnimation.cxx +++ b/simgear/scene/model/SGLightAnimation.cxx @@ -74,13 +74,13 @@ public: { osg::Uniform* amb = pass->getUniform("Ambient"); if (amb) - amb->set(toOsg(_ambient) * dim); + amb->set(osg::Vec4f(_ambient.x() * dim, _ambient.y() * dim, _ambient.z() * dim, _ambient.w() * dim)); osg::Uniform* dif = pass->getUniform("Diffuse"); if (dif) - dif->set(toOsg(_diffuse) * dim); + dif->set(osg::Vec4f(_diffuse.x() * dim, _diffuse.y() * dim, _diffuse.z() * dim, _diffuse.w() * dim)); osg::Uniform* spe = pass->getUniform("Specular"); if (spe) - spe->set(toOsg(_specular) * dim); + spe->set(osg::Vec4f(_specular.x() * dim, _specular.y() * dim, _specular.z() * dim, _specular.w() * dim)); } } } -- 2.39.5