diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2009-07-31 02:11:28 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2009-07-31 02:11:28 +0400 |
| commit | da4ab9b14b24f8dca873441ba8a842acdbb60098 (patch) | |
| tree | 1422bb13bff7371cbfec1f8983e3ba04ab225cee /intern | |
| parent | 9561d34dbb1adf3c1f6ef3d0f3811171e792a071 (diff) | |
Smoke:
a) Crash fixed when loading files with smoke
b) changed presets to be more low-cpu friendly
c) smoke looks thicker
Unsolved:
a) 3dview of smoke changes weirdly when looking at front/back. Just move around a cube with smoke and you know what I mean - odd shading. If someone likes to take a look: draw_object.c -> search for "smoke" there
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/smoke/intern/VEC3.h | 2 | ||||
| -rw-r--r-- | intern/smoke/intern/smoke_API.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/intern/smoke/intern/VEC3.h b/intern/smoke/intern/VEC3.h index cc89b234e5a..607f68279a2 100644 --- a/intern/smoke/intern/VEC3.h +++ b/intern/smoke/intern/VEC3.h @@ -937,12 +937,14 @@ std::ostream& operator<<( std::ostream& os, const BasicVector::Vector3Dim<Scalar>& i ) { char buf[256]; +#if 0 #if _WIN32 sprintf(buf,globVecFormatStr, (double)i[0],(double)i[1],(double)i[2]); #else snprintf(buf,256,globVecFormatStr, (double)i[0],(double)i[1],(double)i[2]); #endif os << std::string(buf); +#endif return os; } diff --git a/intern/smoke/intern/smoke_API.cpp b/intern/smoke/intern/smoke_API.cpp index cacd58fce13..9c835cf87ee 100644 --- a/intern/smoke/intern/smoke_API.cpp +++ b/intern/smoke/intern/smoke_API.cpp @@ -49,7 +49,6 @@ extern "C" void smoke_free(FLUID_3D *fluid) extern "C" void smoke_step(FLUID_3D *fluid) { - // fluid->addSmokeColumn(); fluid->step(); } |