Merge branch 'develop'

Change-Id: I3d06158cec5e54f69ff3d0606b7d1dfe1a8a2f70

1 files changed, 4 insertions, 4 deletions

diff --git a/src/datavisualization/engine/shaders/default.frag b/src/datavisualization/engine/shaders/default.frag
index ca6fefb9..d16055a3 100644
--- a/src/datavisualization/engine/shaders/default.frag
+++ b/src/datavisualization/engine/shaders/default.frag
@@ -8,15 +8,15 @@ varying highp vec3 eyeDirection_cmr;
 varying highp vec3 lightDirection_cmr;
 
 uniform highp vec3 lightPosition_wrld;
-uniform highp vec3 color_mdl;
+uniform highp vec4 color_mdl;
 uniform highp float lightStrength;
 uniform highp float ambientStrength;
-uniform highp vec3 lightColor;
+uniform highp vec4 lightColor;
 
 void main() {
     highp vec3 materialDiffuseColor = color_mdl.rgb;
-    highp vec3 materialAmbientColor = lightColor * ambientStrength * materialDiffuseColor;
-    highp vec3 materialSpecularColor = lightColor;
+    highp vec3 materialAmbientColor = lightColor.rgb * ambientStrength * materialDiffuseColor;
+    highp vec3 materialSpecularColor = lightColor.rgb;
 
     highp float distance = length(lightPosition_wrld - position_wrld);