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/util/util_task.cpp
parent00160d4a1be401b789bc470cc397b1172353b116 (diff)
spelling: use American spelling for canceled
Diffstat (limited to 'intern/cycles/util/util_task.cpp')
-rw-r--r--intern/cycles/util/util_task.cpp4
1 files changed, 2 insertions, 2 deletions
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;
}