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-08-23 14:12:48 +0300
committerCampbell Barton <ideasman42@gmail.com>2015-08-23 14:12:48 +0300
commit2672ee77a0f9b3334ccd348ff3618b8df98798b6 (patch)
treec858a095a5f88b52d551a4a94b32af05afe2184e /intern
parent83e16a4a875850cce4aa67675388963267b29e0d (diff)
Cleanup: spelling/style
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/device/device_opencl.cpp2
-rw-r--r--intern/cycles/kernel/kernel_types.h2
-rw-r--r--intern/cycles/kernel/split/kernel_data_init.h4
-rw-r--r--intern/cycles/kernel/svm/svm_types.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 94e53b71479..c3392d27b2c 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -1606,7 +1606,7 @@ protected:
* mega kernel is not getting feature-based optimizations.
*
* Ideally we need always compile kernel with as less features
- * enabed as possible to keep performance at it's max.
+ * enabled as possible to keep performance at it's max.
*/
return "";
}
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index acd2f5d0673..740a5f1f5d3 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -1036,7 +1036,7 @@ enum QueueNumber {
* contribution for AO are enqueued here.
*/
QUEUE_SHADOW_RAY_CAST_DL_RAYS = 3, /* All rays for which a shadow ray should be cast to determine radiance
- * contributuin for direct lighting are enqueued here.
+ * contributing for direct lighting are enqueued here.
*/
};
diff --git a/intern/cycles/kernel/split/kernel_data_init.h b/intern/cycles/kernel/split/kernel_data_init.h
index 421e2356f9b..4dab79a5c67 100644
--- a/intern/cycles/kernel/split/kernel_data_init.h
+++ b/intern/cycles/kernel/split/kernel_data_init.h
@@ -31,7 +31,7 @@
* Un-initialized Ray --------------| |--- Initialized Ray
* Un-initialized PathState --------| |--- Initialized PathState
* Un-initialized QueueData --------| |--- Initialized QueueData (to QUEUE_EMPTY_SLOT)
- * Un-initilaized QueueIndex -------| |--- Initialized QueueIndex (to 0)
+ * Un-initialized QueueIndex -------| |--- Initialized QueueIndex (to 0)
* Un-initialized use_queues_flag---| |--- Initialized use_queues_flag (to false)
* Un-initialized ray_state --------| |--- Initialized ray_state
* parallel_samples --------------- | |--- Initialized per_sample_output_buffers
@@ -383,7 +383,7 @@ ccl_device void kernel_data_init(
&Ray_coop[ray_index]);
if(Ray_coop[ray_index].t != 0.0f) {
- /* Initialize throuput, L_transparent, Ray, PathState;
+ /* Initialize throughput, L_transparent, Ray, PathState;
* These rays proceed with path-iteration.
*/
throughput_coop[ray_index] = make_float3(1.0f, 1.0f, 1.0f);
diff --git a/intern/cycles/kernel/svm/svm_types.h b/intern/cycles/kernel/svm/svm_types.h
index 641d30a5737..bf7e067616f 100644
--- a/intern/cycles/kernel/svm/svm_types.h
+++ b/intern/cycles/kernel/svm/svm_types.h
@@ -46,7 +46,7 @@ CCL_NAMESPACE_BEGIN
#define NODE_FEATURE_HAIR (1 << 1)
#define NODE_FEATURE_BUMP (1 << 2)
/* TODO(sergey): Consider using something like ((uint)(-1)).
- * Need to ceck carefully operand types around usage of this
+ * Need to check carefully operand types around usage of this
* define first.
*/
#define NODE_FEATURE_ALL (NODE_FEATURE_VOLUME|NODE_FEATURE_HAIR|NODE_FEATURE_BUMP)