diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-07 09:47:58 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-07 09:47:58 +0300 |
| commit | 02739bd051744b83aa90097a76d9abf13abac2ca (patch) | |
| tree | ac89ed10d3875ada803bbab979c4adaaa5ca1c0b /intern/cycles | |
| parent | 9f2d33a6524d40c1e01a3fec8dab276094bf9940 (diff) | |
Cycles: Cleanup, use "string_" prefix for functions in util_string
No functional changes, just makes it easier to track where the function
is coming from.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/device/device.cpp | 8 | ||||
| -rw-r--r-- | intern/cycles/util/util_string.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/util/util_string.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/device/device.cpp b/intern/cycles/device/device.cpp index f3fd462d4c1..929f810eaa1 100644 --- a/intern/cycles/device/device.cpp +++ b/intern/cycles/device/device.cpp @@ -44,13 +44,13 @@ std::ostream& operator <<(std::ostream &os, /* TODO(sergey): Decode bitflag into list of names. */ os << "Nodes features: " << requested_features.nodes_features << std::endl; os << "Use hair: " - << bool_to_string(requested_features.use_hair) << std::endl; + << string_from_bool(requested_features.use_hair) << std::endl; os << "Use object motion: " - << bool_to_string(requested_features.use_object_motion) << std::endl; + << string_from_bool(requested_features.use_object_motion) << std::endl; os << "Use camera motion: " - << bool_to_string(requested_features.use_camera_motion) << std::endl; + << string_from_bool(requested_features.use_camera_motion) << std::endl; os << "Use Baking: " - << bool_to_string(requested_features.use_baking) << std::endl; + << string_from_bool(requested_features.use_baking) << std::endl; return os; } diff --git a/intern/cycles/util/util_string.cpp b/intern/cycles/util/util_string.cpp index a3b35346d76..17235283d68 100644 --- a/intern/cycles/util/util_string.cpp +++ b/intern/cycles/util/util_string.cpp @@ -122,7 +122,7 @@ string string_remove_trademark(const string &s) return string_strip(result); } -string bool_to_string(bool var) +string string_from_bool(bool var) { if(var) return "True"; diff --git a/intern/cycles/util/util_string.h b/intern/cycles/util/util_string.h index 2b493a2b1a0..b863368ab22 100644 --- a/intern/cycles/util/util_string.h +++ b/intern/cycles/util/util_string.h @@ -44,7 +44,7 @@ void string_replace(string& haystack, const string& needle, const string& other) bool string_endswith(const string& s, const char *end); string string_strip(const string& s); string string_remove_trademark(const string& s); -string bool_to_string(bool var); +string string_from_bool(const bool var); CCL_NAMESPACE_END |