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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2014-08-02 10:53:52 +0400
committerCampbell Barton <ideasman42@gmail.com>2014-08-02 10:53:52 +0400
commit9c3025cd26d547667847c81ec53b503d876be906 (patch)
tree2103a0a15061dac143e686873694846e94441f32 /intern/cycles/device/device_cuda.cpp
parent7b83e3d6d7880124be4ed36d81c92953ec88bad0 (diff)
Spelling
Diffstat (limited to 'intern/cycles/device/device_cuda.cpp')
-rw-r--r--intern/cycles/device/device_cuda.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/device/device_cuda.cpp b/intern/cycles/device/device_cuda.cpp
index 1c7f3a05b0b..f0f32f87eed 100644
--- a/intern/cycles/device/device_cuda.cpp
+++ b/intern/cycles/device/device_cuda.cpp
@@ -732,8 +732,8 @@ public:
const int start = task.shader_x;
const int end = task.shader_x + task.shader_w;
- bool cancelled = false;
- for(int sample = 0; sample < task.num_samples && !cancelled; sample++) {
+ bool canceled = false;
+ for(int sample = 0; sample < task.num_samples && !canceled; sample++) {
for(int shader_x = start; shader_x < end; shader_x += shader_chunk_size) {
int shader_w = min(shader_chunk_size, end - shader_x);
@@ -760,7 +760,7 @@ public:
cuda_assert(cuCtxSynchronize());
if(task.get_cancel()) {
- cancelled = false;
+ canceled = false;
break;
}
}
@@ -907,7 +907,7 @@ public:
cuda_push_context();
- /* for multi devices, this assumes the ineffecient method that we allocate
+ /* for multi devices, this assumes the inefficient method that we allocate
* all pixels on the device even though we only render to a subset */
size_t offset = 4*y*w;