[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23229] trunk/blender/source/blender/ blenkernel/intern/smoke.c: Smoke:
Daniel Genrich
daniel.genrich at gmx.net
Mon Sep 14 19:22:51 CEST 2009
Revision: 23229
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23229
Author: genscher
Date: 2009-09-14 19:22:51 +0200 (Mon, 14 Sep 2009)
Log Message:
-----------
Smoke:
* Only simulate smoke when starting from startframe
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/smoke.c
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c 2009-09-14 17:13:58 UTC (rev 23228)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2009-09-14 17:22:51 UTC (rev 23229)
@@ -1123,18 +1123,23 @@
cache_wt = sds->point_cache[1];
BKE_ptcache_id_from_smoke_turbulence(&pid_wt, ob, smd);
+ if(!smd->domain->fluid)
+ {
+ BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED);
+ BKE_ptcache_id_reset(scene, &pid_wt, PTCACHE_RESET_OUTDATED);
+ }
+
if(framenr < startframe)
return;
if(framenr > endframe)
return;
- if(!smd->domain->fluid)
- {
- BKE_ptcache_id_reset(scene, &pid, PTCACHE_RESET_OUTDATED);
- BKE_ptcache_id_reset(scene, &pid_wt, PTCACHE_RESET_OUTDATED);
- }
+ if(!smd->domain->fluid && (framenr != startframe))
+ return;
+ // printf("startframe: %d, framenr: %d\n", startframe, framenr);
+
if(!smokeModifier_init(smd, ob, scene, dm))
{
printf("bad smokeModifier_init\n");
More information about the Bf-blender-cvs
mailing list