blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

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

Contributed by howetuft.

Differential Revision: https://developer.blender.org/D9973
This commit is contained in:
Brecht Van Lommel 2021-01-12 14:30:35 +01:00
parent dc170a6d67
commit 2cd091e9c7
Notes: blender-bot 2023-02-14 07:47:59 +01:00 
Referenced by issue #84717, Shading changes in the viewport shading popup menu require movement in the 3D viewport to take affect.
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/render/osl.cpp
View File

@ -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());