spelling: use American spelling for canceled

13 files changed, 23 insertions, 23 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);
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm
index fcf39523917..84b4bb35768 100644
--- a/intern/ghost/intern/GHOST_SystemCocoa.mm
+++ b/intern/ghost/intern/GHOST_SystemCocoa.mm
@@ -517,7 +517,7 @@ int cocoa_request_qtcodec_settings(bContext *C, wmOperator *op)
 
 - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
 {
-	//TODO: implement graceful termination through Cocoa mechanism to avoid session log off to be cancelled
+	//TODO: implement graceful termination through Cocoa mechanism to avoid session log off to be canceled
 	//Note that Cmd+Q is already handled by keyhandler
     if (systemCocoa->handleQuitRequest() == GHOST_kExitNow)
 		return NSTerminateCancel;//NSTerminateNow;
diff --git a/source/blender/blenlib/BLI_task.h b/source/blender/blenlib/BLI_task.h
index f57d42858c7..c9cbaf997fb 100644
--- a/source/blender/blenlib/BLI_task.h
+++ b/source/blender/blenlib/BLI_task.h
@@ -88,8 +88,8 @@ void BLI_task_pool_cancel(TaskPool *pool);
 /* stop all worker threads */
 void BLI_task_pool_stop(TaskPool *pool);
 
-/* for worker threads, test if cancelled */
-bool BLI_task_pool_cancelled(TaskPool *pool);
+/* for worker threads, test if canceled */
+bool BLI_task_pool_canceled(TaskPool *pool);
 
 /* optional userdata pointer to pass along to run function */
 void *BLI_task_pool_userdata(TaskPool *pool);
diff --git a/source/blender/blenlib/intern/task.c b/source/blender/blenlib/intern/task.c
index 7fa108b906f..4ae60abb2c8 100644
--- a/source/blender/blenlib/intern/task.c
+++ b/source/blender/blenlib/intern/task.c
@@ -402,7 +402,7 @@ void BLI_task_pool_stop(TaskPool *pool)
 	BLI_assert(pool->num == 0);
 }
 
-bool BLI_task_pool_cancelled(TaskPool *pool)
+bool BLI_task_pool_canceled(TaskPool *pool)
 {
 	return pool->do_cancel;
 }
diff --git a/source/blender/blenlib/intern/threads.c b/source/blender/blenlib/intern/threads.c
index 64682965649..4361583dafc 100644
--- a/source/blender/blenlib/intern/threads.c
+++ b/source/blender/blenlib/intern/threads.c
@@ -624,7 +624,7 @@ struct ThreadQueue {
 	pthread_cond_t push_cond;
 	pthread_cond_t finish_cond;
 	volatile int nowait;
-	volatile int cancelled;
+	volatile int canceled;
 };
 
 ThreadQueue *BLI_thread_queue_init(void)
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index d6c365e9247..d75c50b3f28 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -3777,7 +3777,7 @@ static int vertex_group_limit_total_exec(bContext *C, wmOperator *op)
 		return OPERATOR_FINISHED;
 	}
 	else {
-		/* note, would normally return cancelled, except we want the redo
+		/* note, would normally return canceled, except we want the redo
 		 * UI to show up for users to change */
 		return OPERATOR_FINISHED;
 	}
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 376847937f3..73b8c47eb63 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -349,7 +349,7 @@ typedef struct TransInfo {
 	float		axis[3];
 	float		axis_orig[3];	/* TransCon can change 'axis', store the original value here */
 
-	short		remove_on_cancel; /* remove elements if operator is cancelled */
+	short		remove_on_cancel; /* remove elements if operator is canceled */
 
 	void		*view;
 	struct bContext *context; /* Only valid (non null) during an operator called function. */
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index f7010898fc3..d3756ea5973 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -4589,7 +4589,7 @@ static void freeSeqData(TransInfo *t)
 			BKE_sequencer_sort(t->scene);
 		}
 		else {
-			/* Cancelled, need to update the strips display */
+			/* Canceled, need to update the strips display */
 			for (a = 0; a < t->total; a++, td++) {
 				seq = ((TransDataSeq *)td->extra)->seq;
 				if ((seq != seq_prev) && (seq->depth == 0)) {
diff --git a/source/blender/makesrna/intern/rna_render.c b/source/blender/makesrna/intern/rna_render.c
index 7ebbcf7b39b..1cd27e27f01 100644
--- a/source/blender/makesrna/intern/rna_render.c
+++ b/source/blender/makesrna/intern/rna_render.c
@@ -395,7 +395,7 @@ static void rna_def_render_engine(BlenderRNA *brna)
 	RNA_def_boolean(func, "cancel", 0, "Cancel", "Don't merge back results");
 
 	func = RNA_def_function(srna, "test_break", "RE_engine_test_break");
-	RNA_def_function_ui_description(func, "Test if the render operation should been cancelled, this is a fast call that should be used regularly for responsiveness");
+	RNA_def_function_ui_description(func, "Test if the render operation should been canceled, this is a fast call that should be used regularly for responsiveness");
 	prop = RNA_def_boolean(func, "do_break", 0, "Break", "");
 	RNA_def_function_return(func, prop);