From 6582215f87015f3909f318a5b8c3b5d48c968424 Mon Sep 17 00:00:00 2001
From: Thomas Dinges <blender@dingto.org>
Date: Thu, 24 Jul 2014 23:07:49 +0200
Subject: Cycles: Updates for new OSL 1.5 API.

Differential Revision: https://developer.blender.org/D662

Patch by Sergey and myself.
---
 intern/cycles/render/osl.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'intern/cycles/render/osl.cpp')

diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 94866102f60..fa7a242e77b 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -248,7 +248,11 @@ void OSLShaderManager::shading_system_free()
 
 bool OSLShaderManager::osl_compile(const string& inputfile, const string& outputfile)
 {
+#if OSL_LIBRARY_VERSION_CODE >= 10500
+	vector<string_view> options;
+#else
 	vector<string> options;
+#endif
 	string stdosl_path;
 
 	/* specify output file name */
-- 
cgit v1.2.3