Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Genrich <daniel.genrich@gmx.net>2013-05-21 23:52:22 +0400
committerDaniel Genrich <daniel.genrich@gmx.net>2013-05-21 23:52:22 +0400
commit6a290d8e2ac2e23be10dddf086a103df7343a6ed (patch)
tree3e4536068e236f56e9e4805fdc2029801ac1010c /intern/smoke
parent2345f0ee994719f13b74d94331d62b7c7a35e9a2 (diff)
Smoke: Remove accidental leftover code from gSoC Smoke + my Smoke code merge.
Thanks to Miika for pointing this issue out and fixing it.
Diffstat (limited to 'intern/smoke')
-rw-r--r--intern/smoke/intern/FLUID_3D.cpp48
1 files changed, 0 insertions, 48 deletions
diff --git a/intern/smoke/intern/FLUID_3D.cpp b/intern/smoke/intern/FLUID_3D.cpp
index 780a39e9e1b..a43d94a7790 100644
--- a/intern/smoke/intern/FLUID_3D.cpp
+++ b/intern/smoke/intern/FLUID_3D.cpp
@@ -991,59 +991,11 @@ void FLUID_3D::project()
_pressure[index] = 0.0f;
}
-
- /*
- {
- float maxvalue = 0;
- for(unsigned int i = 0; i < _xRes * _yRes * _zRes; i++)
- {
- if(_divergence[i] > maxvalue)
- maxvalue = _divergence[i];
-
- }
- printf("Max divergence: %f\n", maxvalue);
- }
- */
-
copyBorderAll(_pressure, 0, _zRes);
- /*
- {
- float maxvalue = 0;
- for(unsigned int i = 0; i < _xRes * _yRes * _zRes; i++)
- {
- if(_pressure[i] > maxvalue)
- maxvalue = _pressure[i];
- }
- printf("Max pressure BEFORE: %f\n", maxvalue);
- }
- */
-
// solve Poisson equation
solvePressurePre(_pressure, _divergence, _obstacles);
- {
- float maxvalue = 0;
- for(unsigned int i = 0; i < _xRes * _yRes * _zRes; i++)
- {
- if(_pressure[i] > maxvalue)
- maxvalue = _pressure[i];
-
- /* HACK: Animated collision object sometimes result in a non converging solvePressurePre() */
- /*if(_pressure[i] > _dx * _dt)
- _pressure[i] = _dx * _dt;
- else if(_pressure[i] < -_dx * _dt)
- _pressure[i] = -_dx * _dt;*/
-
- // if(_obstacle[i] && _pressure[i] != 0.0)
- // printf("BAD PRESSURE i\n");
-
- // if(_pressure[i]>1)
- // printf("index: %d\n", i);
- }
- // printf("Max pressure: %f, dx: %f\n", maxvalue, _dx);
- }
-
setObstaclePressure(_pressure, 0, _zRes);
// project out solution