X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fmodel3d-view%2Fmodel3d-view.cpp;h=d401b65329cc3b829dc5a5662491508b84aeecdc;hp=735c542b581da26d6ca2fc9900d7ce1fba15d7ef;hb=HEAD;hpb=5359a575636e678baf178dab5209b587be1a7551 diff --git a/dali-toolkit/public-api/controls/model3d-view/model3d-view.cpp b/dali-toolkit/public-api/controls/model3d-view/model3d-view.cpp index 735c542..d401b65 100644 --- a/dali-toolkit/public-api/controls/model3d-view/model3d-view.cpp +++ b/dali-toolkit/public-api/controls/model3d-view/model3d-view.cpp @@ -34,11 +34,11 @@ Model3dView::Model3dView() Model3dView::Model3dView(const Model3dView& model3dView) = default; -Model3dView::Model3dView(Model3dView&& rhs) = default; +Model3dView::Model3dView(Model3dView&& rhs) noexcept = default; Model3dView& Model3dView::operator=(const Model3dView& model3dView) = default; -Model3dView& Model3dView::operator=(Model3dView&& rhs) = default; +Model3dView& Model3dView::operator=(Model3dView&& rhs) noexcept = default; Model3dView::~Model3dView() { @@ -52,9 +52,9 @@ Model3dView Model3dView::New() Model3dView Model3dView::New(const std::string& objUrl, const std::string& mtlUrl, const std::string& imagesUrl) { Model3dView model3dView = Internal::Model3dView::New(); + model3dView.SetProperty(Model3dView::Property::IMAGES_URL, Dali::Property::Value(imagesUrl)); model3dView.SetProperty(Model3dView::Property::GEOMETRY_URL, Dali::Property::Value(objUrl)); model3dView.SetProperty(Model3dView::Property::MATERIAL_URL, Dali::Property::Value(mtlUrl)); - model3dView.SetProperty(Model3dView::Property::IMAGES_URL, Dali::Property::Value(imagesUrl)); return model3dView; }