[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23717] trunk/blender/source/blender/ blenkernel/intern/smoke.c: Smoke:
Daniel Genrich
daniel.genrich at gmx.net
Thu Oct 8 17:19:57 CEST 2009
Revision: 23717
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23717
Author: genscher
Date: 2009-10-08 17:19:57 +0200 (Thu, 08 Oct 2009)
Log Message:
-----------
Smoke:
* Bugfix for non initialized arrays (reported by nudelZ)
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-10-08 15:02:01 UTC (rev 23716)
+++ trunk/blender/source/blender/blenkernel/intern/smoke.c 2009-10-08 15:19:57 UTC (rev 23717)
@@ -964,8 +964,7 @@
for(z = 0; z < sds->res[2]; z++)
{
EffectedPoint epoint;
- float voxelCenter[3], vel[3], retvel[3];
-
+ float voxelCenter[3] = {0,0,0} , vel[3] = {0,0,0} , retvel[3] = {0,0,0};
unsigned int index = smoke_get_index(x, sds->res[0], y, sds->res[1], z);
if(density[index] < FLT_EPSILON)
@@ -983,9 +982,9 @@
pdDoEffectors(effectors, NULL, sds->effector_weights, &epoint, retvel, NULL);
// TODO dg - do in force!
- force_x[index] += MIN2(MAX2(-1.0, retvel[0] * 0.002), 1.0);
- force_y[index] += MIN2(MAX2(-1.0, retvel[1] * 0.002), 1.0);
- force_z[index] += MIN2(MAX2(-1.0, retvel[2] * 0.002), 1.0);
+ force_x[index] = MIN2(MAX2(-1.0, retvel[0] * 0.2), 1.0);
+ force_y[index] = MIN2(MAX2(-1.0, retvel[1] * 0.2), 1.0);
+ force_z[index] = MIN2(MAX2(-1.0, retvel[2] * 0.2), 1.0);
}
}
More information about the Bf-blender-cvs
mailing list