[Bf-blender-cvs] [2cd091e9c70] master: Fix Cycles not taking into account CYCLES_SHADER_PATH for finding stdcycles.h

[Brecht Van Lommel]

Commit: 2cd091e9c70974703dd47845c5ad631035b849a4
Author: Brecht Van Lommel
Date:   Tue Jan 12 14:30:35 2021 +0100
Branches: master
https://developer.blender.org/rB2cd091e9c70974703dd47845c5ad631035b849a4

Fix Cycles not taking into account CYCLES_SHADER_PATH for finding stdcycles.h

Contributed by howetuft.

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

===================================================================

M	intern/cycles/render/osl.cpp

===================================================================

diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index bea2c534bd1..35b62746f1b 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -323,7 +323,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/stdcycles.h");
+  stdosl_path = path_join(shader_path, "stdcycles.h");
 
   /* compile */
   OSL::OSLCompiler *compiler = new OSL::OSLCompiler(&OSL::ErrorHandler::default_handler());