Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-10-26 05:06:19 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-10-26 05:06:19 +0400
commit48c1e0c0fcb66502026721a50ae5e17470aee816 (patch)
tree94e812e78479df2d84dc8d0faccad212ca6fde56 /intern/cycles/app/cycles_standalone.cpp
parent00160d4a1be401b789bc470cc397b1172353b116 (diff)
spelling: use American spelling for canceled
Diffstat (limited to 'intern/cycles/app/cycles_standalone.cpp')
-rw-r--r--intern/cycles/app/cycles_standalone.cpp2
1 files changed, 1 insertions, 1 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