diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-06-02 18:52:29 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-06-02 18:52:29 +0400 |
| commit | 0fa08424b7a78bbf3fd6eb142d477feb0cca9806 (patch) | |
| tree | 5f2ed5a7b38591458bc32d4f05f2369b2173e162 | |
| parent | 829581bbbd5b30805416e93656e82c86f9830683 (diff) | |
Code cleanup / Cycles:
* Avoid 2 int castings in hair code and fix some comments.
| -rw-r--r-- | intern/cycles/kernel/kernel_bvh.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_curve.h | 4 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_emission.h | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/intern/cycles/kernel/kernel_bvh.h b/intern/cycles/kernel/kernel_bvh.h index a85a4ec9c3f..aff9d586e7a 100644 --- a/intern/cycles/kernel/kernel_bvh.h +++ b/intern/cycles/kernel/kernel_bvh.h @@ -298,7 +298,7 @@ __device_inline void bvh_cardinal_curve_intersect(KernelGlobals *kg, Intersectio /*obtain curve parameters*/ { - /*ray transform created - this shold be created at beginning of intersection loop*/ + /*ray transform created - this should be created at beginning of intersection loop*/ Transform htfm; float d = sqrtf(dir.x * dir.x + dir.z * dir.z); htfm = make_transform( diff --git a/intern/cycles/kernel/kernel_curve.h b/intern/cycles/kernel/kernel_curve.h index dd0c0ac10c2..e065717888c 100644 --- a/intern/cycles/kernel/kernel_curve.h +++ b/intern/cycles/kernel/kernel_curve.h @@ -102,7 +102,7 @@ __device float curve_thickness(KernelGlobals *kg, ShaderData *sd) { float r = 0.0f; - if(sd->segment != (int)~0) { + if(sd->segment != ~0) { float4 curvedata = kernel_tex_fetch(__curves, sd->prim); int k0 = __float_as_int(curvedata.x) + sd->segment; int k1 = k0 + 1; @@ -119,7 +119,7 @@ __device float3 curve_tangent_normal(KernelGlobals *kg, ShaderData *sd) { float3 tgN = make_float3(0.0f,0.0f,0.0f); - if(sd->segment != (int)~0) { + if(sd->segment != ~0) { float normalmix = kernel_data.curve_kernel_data.normalmix; tgN = -(-sd->I - sd->dPdu * (dot(sd->dPdu,-sd->I) * normalmix / len_squared(sd->dPdu))); diff --git a/intern/cycles/kernel/kernel_emission.h b/intern/cycles/kernel/kernel_emission.h index bae1b4743e4..74f768c899c 100644 --- a/intern/cycles/kernel/kernel_emission.h +++ b/intern/cycles/kernel/kernel_emission.h @@ -102,7 +102,7 @@ __device_noinline bool direct_emission(KernelGlobals *kg, ShaderData *sd, int li if(is_zero(light_eval)) return false; - /* todo: use visbility flag to skip lights */ + /* todo: use visibility flag to skip lights */ /* evaluate BSDF at shading point */ float bsdf_pdf; diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 85a4971e8bd..f3bc7f45186 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -748,9 +748,9 @@ typedef enum CurveFlag { /* runtime flags */ CURVE_KN_BACKFACING = 1, /* backside of cylinder? */ CURVE_KN_ENCLOSEFILTER = 2, /* don't consider strands surrounding start point? */ - CURVE_KN_CURVEDATA = 4, /* curve data available? */ - CURVE_KN_INTERPOLATE = 8, /* render as a curve? - not supported yet */ - CURVE_KN_ACCURATE = 16, /* use accurate intersections test? */ + CURVE_KN_CURVEDATA = 4, /* curve data available? */ + CURVE_KN_INTERPOLATE = 8, /* render as a curve? */ + CURVE_KN_ACCURATE = 16, /* use accurate intersections test? */ CURVE_KN_INTERSECTCORRECTION = 32, /* correct for width after determing closest midpoint? */ CURVE_KN_POSTINTERSECTCORRECTION = 64, /* correct for width after intersect? */ CURVE_KN_NORMALCORRECTION = 128, /* correct tangent normal for slope? */ |