Merge pull request #1209 from seanpaultaylor/next

Fixed some material values for samples.

samples/browser/res/common/light.material

@@ -250,7 +250,7 @@ material lighting
             // shaders
             vertexShader = res/shaders/textured.vert
             fragmentShader = res/shaders/textured.frag
-			defines = TEXTURE_REPEAT;SPOT_LIGHT_COUNT 1
+			defines = TEXTURE_REPEAT;BUMPED;SPOT_LIGHT_COUNT 1
 			u_worldViewMatrix = WORLD_VIEW_MATRIX
 			u_worldViewProjectionMatrix = WORLD_VIEW_PROJECTION_MATRIX
 			u_inverseTransposeWorldViewMatrix = INVERSE_TRANSPOSE_WORLD_VIEW_MATRIX

samples/racer/src/RacerGame.cpp

@@ -114,14 +114,12 @@ bool RacerGame::initializeScene(Node* node)
     if (model)
     {
         Material* material = model->getMaterial();
-        /*
-        if (material && material->getTechnique()->getPassByIndex(0)->getEffect()->getUniform("u_directionalLightDirection"))
+        if (material && material->getTechnique()->getPassByIndex(0)->getEffect()->getUniform("u_directionalLightDirection[0]"))
         {
             material->getParameter("u_ambientColor")->setValue(_scene->getAmbientColor());
             material->getParameter("u_directionalLightColor[0]")->setValue(lightNode->getLight()->getColor());
             material->getParameter("u_directionalLightDirection[0]")->setValue(lightNode->getForwardVectorView());
         }
-        */
     }
 
     return true;