Merge branch 'devel/new_mesh' into devel/master
[platform/core/uifw/dali-demo.git] / examples / mesh-morph / mesh-morph-example.cpp
index 26b5b59..baf9ff6 100644 (file)
  */
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/rendering/renderer.h>
+#include <dali-toolkit/dali-toolkit.h>
 
 // INTERNAL INCLUDES
 #include "shared/view.h"
 
-#include <dali-toolkit/dali-toolkit.h>
-
 using namespace Dali;
 
 namespace
@@ -302,8 +302,7 @@ public:
     mMeshActor.AddRenderer( mRenderer );
     mMeshActor.SetSize(400, 400);
 
-    Property::Index morphDeltaIndex = mMeshActor.RegisterProperty( "morph-delta", 0.f );
-    mMeshActor.AddUniformMapping( morphDeltaIndex, std::string("uDelta") );
+    Property::Index morphDeltaIndex = mMeshActor.RegisterProperty( "uDelta", 0.f );
 
     mRenderer.SetDepthIndex(0);