diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-02 04:10:03 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-09-02 04:10:03 +0400 |
commit | 3c7dcd7a471002efef504a2b0856a86b76cdfaf5 (patch) | |
tree | 1ef2b57fe9e89669891eb02fb4676d28ce2b6288 /intern/cycles/util/util_string.cpp | |
parent | 5feb921eba6b954c838724880aeda2576106089d (diff) |
Cycles: compile opencl kernels in non-blocking thread, and don't crash on
build failure but show error message in status text.
Diffstat (limited to 'intern/cycles/util/util_string.cpp')
-rw-r--r-- | intern/cycles/util/util_string.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/util_string.cpp b/intern/cycles/util/util_string.cpp index aaa482eec0d..0dac9a8142a 100644 --- a/intern/cycles/util/util_string.cpp +++ b/intern/cycles/util/util_string.cpp @@ -77,11 +77,11 @@ bool string_iequals(const string& a, const string& b) return false; } -void string_split(vector<string>& tokens, const string& str) +void string_split(vector<string>& tokens, const string& str, const string& separators) { vector<string> split; - boost::split(split, str, boost::is_any_of("\t "), boost::token_compress_on); + boost::split(split, str, boost::is_any_of(separators), boost::token_compress_on); foreach(const string& token, split) if(token != "") |