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

Daniel Genrich daniel.genrich at gmx.net
Tue Jul 27 18:18:12 CEST 2010


Revision: 30813
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30813
Author:   genscher
Date:     2010-07-27 18:18:12 +0200 (Tue, 27 Jul 2010)

Log Message:
-----------
Smoke:
- Bugfix for using uninitalised velocity in case of PART_PHYS_NO (reported by MiikaH)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/smoke.c
    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	2010-07-27 16:09:02 UTC (rev 30812)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c	2010-07-27 16:18:12 UTC (rev 30813)
@@ -937,12 +937,11 @@
 
 
 								// Uses particle velocity as initial velocity for smoke
-								if(sfs->flags & MOD_SMOKE_FLOW_INITVELOCITY) {
-
+								if(sfs->flags & MOD_SMOKE_FLOW_INITVELOCITY && (psys->part->phystype != PART_PHYS_NO))
+								{
 									velocity_x[index] = pa->state.vel[0]*sfs->vel_multi;
 									velocity_y[index] = pa->state.vel[1]*sfs->vel_multi;
 									velocity_z[index] = pa->state.vel[2]*sfs->vel_multi;
-
 								}										
 							
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_modifier.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2010-07-27 16:09:02 UTC (rev 30812)
+++ trunk/blender/source/blender/makesrna/intern/rna_modifier.c	2010-07-27 16:18:12 UTC (rev 30813)
@@ -252,7 +252,6 @@
 					part->sta = 1.0f;
 					part->end = 250.0f;
 					part->ren_as = PART_DRAW_NOT;
-					part->phystype = PART_PHYS_NO;
 					sprintf(psys->name, "SmokeParticles");
 					psys->recalc |= (PSYS_RECALC_RESET|PSYS_RECALC_PHYS);
 					DAG_id_flush_update(ptr->id.data, OB_RECALC_DATA);





More information about the Bf-blender-cvs mailing list