From df1e9b662bd6938f74579cea9d30341f3b6dd02b Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Tue, 11 Feb 2020 21:40:23 -0700 Subject: Cleanup: Fix build warnings from OSL shader compilation There were to copies of stdosl.h one from stock OSL and one in the cycles tree augmented with cycles specific closures. moved the cycles ones to stdcycles.h and copied the stock stdosl.h and accompanying headers from the OSL shader folder. for further details see D6812. Reviewed By: brecht Differential Revision: https://developer.blender.org/D6812 --- intern/cycles/render/osl.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/cycles/render/osl.cpp') diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 1f0a243e6c1..b3916a67f0c 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -319,7 +319,7 @@ bool OSLShaderManager::osl_compile(const string &inputfile, const string &output string include_path_arg = string("-I") + shader_path; options.push_back(include_path_arg); - stdosl_path = path_get("shader/stdosl.h"); + stdosl_path = path_get("shader/stdcycles.h"); /* compile */ OSL::OSLCompiler *compiler = new OSL::OSLCompiler(&OSL::ErrorHandler::default_handler()); -- cgit v1.2.3