diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-03-31 11:12:13 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-03-31 11:12:13 +0300 |
| commit | 4b7d95290f4d7ecf90e0c8e63b47137a0526430f (patch) | |
| tree | 4eb60932d80b7de8feb901ba8e796c158c7dfdf1 /intern/cycles/util | |
| parent | d097c2a1b3155bf287abf72d56e1ab3a57b8b870 (diff) | |
Cycles: More fixes after include changes
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_path.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/util/util_path.cpp b/intern/cycles/util/util_path.cpp index 5c00b0551d8..cd3067f7650 100644 --- a/intern/cycles/util/util_path.cpp +++ b/intern/cycles/util/util_path.cpp @@ -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; } |