[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28349] trunk/blender/source/blender/ blenkernel/intern/pointcache.c: only override start and end frames with particle' s if the partices are emitters.

[Campbell Barton]

Revision: 28349
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28349
Author:   campbellbarton
Date:     2010-04-22 18:23:44 +0200 (Thu, 22 Apr 2010)

Log Message:
-----------
only override start and end frames with particle's if the partices are emitters. Was very confusing for hair baking.

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

Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c	2010-04-22 16:22:47 UTC (rev 28348)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c	2010-04-22 16:23:44 UTC (rev 28349)
@@ -2397,8 +2397,13 @@
 		/* cache/bake a single object */
 		cache = pid->cache;
 		if((cache->flag & PTCACHE_BAKED)==0) {
-			if(pid->type==PTCACHE_TYPE_PARTICLES)
-				psys_get_pointcache_start_end(scene, pid->calldata, &cache->startframe, &cache->endframe);
+			if(pid->type==PTCACHE_TYPE_PARTICLES) {
+				ParticleSystem *psys= pid->calldata;
+
+				/* a bit confusing, could make this work better in the UI */
+				if(psys->part->type == PART_EMITTER)
+					psys_get_pointcache_start_end(scene, pid->calldata, &cache->startframe, &cache->endframe);
+			}
 			else if(pid->type == PTCACHE_TYPE_SMOKE_HIGHRES) {
 				/* get all pids from the object and search for smoke low res */
 				ListBase pidlist2;