Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2013-12-13 22:12:07 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2013-12-13 22:12:07 +0400
commit1e045a241789270cba91f779d4fa1871d6b4c43b (patch)
tree904d6436be4b9276dbce3b61f7803303100e8edc /intern
parent3ec7bc05b78be2782ce8e6ddf4bcc980fa49d79f (diff)
Cycles: CUDA runtime kernel compilation can now find CUDA 6.0.
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/util/util_cuda.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/util_cuda.cpp b/intern/cycles/util/util_cuda.cpp
index a3b37d27239..e9140633e4a 100644
--- a/intern/cycles/util/util_cuda.cpp
+++ b/intern/cycles/util/util_cuda.cpp
@@ -408,8 +408,8 @@ string cuCompilerPath()
"/Developer/NVIDIA/CUDA-5.0/bin",
"/usr/local/cuda-5.0/bin",
"/usr/local/cuda/bin",
- "/Developer/NVIDIA/CUDA-4.2/bin",
- "/usr/local/cuda-4.2/bin",
+ "/Developer/NVIDIA/CUDA-6.0/bin",
+ "/usr/local/cuda-6.0/bin",
"/Developer/NVIDIA/CUDA-5.5/bin",
"/usr/local/cuda-5.5/bin",
NULL};