Revision: 45447
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45447
Author: genscher
Date: 2012-04-06 13:50:26 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
Smoke: Fix for last commit; It wasn't possible to change the particle system
settings anymore. Reported by zeauro. Thanks!
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/makesdna/DNA_smoke_types.h
Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c 2012-04-06
13:49:51 UTC (rev 45446)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2012-04-06
13:50:26 UTC (rev 45447)
@@ -276,13 +276,15 @@
smd->time = scene->r.cfra;
- if (smd->flow->psys && smd->flow->psys->part)
+ if (smd->flow->psys && smd->flow->psys->part &&
!(smd->flow->flags & MOD_SMOKE_FLOW_INIT))
{
// update particle lifetime to be one frame
smd->flow->psys->part->lifetime = 1; // scene->r.efra +
1;
// use "unborn" flag as standard setting
smd->flow->psys->part->flag |= PART_UNBORN;
+
+ smd->flow->flags |= MOD_SMOKE_FLOW_INIT;
}
/*
Modified: trunk/blender/source/blender/makesdna/DNA_smoke_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_smoke_types.h 2012-04-06
13:49:51 UTC (rev 45446)
+++ trunk/blender/source/blender/makesdna/DNA_smoke_types.h 2012-04-06
13:50:26 UTC (rev 45447)
@@ -110,6 +110,7 @@
/* flags */
#define MOD_SMOKE_FLOW_ABSOLUTE (1<<1) /*old style emission*/
#define MOD_SMOKE_FLOW_INITVELOCITY (1<<2) /* passes particles speed to the
smoke */
+#define MOD_SMOKE_FLOW_INIT (1 << 3) /* is the flow object already
initialized? */
typedef struct SmokeFlowSettings {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
