[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14700] trunk/blender/source/blender:

[Brecht Van Lommel]

Revision: 14700
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14700
Author:   blendix
Date:     2008-05-05 23:10:32 +0200 (Mon, 05 May 2008)

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

Fix for bug #10542: changing particle visualisation type from object to
something else didn't work correct.
Fix for bug #10478: particle system point cache problem.

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

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-05-05 19:26:10 UTC (rev 14699)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2008-05-05 21:10:32 UTC (rev 14700)
@@ -4763,6 +4763,9 @@
 				psys_update_path_cache(ob,psmd,psys,framenr);
 			}
 
+			cache->simframe= framenr;
+			cache->flag |= PTCACHE_SIMULATION_VALID;
+
 			return;
 		}
 		else if(ob->id.lib || (cache->flag & PTCACHE_BAKED)) {

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c	2008-05-05 19:26:10 UTC (rev 14699)
+++ trunk/blender/source/blender/src/buttons_object.c	2008-05-05 21:10:32 UTC (rev 14700)
@@ -3010,6 +3010,16 @@
 	case B_PART_INIT_CHILD:
 	case B_PART_RECALC_CHILD:
 		if(psys) {
+			nr=0;
+			for(psys=ob->particlesystem.first; psys; psys=psys->next){
+				if(ELEM(psys->part->draw_as,PART_DRAW_OB,PART_DRAW_GR))
+					nr++;
+			}
+			if(nr)
+				ob->transflag |= OB_DUPLIPARTS;
+			else
+				ob->transflag &= ~OB_DUPLIPARTS;
+
 			DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
 			allqueue(REDRAWVIEW3D, 0);
 			allqueue(REDRAWBUTSOBJECT, 0);