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>2015-05-26 09:46:11 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-05-26 09:46:33 +0300
commit2c3c477223dfb45df50e6dcac3fd3712c3cf1fb3 (patch)
tree1099cd9bd9955d70ee0176e3786c3bccc6ce945e
parent9b1ca19396e4fb76d1f93469b2425682a8fba69e (diff)
Cleanup: warning, spelling
-rw-r--r--intern/cycles/kernel/split/kernel_scene_intersect.h2
-rw-r--r--source/blender/depsgraph/intern/depsnode.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/kernel/split/kernel_scene_intersect.h b/intern/cycles/kernel/split/kernel_scene_intersect.h
index 6cb3cdcc182..9f4754e8852 100644
--- a/intern/cycles/kernel/split/kernel_scene_intersect.h
+++ b/intern/cycles/kernel/split/kernel_scene_intersect.h
@@ -41,7 +41,7 @@
*
* Note on Queues :
* Ideally we would want kernel_scene_intersect to work on queues.
- * But during the very first time, the queues wil be empty and hence we perform a direct mapping
+ * But during the very first time, the queues will be empty and hence we perform a direct mapping
* between ray-index and thread-index; From the next time onward, the queue will be filled and
* we may start operating on queues.
*
diff --git a/source/blender/depsgraph/intern/depsnode.cc b/source/blender/depsgraph/intern/depsnode.cc
index f4097bca37f..1736aadf999 100644
--- a/source/blender/depsgraph/intern/depsnode.cc
+++ b/source/blender/depsgraph/intern/depsnode.cc
@@ -118,7 +118,7 @@ void TimeSourceDepsNode::tag_update(Depsgraph *graph)
/* Root Node ============================================== */
-RootDepsNode::RootDepsNode() : time_source(NULL), scene(NULL)
+RootDepsNode::RootDepsNode() : scene(NULL), time_source(NULL)
{
}