diff options
| author | volzhs <volzhs@gmail.com> | 2015-07-01 15:13:10 +0900 |
|---|---|---|
| committer | volzhs <volzhs@gmail.com> | 2015-07-01 15:13:10 +0900 |
| commit | f6668dc9db34fc4a3ef9e9e309e0fc248c3f51a8 (patch) | |
| tree | 0c9a6e5cd8b6d3fdfab3cb6aff41458a08841133 /scene/resources/theme.cpp | |
| parent | 903e6b37c0ed94cd0b3447dd3ff471abbfaa4460 (diff) | |
| parent | b4d5f7e154973e8fb93a9a0af6ffa0b065e2c50c (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot into fix_android_payments
Diffstat (limited to 'scene/resources/theme.cpp')
| -rw-r--r-- | scene/resources/theme.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index 21bdb6c0ab..3060fe41b4 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -40,9 +40,9 @@ bool Theme::_set(const StringName& p_name, const Variant& p_value) { if (sname.find("/")!=-1) { - String type=sname.get_slice("/",1); - String node_type=sname.get_slice("/",0); - String name=sname.get_slice("/",2); + String type=sname.get_slicec('/',1); + String node_type=sname.get_slicec('/',0); + String name=sname.get_slicec('/',2); if (type=="icons") { @@ -75,9 +75,9 @@ bool Theme::_get(const StringName& p_name,Variant &r_ret) const { if (sname.find("/")!=-1) { - String type=sname.get_slice("/",1); - String node_type=sname.get_slice("/",0); - String name=sname.get_slice("/",2); + String type=sname.get_slicec('/',1); + String node_type=sname.get_slicec('/',0); + String name=sname.get_slicec('/',2); if (type=="icons") { |