Particles

=========

- Fix crash in particle transform with the particle system not editable.
- Particle child distribution and caching is now multithreaded.
- Child particles now have a separate Render Amount next to the existing
  Amount. The render amount particles are now only distributed and cached
  at render time, which should make editing with child particles faster.

- Two new options for diffuse strand shading:
	- Surface Diffuse: computes the strand normal taking the normal at
	  the surface into account.
	- Blending Distance: the distance in Blender units over which to
	  blend in the normal at the surface.
- Special strand rendering for more memory efficient and faster hair and
  grass. This is a work in progress, and has a number of known issues,
  don't report bugs to me for this feature yet.

More info:
http://www.blender.org/development/current-projects/changes-since-244/particles/

2 files changed, 4 insertions, 1 deletions

diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h
index 2d9583af649..d202ea1eed5 100644
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@ -81,6 +81,7 @@ typedef struct RenderLayer {
 	
 	float *rectf;		/* 4 float, standard rgba buffer (read not above!) */
 	float *acolrect;	/* 4 float, optional transparent buffer, needs storage for display updates */
+	float *scolrect;	/* 4 float, optional strand buffer, needs storage for display updates */
 	
 	ListBase passes;
 	
@@ -121,7 +122,7 @@ typedef struct RenderResult {
 } RenderResult;
 
 typedef struct RenderStats {
-	int totface, totvert, tothalo, totlamp, totpart;
+	int totface, totvert, totstrand, tothalo, totlamp, totpart;
 	short curfield, curblur, curpart, partsdone, convertdone;
 	double starttime, lastframetime;
 	char *infostr;
diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h
index 7717d6fdc48..19b5637522e 100644
--- a/source/blender/render/extern/include/RE_shader_ext.h
+++ b/source/blender/render/extern/include/RE_shader_ext.h
@@ -154,6 +154,8 @@ typedef struct ShadeInput
 	/* stored copy of original face normal (facenor) 
 	 * before flipping. Used in Front/back output on geometry node */
 	float orignor[3];
+	/* for strand shading, normal at the surface */
+	float surfnor[3], surfdist;
 
 	/* from initialize, part or renderlayer */
 	short do_preview;		/* for nodes, in previewrender */