[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12969] trunk/blender/source/blender/ blenkernel/intern:

[Brecht Van Lommel]

Revision: 12969
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12969
Author:   blendix
Date:     2007-12-21 11:57:02 +0100 (Fri, 21 Dec 2007)

Log Message:
-----------

Bugfix for strand simplification, without random distribution enabled.
Bugfix (hopefully) for missing strands on render bug, probably related
to preview render.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/particle.c
    trunk/blender/source/blender/blenkernel/intern/particle_system.c

Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle.c	2007-12-21 09:30:37 UTC (rev 12968)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c	2007-12-21 10:57:02 UTC (rev 12969)
@@ -257,8 +257,8 @@
 		return 0;
 
 	psmd= psys_get_modifier(ob, psys);
-	if(G.rendering) {
-		if(!psys->renderdata || !(psmd->modifier.mode & eModifierMode_Render))
+	if(psys->renderdata) {
+		if(!(psmd->modifier.mode & eModifierMode_Render))
 			return 0;
 	}
 	else if(!(psmd->modifier.mode & eModifierMode_Realtime))

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2007-12-21 09:30:37 UTC (rev 12968)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2007-12-21 10:57:02 UTC (rev 12969)
@@ -1124,7 +1124,7 @@
 	for(i=0;i<tot; i++)
 		sum[i+1]= sum[i]+weight[i]*totweight;
 	
-	if(part->flag&PART_TRAND){
+	if((part->flag&PART_TRAND) || (part->simplify_flag&PART_SIMPLIFY_ENABLE)) {
 		float pos;
 
 		for(p=0; p<totpart; p++) {