spelling: use American spelling for canceled

5 files changed, 14 insertions, 14 deletions

diff --git a/intern/cycles/app/cycles_standalone.cpp b/intern/cycles/app/cycles_standalone.cpp
index 2a438397ae0..6b201017c46 100644
--- a/intern/cycles/app/cycles_standalone.cpp
+++ b/intern/cycles/app/cycles_standalone.cpp
@@ -190,7 +190,7 @@ static void keyboard(unsigned char key)
 	if(key == 'r')
 		options.session->reset(session_buffer_params(), options.session_params.samples);
 	else if(key == 27) // escape
-		options.session->progress.set_cancel("Cancelled");
+		options.session->progress.set_cancel("Canceled");
 }
 #endif
 
diff --git a/intern/cycles/bvh/bvh_build.cpp b/intern/cycles/bvh/bvh_build.cpp
index 2c3c31b5429..b21b20a87e5 100644
--- a/intern/cycles/bvh/bvh_build.cpp
+++ b/intern/cycles/bvh/bvh_build.cpp
@@ -225,7 +225,7 @@ BVHNode* BVHBuild::run()
 		task_pool.wait_work();
 	}
 
-	/* delete if we cancelled */
+	/* delete if we canceled */
 	if(rootnode) {
 		if(progress.get_cancel()) {
 			rootnode->deleteSubtree();
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;
 			}
 		}
diff --git a/intern/cycles/util/util_task.cpp b/intern/cycles/util/util_task.cpp
index e5a5ac8cddf..14a81ecbb05 100644
--- a/intern/cycles/util/util_task.cpp
+++ b/intern/cycles/util/util_task.cpp
@@ -136,7 +136,7 @@ void TaskPool::stop()
 	assert(num == 0);
 }
 
-bool TaskPool::cancelled()
+bool TaskPool::canceled()
 {
 	return do_cancel;
 }
@@ -366,7 +366,7 @@ void DedicatedTaskPool::stop()
 	assert(num == 0);
 }
 
-bool DedicatedTaskPool::cancelled()
+bool DedicatedTaskPool::canceled()
 {
 	return do_cancel;
 }
diff --git a/intern/cycles/util/util_task.h b/intern/cycles/util/util_task.h
index 22515e3e433..42a1e2f5a58 100644
--- a/intern/cycles/util/util_task.h
+++ b/intern/cycles/util/util_task.h
@@ -66,7 +66,7 @@ public:
 	void cancel();		/* cancel all tasks, keep worker threads running */
 	void stop();		/* stop all worker threads */
 
-	bool cancelled();	/* for worker threads, test if cancelled */
+	bool canceled();	/* for worker threads, test if canceled */
 
 protected:
 	friend class TaskScheduler;
@@ -142,7 +142,7 @@ public:
 	void cancel();		/* cancel all tasks, keep worker thread running */
 	void stop();		/* stop worker thread */
 
-	bool cancelled();	/* for worker thread, test if cancelled */
+	bool canceled();	/* for worker thread, test if canceled */
 
 protected:
 	void num_decrease(int done);