[Bf-blender-cvs] [333366d] master: Cycles: Fix typo in shader cancel routines
Sergey Sharybin
noreply at git.blender.org
Thu Sep 29 15:48:44 CEST 2016
Commit: 333366dbcf56c30bc9dbd0e43ec57401e34cb798
Author: Sergey Sharybin
Date: Thu Sep 29 15:48:10 2016 +0200
Branches: master
https://developer.blender.org/rB333366dbcf56c30bc9dbd0e43ec57401e34cb798
Cycles: Fix typo in shader cancel routines
===================================================================
M intern/cycles/device/device_cuda.cpp
===================================================================
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 147e21d..7f8a0bf 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -993,7 +993,7 @@ public:
cuda_assert(cuCtxSynchronize());
if(task.get_cancel()) {
- canceled = false;
+ canceled = true;
break;
}
}
More information about the Bf-blender-cvs
mailing list