diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-21 16:02:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-21 16:02:38 +0300 |
| commit | c054a1a84867e652cd737cdab7ca790b6e038303 (patch) | |
| tree | 34dc2614a32aad4dd3ad8afc5df8768edededaae /intern/cycles/device/device_cuda.cpp | |
| parent | d5552a6d4ba5bb4ac34fe149c2ac9d7ff3f723fe (diff) | |
| parent | a4f08297ed3c201c66a340e5261cac0aeb68b523 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
| -rw-r--r-- | intern/cycles/device/device_cuda.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp index 3ba5a8de8ff..656ad07d657 100644 --- a/intern/cycles/device/device_cuda.cpp +++ b/intern/cycles/device/device_cuda.cpp @@ -385,7 +385,7 @@ public: VLOG(1) << "Found nvcc " << nvcc << ", CUDA version " << cuda_version << "."; - const int major = cuda_version / 10, minor = cuda_version & 10; + const int major = cuda_version / 10, minor = cuda_version % 10; if(cuda_version == 0) { cuda_error_message("CUDA nvcc compiler version could not be parsed."); return false; |