[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57190] trunk/blender/intern/cycles/kernel : Code cleanup / Cycles:

[Thomas Dinges]

Revision: 57190
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57190
Author:   dingto
Date:     2013-06-02 14:52:29 +0000 (Sun, 02 Jun 2013)
Log Message:
-----------
Code cleanup / Cycles:
* Avoid 2 int castings in hair code and fix some comments. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_bvh.h
    trunk/blender/intern/cycles/kernel/kernel_curve.h
    trunk/blender/intern/cycles/kernel/kernel_emission.h
    trunk/blender/intern/cycles/kernel/kernel_types.h

Modified: trunk/blender/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_bvh.h	2013-06-02 11:42:04 UTC (rev 57189)
+++ trunk/blender/intern/cycles/kernel/kernel_bvh.h	2013-06-02 14:52:29 UTC (rev 57190)
@@ -298,7 +298,7 @@
 
 	/*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(

Modified: trunk/blender/intern/cycles/kernel/kernel_curve.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_curve.h	2013-06-02 11:42:04 UTC (rev 57189)
+++ trunk/blender/intern/cycles/kernel/kernel_curve.h	2013-06-02 14:52:29 UTC (rev 57190)
@@ -102,7 +102,7 @@
 {
 	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 @@
 {	
 	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)));

Modified: trunk/blender/intern/cycles/kernel/kernel_emission.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_emission.h	2013-06-02 11:42:04 UTC (rev 57189)
+++ trunk/blender/intern/cycles/kernel/kernel_emission.h	2013-06-02 14:52:29 UTC (rev 57190)
@@ -102,7 +102,7 @@
 	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;

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2013-06-02 11:42:04 UTC (rev 57189)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2013-06-02 14:52:29 UTC (rev 57190)
@@ -748,9 +748,9 @@
 	/* 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? */