Commit: 1e045a241789270cba91f779d4fa1871d6b4c43b
Author: Brecht Van Lommel
Date: Fri Dec 13 19:12:07 2013 +0100
http://developer.blender.org/rB1e045a241789270cba91f779d4fa1871d6b4c43b
Cycles: CUDA runtime kernel compilation can now find CUDA 6.0.
===================================================================
M intern/cycles/util/util_cuda.cpp
===================================================================
diff --git a/intern/cycles/util/util_cuda.cpp b/intern/cycles/util/util_cuda.cpp
index a3b37d2..e914063 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};
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
