Fixed geometry hints property 48/38948/1
authorLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 1 May 2015 11:43:58 +0000 (12:43 +0100)
committerLee Morgan <Lee.morgan@partner.samsung.com>
Fri, 1 May 2015 11:44:50 +0000 (12:44 +0100)
Change-Id: Id52fa1800a7a2daa786551d11b9dd8ce78e5feb3

dali/internal/event/effects/shader-effect-impl.cpp

index 6eecdf8..2357678 100644 (file)
@@ -62,7 +62,7 @@ DALI_PROPERTY_TABLE_BEGIN
 DALI_PROPERTY( "grid-density",   FLOAT,   true,    false,   false,   Dali::ShaderEffect::Property::GRID_DENSITY   )
 DALI_PROPERTY( "image",          MAP,     true,    false,   false,   Dali::ShaderEffect::Property::IMAGE          )
 DALI_PROPERTY( "program",        MAP,     true,    false,   false,   Dali::ShaderEffect::Property::PROGRAM        )
-DALI_PROPERTY( "geometry-hints", INTEGER, true,    false,   false,   Dali::ShaderEffect::Property::GEOMETRY_HINTS )
+DALI_PROPERTY( "geometry-hints", STRING,  true,    false,   false,   Dali::ShaderEffect::Property::GEOMETRY_HINTS )
 DALI_PROPERTY_TABLE_END( DEFAULT_ACTOR_PROPERTY_START_INDEX )
 
 BaseHandle Create()
@@ -508,9 +508,7 @@ void ShaderEffect::SetDefaultProperty( Property::Index index, const Property::Va
     case Dali::ShaderEffect::Property::GEOMETRY_HINTS:
     {
       Dali::ShaderEffect::GeometryHints hint = Dali::ShaderEffect::HINT_NONE;
-      Property::Value geometryHintsValue   = propertyValue.GetValue("geometry-hints");
-
-      std::string s = geometryHintsValue.Get<std::string>();
+      std::string s = propertyValue.Get<std::string>();
       if(s == "HINT_NONE")
       {
         hint = Dali::ShaderEffect::HINT_NONE;