Commit: 8ff3cf3e56b4986d34f1da41cb826f90e51d763c
Author: Thomas Dinges
Date: Thu Aug 14 16:31:34 2014 +0200
Branches: master
https://developer.blender.org/rB8ff3cf3e56b4986d34f1da41cb826f90e51d763c
Cleanup: typos and extra brackets.
===================================================================
M intern/cycles/kernel/kernel_light.h
M intern/cycles/kernel/kernel_path.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_light.h
b/intern/cycles/kernel/kernel_light.h
index bf314f4..e7f62f2 100644
--- a/intern/cycles/kernel/kernel_light.h
+++ b/intern/cycles/kernel/kernel_light.h
@@ -27,7 +27,7 @@ typedef struct LightSample {
float pdf; /* light sampling probability density
function */
float eval_fac; /* intensity multiplier */
int object; /* object id for triangle/curve lights
*/
- int prim; /* primitive id for triangle/curve
ligths */
+ int prim; /* primitive id for triangle/curve
lights */
int shader; /* shader id */
int lamp; /* lamp id */
LightType type; /* type of light */
diff --git a/intern/cycles/kernel/kernel_path.h
b/intern/cycles/kernel/kernel_path.h
index 0c033f6..d0e7f97 100644
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -941,7 +941,7 @@ ccl_device float4
kernel_branched_path_integrate(KernelGlobals *kg, RNG *rng, in
/* holdout */
#ifdef __HOLDOUT__
- if((sd.flag & (SD_HOLDOUT|SD_HOLDOUT_MASK))) {
+ if(sd.flag & (SD_HOLDOUT|SD_HOLDOUT_MASK)) {
if(kernel_data.background.transparent) {
float3 holdout_weight;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
