Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Cleanup, use "string_" prefix for functions in util_string

Browse Source 
No functional changes, just makes it easier to track where the function
is coming from.
This commit is contained in:
Sergey Sharybin
2016-01-07 11:47:58 +05:00
parent 9f2d33a652
commit 02739bd051
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/device/device.cpp
View File

@@ -44,13 +44,13 @@ std::ostream& operator <<(std::ostream &os,
/* TODO(sergey): Decode bitflag into list of names. */ /* TODO(sergey): Decode bitflag into list of names. */
os << "Nodes features: " << requested_features.nodes_features << std::endl; os << "Nodes features: " << requested_features.nodes_features << std::endl;
os << "Use hair: " 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: " 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: " 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: " os << "Use Baking: "
<< bool_to_string(requested_features.use_baking) << std::endl; << string_from_bool(requested_features.use_baking) << std::endl;
return os; return os;
} }

2
intern/cycles/util/util_string.cpp
View File

@@ -122,7 +122,7 @@ string string_remove_trademark(const string &s)
return string_strip(result); return string_strip(result);
} }
string bool_to_string(bool var) string string_from_bool(bool var)
{ {
if(var) if(var)
return "True"; return "True";

2
intern/cycles/util/util_string.h
View File

@@ -44,7 +44,7 @@ void string_replace(string& haystack, const string& needle, const string& other)
bool string_endswith(const string& s, const char *end); bool string_endswith(const string& s, const char *end);
string string_strip(const string& s); string string_strip(const string& s);
string string_remove_trademark(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 CCL_NAMESPACE_END