[Bf-blender-cvs] [c9365e2] master: Cycles: Cleanup, spelling and indentation
Sergey Sharybin
noreply at git.blender.org
Thu Jan 14 13:02:00 CET 2016
Commit: c9365e25a99c0905b85d8af32e488bb592799ec0
Author: Sergey Sharybin
Date: Thu Jan 14 17:01:39 2016 +0500
Branches: master
https://developer.blender.org/rBc9365e25a99c0905b85d8af32e488bb592799ec0
Cycles: Cleanup, spelling and indentation
===================================================================
M intern/cycles/kernel/kernel_camera.h
M intern/cycles/kernel/svm/svm_closure.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_camera.h b/intern/cycles/kernel/kernel_camera.h
index 033c3fc..fd1d854 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 2120c89..d87bc65 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));
More information about the Bf-blender-cvs
mailing list