[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59249] trunk/blender/intern/cycles/kernel /kernel_types.h: Cycles:

[Thomas Dinges]

Revision: 59249
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59249
Author:   dingto
Date:     2013-08-18 22:25:37 +0000 (Sun, 18 Aug 2013)
Log Message:
-----------
Cycles:
* Fix 16 byte alignment for constant hair kernel data. 

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

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h	2013-08-18 20:49:58 UTC (rev 59248)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h	2013-08-18 22:25:37 UTC (rev 59249)
@@ -804,19 +804,20 @@
 	CURVE_KN_POSTINTERSECTCORRECTION = 32,	/* correct for width after intersect? */
 	CURVE_KN_TRUETANGENTGNORMAL = 64,		/* use tangent normal for geometry? */
 	CURVE_KN_TANGENTGNORMAL = 128,			/* use tangent normal for shader? */
-	CURVE_KN_RIBBONS = 256,				/* use flat curve ribbons */
+	CURVE_KN_RIBBONS = 256,					/* use flat curve ribbons */
 } CurveFlag;
 
 typedef struct KernelCurves {
-	/* strand intersect and normal parameters - many can be changed to flags*/
+	/* strand intersect and normal parameters - many can be changed to flags */
 	float encasing_ratio;
 	int curveflags;
 	int subdivisions;
+	int pad1;
 
 	float minimum_width;
 	float maximum_width;
 	float curve_epsilon;
-	int pad1;
+	int pad2;
 } KernelCurves;
 
 typedef struct KernelBSSRDF {