[Bf-blender-cvs] [dbf8380] fluid-mantaflow: updated ui wavelet noise and readme issue section

[Sebastián Barschkis]

Commit: dbf83809532d46bda41c412a29cdf78951f7d151
Author: Sebastián Barschkis
Date:   Sat Jan 16 22:04:33 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBdbf83809532d46bda41c412a29cdf78951f7d151

updated ui wavelet noise and readme issue section

===================================================================

M	intern/smoke/intern/WTURBULENCE.cpp
M	intern/smoke/intern/scenarios/smoke.h
M	readme.md
M	release/scripts/startup/bl_ui/properties_physics_smoke.py

===================================================================

diff --git a/intern/smoke/intern/WTURBULENCE.cpp b/intern/smoke/intern/WTURBULENCE.cpp
index ff7553a..3ce12cc 100644
--- a/intern/smoke/intern/WTURBULENCE.cpp
+++ b/intern/smoke/intern/WTURBULENCE.cpp
@@ -1246,11 +1246,6 @@ WTURBULENCE::WTURBULENCE(int xResSm, int yResSm, int zResSm, int amplify, int no
 	// allocate high resolution density field
 	_totalStepsBig = 0;
 	_densityBig = NULL;
-	_densityBigOld = new float[_totalCellsBig];
-	
-	for(int i = 0; i < _totalCellsBig; i++) {
-		_densityBigOld[i] = 0.;
-	}
 	
 	_flameBig = _fuelBig = _reactBig = NULL;
 	using_fire = false;
@@ -1325,19 +1320,19 @@ WTURBULENCE::~WTURBULENCE()
 	PyRun_SimpleString(del_base_grids_high.c_str());
 	PyGILState_Release(gilstate);
 	
-	delete[] _densityBig;
+//	delete[] _densityBig;
 //	delete[] _densityBigOld;
-	if (_flameBig) delete[] _flameBig;
-	if (_fuelBig) delete[] _fuelBig;
+//	if (_flameBig) delete[] _flameBig;
+//	if (_fuelBig) delete[] _fuelBig;
 //	if (_fuelBigOld) delete[] _fuelBigOld;
-	if (_reactBig) delete[] _reactBig;
+//	if (_reactBig) delete[] _reactBig;
 //	if (_reactBigOld) delete[] _reactBigOld;
 	
-	if (_color_rBig) delete[] _color_rBig;
+//	if (_color_rBig) delete[] _color_rBig;
 //	if (_color_rBigOld) delete[] _color_rBigOld;
-	if (_color_gBig) delete[] _color_gBig;
+//	if (_color_gBig) delete[] _color_gBig;
 //	if (_color_gBigOld) delete[] _color_gBigOld;
-	if (_color_bBig) delete[] _color_bBig;
+//	if (_color_bBig) delete[] _color_bBig;
 //	if (_color_bBigOld) delete[] _color_bBigOld;
 	
 	delete[] _tcU;
diff --git a/intern/smoke/intern/scenarios/smoke.h b/intern/smoke/intern/scenarios/smoke.h
index 13a95d9..ef2e6db 100644
--- a/intern/smoke/intern/scenarios/smoke.h
+++ b/intern/smoke/intern/scenarios/smoke.h
@@ -347,7 +347,7 @@ def step_low():\n\
   \n\
   print('Vorticity')\n\
   if vorticity > 0.01:\n\
-    vorticityConfinement( vel=vel, flags=flags, strength=$VORTICITY$ )\n\
+    vorticityConfinement(vel=vel, flags=flags, strength=$VORTICITY$)\n\
   # TODO: print('Forcefield')\n\
   # TODO: addForceField(flags=flags, vel=vel, force=forces)\n\
   # TODO: forces.clear()\n\
diff --git a/readme.md b/readme.md
index 05d780e..1952bb9 100644
--- a/readme.md
+++ b/readme.md
@@ -97,7 +97,9 @@ Some fire renderings can be found on [Vimeo](https://vimeo.com/sebbas/videos). F
 
 So, for now, don't let the animation loop to often ;)
 
-- The Mantaflow script that you obtain when exporting in Blender is *not* compatible with the current official Mantaflow [distribution](http://mantaflow.com/download.html). We still need to merge it with the Blender development branch in Mantaflow.
+- The Mantaflow script that you obtain when exporting in Blender is *not* compatible with the current, official Mantaflow [distribution](http://mantaflow.com/download.html). We still need to merge it with the Blender development branch in Mantaflow.
+
+- Wavelet turbulence flickers at intersection "cached <-> uncached" when animation was not cached entirely (Probably because of uncached uvGrids ...) 
 
 ## Troubleshooting
 
diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py
index 516805e..64a46ad 100644
--- a/release/scripts/startup/bl_ui/properties_physics_smoke.py
+++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py
@@ -456,12 +456,14 @@ class PHYSICS_PT_smoke_manta_settings(PhysicButtonsPanel, Panel):
         split = layout.split()
         col = split.column()
         col.label("Wavelet Noise")
+        col.active = domain.use_high_resolution
         col.prop(domain, "noise_clamp", text="Clamp")
         sub = col.column()
         sub.active = domain.noise_clamp
         sub.prop(domain, "noise_clamp_neg", text="Clamp Neg")
         sub.prop(domain, "noise_clamp_pos", text="Clamp Pos")
         col = split.column()
+        col.active = domain.use_high_resolution
         col.label("")
         col.prop(domain, "noise_val_scale", text="Scale")
         col.prop(domain, "noise_val_offset", text="Offset")