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
path: root/intern
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2015-12-02 05:15:52 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-12-02 05:15:52 +0300
commitfc9505c9c5d513bc756f147dff4509a05123dc71 (patch)
tree8350dee688df8b8ed47cde70c90f86417d008924 /intern
parent5cbf58ce8b5463a0c3296a753c26615c357aca17 (diff)
Cleanup: warnings & spelling
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/geom/geom_qbvh.h2
-rw-r--r--intern/cycles/render/graph.cpp2
-rw-r--r--intern/cycles/util/util_math_fast.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/geom/geom_qbvh.h b/intern/cycles/kernel/geom/geom_qbvh.h
index 37deaac0800..2a2d7822eee 100644
--- a/intern/cycles/kernel/geom/geom_qbvh.h
+++ b/intern/cycles/kernel/geom/geom_qbvh.h
@@ -19,7 +19,7 @@ struct QBVHStackItem {
float dist;
};
-/* TOOD(sergey): Investigate if using instrinsics helps for both
+/* TOOD(sergey): Investigate if using intrinsics helps for both
* stack item swap and float comparison.
*/
ccl_device_inline void qbvh_item_swap(QBVHStackItem *__restrict a,
diff --git a/intern/cycles/render/graph.cpp b/intern/cycles/render/graph.cpp
index 2977555b410..ffd99626f81 100644
--- a/intern/cycles/render/graph.cpp
+++ b/intern/cycles/render/graph.cpp
@@ -631,7 +631,7 @@ void ShaderGraph::break_cycles(ShaderNode *node, vector<bool>& visited, vector<b
void ShaderGraph::clean(Scene *scene)
{
/* Graph simplification:
- * 1: Remove unnecesarry nodes
+ * 1: Remove unnecessary nodes
* 2: Constant folding
* 3: Simplification
* 4: De-duplication
diff --git a/intern/cycles/util/util_math_fast.h b/intern/cycles/util/util_math_fast.h
index 867de78e7a6..efe0698e1dc 100644
--- a/intern/cycles/util/util_math_fast.h
+++ b/intern/cycles/util/util_math_fast.h
@@ -247,7 +247,7 @@ ccl_device float fast_sinpif(float x)
* The basic idea of this approximation starts with the coarse approximation:
* sin(pi*x) ~= f(x) = 4 * (x - x * abs(x))
*
- * This approximation always _over_ estimates the target. On the otherhand,
+ * This approximation always _over_ estimates the target. On the other hand,
* the curve:
* sin(pi*x) ~= f(x) * abs(f(x)) / 4
*