diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2018-10-22 19:19:06 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2018-10-22 19:19:06 +0300 |
| commit | 4bf4da12de92989d5708be8b6f14c3536e872836 (patch) | |
| tree | 350389c61578756f963a581ed140c3bf41264e69 /intern | |
| parent | 9d81e937d234f8c2be38550d25fcb0945066fb25 (diff) | |
| parent | 86dbbd156fafccea7bfcf3207c8486fb2098b341 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/CMakeLists.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index 9a09b1e6f1b..54d14f63cd2 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -3,7 +3,14 @@ if(NOT WITH_BLENDER AND WITH_CYCLES_STANDALONE) set(CYCLES_INSTALL_PATH "") else() set(WITH_CYCLES_BLENDER ON) - set(CYCLES_INSTALL_PATH "scripts/addons/cycles") + # WINDOWS_PYTHON_DEBUG needs to write into the user addons folder since it will + # be started with --env-system-scripts pointing to the release folder, which will + # lack the cycles addon, and we don't want to write into it. + if(NOT WINDOWS_PYTHON_DEBUG) + set(CYCLES_INSTALL_PATH "scripts/addons/cycles") + else() + set(CYCLES_INSTALL_PATH "$ENV{appdata}/blender foundation/blender/${BLENDER_VERSION}/scripts/addons/cycles") + endif() endif() # External Libraries |