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
Scripting: Json format changes; style sets, includes
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
builder
/
replacement.cpp
diff --git
a/dali-toolkit/internal/builder/replacement.cpp
b/dali-toolkit/internal/builder/replacement.cpp
index
701b7c8
..
657840f
100644
(file)
--- a/
dali-toolkit/internal/builder/replacement.cpp
+++ b/
dali-toolkit/internal/builder/replacement.cpp
@@
-343,6
+343,13
@@
OptionalString Replacement::IsString( const TreeNode& node ) const
#endif
}
}
+ else
+ {
+ if( Property::STRING == value.GetType() )
+ {
+ ret = v; // sets the unexpanded. Expansion may occur later in processing with include files
+ }
+ }
}
}
else