Revision: 48044 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48044 Author: genscher Date: 2012-06-18 16:07:07 +0000 (Mon, 18 Jun 2012) Log Message: ----------- - Fix exploding Smoke with moving obstacles: Enable "#if"-ed velocity constrain code
Modified Paths: -------------- branches/smoke2/intern/smoke/intern/FLUID_3D.cpp Modified: branches/smoke2/intern/smoke/intern/FLUID_3D.cpp =================================================================== --- branches/smoke2/intern/smoke/intern/FLUID_3D.cpp 2012-06-18 16:02:36 UTC (rev 48043) +++ branches/smoke2/intern/smoke/intern/FLUID_3D.cpp 2012-06-18 16:07:07 UTC (rev 48044) @@ -863,7 +863,7 @@ } float scale = 1.0; // DG TODO: make this global and incooperate this into other functions - +#if USE_NEW_CG == 1 for (z = 0; z < _zRes; z++) for (y = 0; y < _yRes; y++) for (x = 0; x < _xRes; x++) @@ -971,7 +971,7 @@ for (x = 0; x < _xRes; x++) if (!_obstacles[FINDEX(x,y,z)]) b[gti(FINDEX(x, y, z))] = _divergence[FINDEX(x,y,z)]; - +#endif // copyBorderAll(_pressure, 0, _zRes); // solve Poisson equation @@ -1017,7 +1017,7 @@ } #endif -#if 0 +#if 1 { float maxvalue = 0; for(unsigned int i = 0; i < _xRes * _yRes * _zRes; i++) _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs