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

Cycles OpenCL: use #line directives for better error messages.

Browse Source
This commit is contained in:
Brecht Van Lommel
2016-07-30 16:54:48 +02:00
parent 6dc72b3ce6
commit 1e2efbc908
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,7 +74,10 @@ bool string_iequals(const string& a, const string& b)
return false;
}
void string_split(vector<string>& tokens, const string& str, const string& separators)
void string_split(vector<string>& tokens,
const string& str,
const string& separators,
bool skip_empty_tokens)
{
size_t token_start = 0, token_length = 0;
for(size_t i = 0; i < str.size(); ++i) {
@@ -87,9 +90,9 @@ void string_split(vector<string>& tokens, const string& str, const string& separ
}
else {
/* Current character is a separator,
* append current token to the list (if token is not empty).
* append current token to the list.
*/
if(token_length > 0) {
if(!skip_empty_tokens || token_length > 0) {
string token = str.substr(token_start, token_length);
tokens.push_back(token);
}