[Bf-blender-cvs] [328855b] fluid-mantaflow: bound / border condition fixes

[Sebastián Barschkis]

Commit: 328855b18dae48cf7e29738d1622dc79a209e584
Author: Sebastián Barschkis
Date:   Wed Jan 13 00:34:32 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB328855b18dae48cf7e29738d1622dc79a209e584

bound / border condition fixes

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

M	intern/smoke/intern/MANTA.cpp

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

diff --git a/intern/smoke/intern/MANTA.cpp b/intern/smoke/intern/MANTA.cpp
index f00f883..5984f1a 100644
--- a/intern/smoke/intern/MANTA.cpp
+++ b/intern/smoke/intern/MANTA.cpp
@@ -481,13 +481,14 @@ std::string Manta_API::get_real_value( const std::string& varName, SmokeModifier
 	} else if (varName == "VORTICITY") {
 		ss << smd->domain->vorticity / smd->domain->fluid->_constantScaling;
 	} else if (varName == "BOUNDCONDITIONS") {
-		if (smd->domain->border_collisions == SM_BORDER_OPEN) ss << "xXyY";
-		else if (smd->domain->border_collisions == SM_BORDER_VERTICAL) ss << "zZ";
-		else if (smd->domain->border_collisions == SM_BORDER_CLOSED) ss << "";
-		
+		if (smd->domain->manta_solver_res == 2) {
+			if (smd->domain->border_collisions == SM_BORDER_OPEN) ss << "xXyY";
+			else if (smd->domain->border_collisions == SM_BORDER_VERTICAL) ss << "yY";
+			else if (smd->domain->border_collisions == SM_BORDER_CLOSED) ss << "";
+		}
 		if (smd->domain->manta_solver_res == 3) {
-			if(smd->domain->border_collisions == SM_BORDER_OPEN) ss << "zZ";
-			else if (smd->domain->border_collisions == SM_BORDER_VERTICAL) ss << "";
+			if(smd->domain->border_collisions == SM_BORDER_OPEN) ss << "xXyYzZ";
+			else if (smd->domain->border_collisions == SM_BORDER_VERTICAL) ss << "zZ";
 			else if (smd->domain->border_collisions == SM_BORDER_CLOSED) ss << "";
 		}
 	}
@@ -611,8 +612,10 @@ void Manta_API::manta_export_script(SmokeModifierData *smd)
 		manta_script += alloc_fire_high;
 	}
 
-	// Rest of low res setup
-	manta_script += prep_domain_high + wavelet_turbulence_noise;
+	// Rest of high res setup
+	if (smd->domain->flags & MOD_SMOKE_HIGHRES) {
+		manta_script += prep_domain_high + wavelet_turbulence_noise;
+	}
 	
 	// Noise low
 	// TODO. Maybe drop this grid, because it can only be used for inflow