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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-01-14 15:01:39 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-01-14 15:01:56 +0300
commitc9365e25a99c0905b85d8af32e488bb592799ec0 (patch)
tree7d7cdbd4f6b75999bfc76aa02e11c3b880caf2a0 /intern
parent3ba9742be244db4ef24e271fd97eb490fdef7d0d (diff)
Cycles: Cleanup, spelling and indentation
Diffstat (limited to 'intern')
-rw-r--r--intern/cycles/kernel/kernel_camera.h2
-rw-r--r--intern/cycles/kernel/svm/svm_closure.h4
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h
index 033c3fc7785..fd1d854a0ff 100644
--- a/intern/cycles/kernel/kernel_camera.h
+++ b/intern/cycles/kernel/kernel_camera.h
@@ -295,7 +295,7 @@ ccl_device void camera_sample(KernelGlobals *kg, int x, int y, float filter_u, f
}
else {
/* TODO(sergey): Such lookup is unneeded when there's rolling shutter
- * effect in use but rollign shutter duration is set to 0.0.
+ * effect in use but rolling shutter duration is set to 0.0.
*/
const int shutter_table_offset = kernel_data.cam.shutter_table_offset;
ray->time = lookup_table_read(kg, time, shutter_table_offset, SHUTTER_TABLE_SIZE);
diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h
index 2120c892490..d87bc650566 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -437,9 +437,9 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
#ifdef __SUBSURFACE__
#ifndef __SPLIT_KERNEL__
# define sc_next(sc) sc++
-# else
+#else
# define sc_next(sc) sc = ccl_fetch_array(sd, closure, ccl_fetch(sd, num_closure))
-# endif
+#endif
case CLOSURE_BSSRDF_CUBIC_ID:
case CLOSURE_BSSRDF_GAUSSIAN_ID: {
ShaderClosure *sc = ccl_fetch_array(sd, closure, ccl_fetch(sd, num_closure));