spelling: use American spelling for canceled
authorCampbell Barton <ideasman42@gmail.com>
Sat, 26 Oct 2013 01:06:19 +0000 (01:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 26 Oct 2013 01:06:19 +0000 (01:06 +0000)
13 files changed:
intern/cycles/app/cycles_standalone.cpp
intern/cycles/bvh/bvh_build.cpp
intern/cycles/device/device_cpu.cpp
intern/cycles/util/util_task.cpp
intern/cycles/util/util_task.h
intern/ghost/intern/GHOST_SystemCocoa.mm
source/blender/blenlib/BLI_task.h
source/blender/blenlib/intern/task.c
source/blender/blenlib/intern/threads.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/intern/rna_render.c

index 2a438397ae07dd27ab51ff66f6f916ac11d8c3a5..6b201017c4671b4216e42f3498a34c9a3aec85bf 100644 (file)
@@ -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
 
index 2c3c31b5429b424a12868aad79ec635d23442808..b21b20a87e511e4d95c8711de1e52e769bce2dc8 100644 (file)
@@ -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();
index b1dbdec9d361e5d2d5543c7bb31e0c9e090d7b10..d04c5df82fbeb00bbba578cd0d5c325ece367c54 100644 (file)
@@ -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;
                        }
                }
index e5a5ac8cddfc099edbaac8b8e79043b39f13458a..14a81ecbb05f47be658b7c9cfd72c9de227461bd 100644 (file)
@@ -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;
 }
index 22515e3e43366d62662fabfecab3145af0b29d0b..42a1e2f5a58b4012c93d83b23076f91fb8aa316c 100644 (file)
@@ -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);
index fcf395239171bc12c8a8951d055977fb15a70ee3..84b4bb357682f3cda86a352c27d112f21d09d41b 100644 (file)
@@ -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;
index f57d42858c76bbf8194e080c8b55c17e4c8fd4a4..c9cbaf997fbeb413f5746213f4ff1b5031bb44d6 100644 (file)
@@ -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);
index 7fa108b906fa620aad30e433833105115171a91f..4ae60abb2c8fc32b9d90f0abbfe12cff8885bca3 100644 (file)
@@ -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;
 }
index 646829656496988767f5134fc0057b8ef299a341..4361583dafc904e279a02d36045455777cef9e92 100644 (file)
@@ -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)
index d6c365e9247207f585b86d45dc15c4fd743a4d9f..d75c50b3f28b6c67458789fa23eeb1d5166b85be 100644 (file)
@@ -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;
        }
index 376847937f3c05f4dce0151aba6ca138b3dace96..73b8c47eb63692d15a372a6a38fc738c848d2039 100644 (file)
@@ -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. */
index f7010898fc30d00026104f3cce8f1b1904cb0c36..d3756ea59736e7988ae20577800f6b8e0ca64f50 100644 (file)
@@ -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)) {
index 7ebbcf7b39b2de85ec897a4f289d810d54135e1c..1cd27e27f01050dc2a4d71c106ac278c1aa3a466 100644 (file)
@@ -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);