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
Replace std::string global variables with C-style string.
[platform/core/uifw/dali-toolkit.git]
/
dali-scene3d
/
public-api
/
loader
/
node-definition.cpp
diff --git
a/dali-scene3d/public-api/loader/node-definition.cpp
b/dali-scene3d/public-api/loader/node-definition.cpp
index
df4e0c4
..
98405d7
100644
(file)
--- a/
dali-scene3d/public-api/loader/node-definition.cpp
+++ b/
dali-scene3d/public-api/loader/node-definition.cpp
@@
-61,7
+61,7
@@
void NodeDefinition::Renderable::OnCreate(const NodeDefinition& node, CreatePara
actor.AddRenderer(renderer);
}
actor.AddRenderer(renderer);
}
-const
std::string
NodeDefinition::ORIGINAL_MATRIX_PROPERTY_NAME = "originalMatrix";
+const
char*
NodeDefinition::ORIGINAL_MATRIX_PROPERTY_NAME = "originalMatrix";
Actor NodeDefinition::CreateActor(CreateParams& params)
{
Actor NodeDefinition::CreateActor(CreateParams& params)
{
@@
-79,6
+79,8
@@
Actor NodeDefinition::CreateActor(CreateParams& params)
actor.RegisterProperty(ORIGINAL_MATRIX_PROPERTY_NAME, GetLocalSpace(), Property::AccessMode::READ_ONLY);
actor.RegisterProperty(ORIGINAL_MATRIX_PROPERTY_NAME, GetLocalSpace(), Property::AccessMode::READ_ONLY);
+ actor.SetProperty(Actor::Property::COLOR_MODE, ColorMode::USE_OWN_MULTIPLY_PARENT_COLOR);
+
for(auto& renderable : mRenderables)
{
renderable->OnCreate(*this, params, actor);
for(auto& renderable : mRenderables)
{
renderable->OnCreate(*this, params, actor);