Merge "Added support for setting light position in mesh renderer." into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / renderers / renderer-string-constants.cpp

diff --git a/dali-toolkit/internal/controls/renderers/renderer-string-constants.cpp b/dali-toolkit/internal/controls/renderers/renderer-string-constants.cpp
index baca920..a37d413 100644 (file)
--- a/dali-toolkit/internal/controls/renderers/renderer-string-constants.cpp
+++ b/dali-toolkit/internal/controls/renderers/renderer-string-constants.cpp
@@ -38,7 +38,7 @@ const char * const DEBUG_RENDERER("DEBUG");
 
 const char * const IMAGE_URL_NAME("url");
 const char * const ATLAS_RECT_UNIFORM_NAME ( "uAtlasRect" );
-const char * const LIGHT_POSITION_UNIFORM_NAME( "uLightPosition" );
+const char * const LIGHT_POSITION_UNIFORM_NAME( "lightPosition" );
 
 //Mesh properties
 const char * const OBJECT_URL( "objectUrl" );
@@ -46,10 +46,11 @@ const char * const MATERIAL_URL( "materialUrl" );
 const char * const TEXTURES_PATH( "texturesPath" );
 const char * const SHADER_TYPE( "shaderType" );
 const char * const USE_MIPMAPPING( "useMipmapping" );
+const char * const USE_SOFT_NORMALS( "useSoftNormals" );
 
 //Primitive shape properties
 const char * const PRIMITIVE_SHAPE( "shape" );
-const char * const SHAPE_COLOR( "color" );
+const char * const SHAPE_COLOR( "shapeColor" );
 const char * const SLICES( "slices" );
 const char * const STACKS( "stacks" );
 const char * const SCALE_TOP_RADIUS( "scaleTopRadius" );