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/

1 files changed, 8 insertions, 6 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index b67cdc61dc6..43bddc275b7 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -6671,6 +6671,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 		Image *ima;
 		Lamp *la;
 		Material *ma;
+		ParticleSettings *part;
 		
 		/* unless the file was created 2.44.3 but not 2.45, update the constraints */
 		if ( !(main->versionfile==244 && main->subversionfile==3) &&
@@ -6833,7 +6834,10 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 				ma->fadeto_mir = MA_RAYMIR_FADETOSKY;
 			}
 		}
-		
+
+		for(part=main->particle.first; part; part=part->id.next)
+			if(part->ren_child_nbr==0)
+				part->ren_child_nbr= part->child_nbr;
 	}
 
 	if ((main->versionfile < 245) || (main->versionfile == 245 && main->subversionfile < 2)) {
@@ -7075,7 +7079,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 
 				/* convert settings from old particle system */
 				/* general settings */
-				part->totpart = paf->totpart;
+				part->totpart = MIN2(paf->totpart, 100000);
 				part->sta = paf->sta;
 				part->end = paf->end;
 				part->lifetime = paf->lifetime;
@@ -7149,7 +7153,6 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 			}
 		}
 
-
 		for(sce= main->scene.first; sce; sce=sce->id.next) {
 			ParticleEditSettings *pset= &sce->toolsettings->particle;
 			int a;
@@ -7184,11 +7187,10 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
 	
 	if ((main->versionfile < 245) || (main->versionfile == 245 && main->subversionfile < 10)) {
 		Object *ob;
+
 		/* dupliface scale */
-		for(ob= main->object.first; ob; ob= ob->id.next) {
+		for(ob= main->object.first; ob; ob= ob->id.next)
 			ob->dupfacesca = 1.0f;
-		}
-
 	}