Merge pull request #17 from johnhaddon/appleseedUpdate

Fix OSL string params when they are empty or contain spaces.
GafferHQ · Nov 1, 2016 · e47b939 · e47b939
2 parents 9413ed6 + c74b181
commit e47b939
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/appleseed-1.5.2-beta/src/appleseed/renderer/modeling/shadergroup/shaderparamparser.cpp b/appleseed-1.5.2-beta/src/appleseed/renderer/modeling/shadergroup/shaderparamparser.cpp
@@ -43,6 +43,7 @@ namespace renderer
 //
 
 ShaderParamParser::ShaderParamParser(const string& s)
+  : m_original_string(s)
 {
     tokenize(s, Blanks, m_tokens);
 
@@ -106,12 +107,9 @@ string ShaderParamParser::parse_string_value()
 {
     assert(param_type() == OSLParamTypeString);
 
-    const string val(*m_tok_it++);
-
-    if (m_tok_it != m_tok_end)
-        throw ExceptionOSLParamParseError();
-
-    return val;
+    // Remove the string prefix and trim whitespace.
+    string val(m_original_string, 6, string::npos);
+    return trim_both(val);
 }
 
 }   // namespace renderer
diff --git a/appleseed-1.5.2-beta/src/appleseed/renderer/modeling/shadergroup/shaderparamparser.h b/appleseed-1.5.2-beta/src/appleseed/renderer/modeling/shadergroup/shaderparamparser.h
@@ -84,6 +84,7 @@ class ShaderParamParser
     std::string parse_string_value();
 
   private:
+    std::string m_original_string;
     std::vector<std::string>                    m_tokens;
     OSLParamType                                m_param_type;
     std::vector<std::string>::const_iterator    m_tok_it;