archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cycles: More fixes after include changes

Browse Source
This commit is contained in:
Mai Lavelle
2017-03-31 10:12:13 +02:00
committed by Sergey Sharybin
parent d097c2a1b3
commit 4b7d95290f
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
intern/cycles/util/util_path.cpp
View File

@@ -320,17 +320,18 @@ static char *path_specials(const string& sub)
{
static bool env_init = false;
static char *env_shader_path;
static char *env_kernel_path;
static char *env_source_path;
if(!env_init) {
env_shader_path = getenv("CYCLES_SHADER_PATH");
env_kernel_path = getenv("CYCLES_KERNEL_PATH");
/* NOTE: It is KERNEL in env variable for compatibility reasons. */
env_source_path = getenv("CYCLES_KERNEL_PATH");
env_init = true;
}
if(env_shader_path != NULL && sub == "shader") {
return env_shader_path;
}
else if(env_shader_path != NULL && sub == "kernel") {
return env_kernel_path;
else if(env_shader_path != NULL && sub == "source") {
return env_source_path;
}
return NULL;
}