diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-10-26 05:06:19 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-26 05:06:19 +0400 |
| commit | 48c1e0c0fcb66502026721a50ae5e17470aee816 (patch) | |
| tree | 94e812e78479df2d84dc8d0faccad212ca6fde56 /intern/cycles/device/device_cpu.cpp | |
| parent | 00160d4a1be401b789bc470cc397b1172353b116 (diff) | |
spelling: use American spelling for canceled
Diffstat (limited to 'intern/cycles/device/device_cpu.cpp')
| -rw-r--r-- | intern/cycles/device/device_cpu.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/intern/cycles/device/device_cpu.cpp b/intern/cycles/device/device_cpu.cpp index b1dbdec9d36..d04c5df82fb 100644 --- a/intern/cycles/device/device_cpu.cpp +++ b/intern/cycles/device/device_cpu.cpp @@ -144,7 +144,7 @@ public: void thread_path_trace(DeviceTask& task) { - if(task_pool.cancelled()) { + if(task_pool.canceled()) { if(task.need_finish_queue == false) return; } @@ -166,7 +166,7 @@ public: #ifdef WITH_OPTIMIZED_KERNEL if(system_cpu_support_sse3()) { for(int sample = start_sample; sample < end_sample; sample++) { - if (task.get_cancel() || task_pool.cancelled()) { + if (task.get_cancel() || task_pool.canceled()) { if(task.need_finish_queue == false) break; } @@ -185,7 +185,7 @@ public: } else if(system_cpu_support_sse2()) { for(int sample = start_sample; sample < end_sample; sample++) { - if (task.get_cancel() || task_pool.cancelled()) { + if (task.get_cancel() || task_pool.canceled()) { if(task.need_finish_queue == false) break; } @@ -206,7 +206,7 @@ public: #endif { for(int sample = start_sample; sample < end_sample; sample++) { - if (task.get_cancel() || task_pool.cancelled()) { + if (task.get_cancel() || task_pool.canceled()) { if(task.need_finish_queue == false) break; } @@ -226,7 +226,7 @@ public: task.release_tile(tile); - if(task_pool.cancelled()) { + if(task_pool.canceled()) { if(task.need_finish_queue == false) break; } @@ -302,7 +302,7 @@ public: for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++) { kernel_cpu_sse3_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x); - if(task_pool.cancelled()) + if(task_pool.canceled()) break; } } @@ -310,7 +310,7 @@ public: for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++) { kernel_cpu_sse2_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x); - if(task_pool.cancelled()) + if(task_pool.canceled()) break; } } @@ -320,7 +320,7 @@ public: for(int x = task.shader_x; x < task.shader_x + task.shader_w; x++) { kernel_cpu_shader(&kg, (uint4*)task.shader_input, (float4*)task.shader_output, task.shader_eval_type, x); - if(task_pool.cancelled()) + if(task_pool.canceled()) break; } } |