[Bf-blender-cvs] [2c3c477] master: Cleanup: warning, spelling
Campbell Barton
noreply at git.blender.org
Tue May 26 08:46:59 CEST 2015
Commit: 2c3c477223dfb45df50e6dcac3fd3712c3cf1fb3
Author: Campbell Barton
Date: Tue May 26 16:46:11 2015 +1000
Branches: master
https://developer.blender.org/rB2c3c477223dfb45df50e6dcac3fd3712c3cf1fb3
Cleanup: warning, spelling
===================================================================
M intern/cycles/kernel/split/kernel_scene_intersect.h
M source/blender/depsgraph/intern/depsnode.cc
===================================================================
diff --git a/intern/cycles/kernel/split/kernel_scene_intersect.h b/intern/cycles/kernel/split/kernel_scene_intersect.h
index 6cb3cdc..9f4754e 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 f4097bc..1736aad 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)
{
}
More information about the Bf-blender-cvs
mailing list