From 1a9474fe67fc893a316c36a21547763572102813 Mon Sep 17 00:00:00 2001 From: Lee Morgan Date: Fri, 1 May 2015 12:43:58 +0100 Subject: [PATCH] Fixed geometry hints property Change-Id: Id52fa1800a7a2daa786551d11b9dd8ce78e5feb3 --- dali/internal/event/effects/shader-effect-impl.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dali/internal/event/effects/shader-effect-impl.cpp b/dali/internal/event/effects/shader-effect-impl.cpp index 6eecdf8..2357678 100644 --- a/dali/internal/event/effects/shader-effect-impl.cpp +++ b/dali/internal/event/effects/shader-effect-impl.cpp @@ -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 s = propertyValue.Get(); if(s == "HINT_NONE") { hint = Dali::ShaderEffect::HINT_NONE; -- 2.7.4