projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rendering API clean-up
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
model3d-view
/
model3d-view-impl.h
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
(file)
--- 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;
//Properties
std::string mObjUrl;
- std::string m
Material
Url;
+ std::string m
TextureSet
Url;
std::string mImagesUrl;
std::string mTexture0Url;
std::string mTexture1Url;
std::string mImagesUrl;
std::string mTexture0Url;
std::string mTexture1Url;
@@
-166,7
+166,7
@@
private:
//Render members
Shader mShader;
//Render members
Shader mShader;
-
Material mMaterial
;
+
TextureSet mTextureSet
;
Geometry mMesh;
Renderer mRenderer;
};
Geometry mMesh;
Renderer mRenderer;
};