Commit: d5c40c704fd5bed4eb718ae9bb50371ca96ba409 Author: Sergey Sharybin Date: Thu Apr 16 00:11:35 2015 +0500 Branches: cycles_memory_experiments https://developer.blender.org/rBd5c40c704fd5bed4eb718ae9bb50371ca96ba409
Smoke: Fix another crash caused by recent changes Didn't notice initFie and so are called from constructor for some reason.. =================================================================== M intern/smoke/intern/WTURBULENCE.cpp =================================================================== diff --git a/intern/smoke/intern/WTURBULENCE.cpp b/intern/smoke/intern/WTURBULENCE.cpp index 40b687e..8a070ab 100644 --- a/intern/smoke/intern/WTURBULENCE.cpp +++ b/intern/smoke/intern/WTURBULENCE.cpp @@ -53,6 +53,8 @@ static const float persistence = 0.56123f; ////////////////////////////////////////////////////////////////////// WTURBULENCE::WTURBULENCE(int xResSm, int yResSm, int zResSm, int amplify, int noisetype, const char *noisefile_path, int init_fire, int init_colors, int init_sim) { + _need_sim_data = init_sim != 0; + // if noise magnitude is below this threshold, its contribution // is negilgible, so stop evaluating new octaves _cullingThreshold = 1e-3; @@ -141,8 +143,6 @@ WTURBULENCE::WTURBULENCE(int xResSm, int yResSm, int zResSm, int amplify, int no // noise tiles _noiseTile = new float[noiseTileSize * noiseTileSize * noiseTileSize]; setNoise(noisetype, noisefile_path); - - _need_sim_data = init_sim != 0; } void WTURBULENCE::initFire() _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs