X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fmodel3d-view%2Fmodel3d-view-impl.h;h=8e44911b6b53e81ced78756a8237281d7ed06577;hp=2202409a87c8057082b45e1ba86e97b3c458e16e;hb=a2de9cf491172cd5da9dc9ed60b17683dab6d7bc;hpb=a9e64686388c10743bf66a9c5d6e0aa06e198c70 diff --git a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.h b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.h index 2202409..8e44911 100644 --- a/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.h +++ b/dali-toolkit/internal/controls/model3d-view/model3d-view-impl.h @@ -150,7 +150,7 @@ private: //Properties std::string mObjUrl; - std::string mMaterialUrl; + std::string mTextureSetUrl; std::string mImagesUrl; std::string mTexture0Url; std::string mTexture1Url; @@ -166,7 +166,7 @@ private: //Render members Shader mShader; - Material mMaterial; + TextureSet mTextureSet; Geometry mMesh; Renderer mRenderer; };