[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46417] trunk/blender/source/blender: Fix reseting of particle lifetime and unborn feature when adding smoke - reported by blendernation

[Daniel Genrich]

Revision: 46417
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46417
Author:   genscher
Date:     2012-05-08 11:39:32 +0000 (Tue, 08 May 2012)
Log Message:
-----------
Fix reseting of particle lifetime and unborn feature when adding smoke - reported by blendernation

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/smoke.c
    trunk/blender/source/blender/makesdna/DNA_smoke_types.h
    trunk/blender/source/blender/makesrna/intern/rna_modifier.c

Modified: trunk/blender/source/blender/blenkernel/intern/smoke.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/smoke.c	2012-05-08 11:18:20 UTC (rev 46416)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2012-05-08 11:39:32 UTC (rev 46417)
@@ -279,29 +279,6 @@
 
 		smd->time = scene->r.cfra;
 
-		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;
-		}
-
-/*
-		if(!smd->flow->bvh)
-		{
-			// smd->flow->bvh = MEM_callocN(sizeof(BVHTreeFromMesh), "smoke_bvhfromfaces");
-			// bvhtree_from_mesh_faces(smd->flow->bvh, dm, 0.0, 2, 6);
-
-			// copy obmat
-			// copy_m4_m4(smd->flow->mat, ob->obmat);
-			// copy_m4_m4(smd->flow->mat_old, ob->obmat);
-		}
-*/
-
 		return 1;
 	}
 	else if((smd->type & MOD_SMOKE_TYPE_COLL))

Modified: trunk/blender/source/blender/makesdna/DNA_smoke_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_smoke_types.h	2012-05-08 11:18:20 UTC (rev 46416)
+++ trunk/blender/source/blender/makesdna/DNA_smoke_types.h	2012-05-08 11:39:32 UTC (rev 46417)
@@ -115,9 +115,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 {
 	struct SmokeModifierData *smd; /* for fast RNA access */
 	struct ParticleSystem *psys;

Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2012-05-08 11:18:20 UTC (rev 46416)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2012-05-08 11:39:32 UTC (rev 46417)
@@ -282,6 +282,7 @@
 					part->sta = 1.0f;
 					part->end = 250.0f;
 					part->ren_as = PART_DRAW_NOT;
+					part->flag |= PART_UNBORN;
 					part->draw_as = PART_DRAW_DOT;
 					BLI_strncpy(psys->name, "SmokeParticles", sizeof(psys->name));
 					psys->recalc |= (PSYS_RECALC_RESET|PSYS_RECALC_PHYS);