[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60939] trunk/blender: spelling: use American spelling for canceled
Campbell Barton
ideasman42 at gmail.com
Sat Oct 26 03:06:19 CEST 2013
Revision: 60939
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60939
Author: campbellbarton
Date: 2013-10-26 01:06:19 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
spelling: use American spelling for canceled
Modified Paths:
--------------
trunk/blender/intern/cycles/app/cycles_standalone.cpp
trunk/blender/intern/cycles/bvh/bvh_build.cpp
trunk/blender/intern/cycles/device/device_cpu.cpp
trunk/blender/intern/cycles/util/util_task.cpp
trunk/blender/intern/cycles/util/util_task.h
trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
trunk/blender/source/blender/blenlib/BLI_task.h
trunk/blender/source/blender/blenlib/intern/task.c
trunk/blender/source/blender/blenlib/intern/threads.c
trunk/blender/source/blender/editors/object/object_vgroup.c
trunk/blender/source/blender/editors/transform/transform.h
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/makesrna/intern/rna_render.c
Modified: trunk/blender/intern/cycles/app/cycles_standalone.cpp
===================================================================
--- trunk/blender/intern/cycles/app/cycles_standalone.cpp 2013-10-26 01:03:16 UTC (rev 60938)
+++ trunk/blender/intern/cycles/app/cycles_standalone.cpp 2013-10-26 01:06:19 UTC (rev 60939)
@@ -190,7 +190,7 @@
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
Modified: trunk/blender/intern/cycles/bvh/bvh_build.cpp
===================================================================
--- trunk/blender/intern/cycles/bvh/bvh_build.cpp 2013-10-26 01:03:16 UTC (rev 60938)
+++ trunk/blender/intern/cycles/bvh/bvh_build.cpp 2013-10-26 01:06:19 UTC (rev 60939)
@@ -225,7 +225,7 @@
task_pool.wait_work();
}
- /* delete if we cancelled */
+ /* delete if we canceled */
if(rootnode) {
if(progress.get_cancel()) {
rootnode->deleteSubtree();
Modified: trunk/blender/intern/cycles/device/device_cpu.cpp
===================================================================
--- trunk/blender/intern/cycles/device/device_cpu.cpp 2013-10-26 01:03:16 UTC (rev 60938)
+++ trunk/blender/intern/cycles/device/device_cpu.cpp 2013-10-26 01:06:19 UTC (rev 60939)
@@ -144,7 +144,7 @@
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 @@
#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 @@
}
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 @@
#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 @@
task.release_tile(tile);
- if(task_pool.cancelled()) {
+ if(task_pool.canceled()) {
if(task.need_finish_queue == false)
break;
}
@@ -302,7 +302,7 @@
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 @@
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 @@
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;
}
}
Modified: trunk/blender/intern/cycles/util/util_task.cpp
===================================================================
--- trunk/blender/intern/cycles/util/util_task.cpp 2013-10-26 01:03:16 UTC (rev 60938)
+++ trunk/blender/intern/cycles/util/util_task.cpp 2013-10-26 01:06:19 UTC (rev 60939)
@@ -136,7 +136,7 @@
assert(num == 0);
}
-bool TaskPool::cancelled()
+bool TaskPool::canceled()
{
return do_cancel;
}
@@ -366,7 +366,7 @@
assert(num == 0);
}
-bool DedicatedTaskPool::cancelled()
+bool DedicatedTaskPool::canceled()
{
return do_cancel;
}
Modified: trunk/blender/intern/cycles/util/util_task.h
===================================================================
--- trunk/blender/intern/cycles/util/util_task.h 2013-10-26 01:03:16 UTC (rev 60938)
+++ trunk/blender/intern/cycles/util/util_task.h 2013-10-26 01:06:19 UTC (rev 60939)
@@ -66,7 +66,7 @@
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 @@
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);
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2013-10-26 01:03:16 UTC (rev 60938)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCocoa.mm 2013-10-26 01:06:19 UTC (rev 60939)
@@ -517,7 +517,7 @@
- (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;
Modified: trunk/blender/source/blender/blenlib/BLI_task.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_task.h 2013-10-26 01:03:16 UTC (rev 60938)
+++ trunk/blender/source/blender/blenlib/BLI_task.h 2013-10-26 01:06:19 UTC (rev 60939)
@@ -88,8 +88,8 @@
/* 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);
Modified: trunk/blender/source/blender/blenlib/intern/task.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/task.c 2013-10-26 01:03:16 UTC (rev 60938)
+++ trunk/blender/source/blender/blenlib/intern/task.c 2013-10-26 01:06:19 UTC (rev 60939)
@@ -402,7 +402,7 @@
BLI_assert(pool->num == 0);
}
-bool BLI_task_pool_cancelled(TaskPool *pool)
+bool BLI_task_pool_canceled(TaskPool *pool)
{
return pool->do_cancel;
}
Modified: trunk/blender/source/blender/blenlib/intern/threads.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/threads.c 2013-10-26 01:03:16 UTC (rev 60938)
+++ trunk/blender/source/blender/blenlib/intern/threads.c 2013-10-26 01:06:19 UTC (rev 60939)
@@ -624,7 +624,7 @@
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)
Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c 2013-10-26 01:03:16 UTC (rev 60938)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c 2013-10-26 01:06:19 UTC (rev 60939)
@@ -3777,7 +3777,7 @@
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;
}
Modified: trunk/blender/source/blender/editors/transform/transform.h
===================================================================
--- trunk/blender/source/blender/editors/transform/transform.h 2013-10-26 01:03:16 UTC (rev 60938)
+++ trunk/blender/source/blender/editors/transform/transform.h 2013-10-26 01:06:19 UTC (rev 60939)
@@ -349,7 +349,7 @@
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. */
Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c 2013-10-26 01:03:16 UTC (rev 60938)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2013-10-26 01:06:19 UTC (rev 60939)
@@ -4589,7 +4589,7 @@
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)) {
Modified: trunk/blender/source/blender/makesrna/intern/rna_render.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_render.c 2013-10-26 01:03:16 UTC (rev 60938)
+++ trunk/blender/source/blender/makesrna/intern/rna_render.c 2013-10-26 01:06:19 UTC (rev 60939)
@@ -395,7 +395,7 @@
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);
More information about the Bf-blender-cvs
mailing list