[Bf-blender-cvs] [aab52d938f5] fluid-mantaflow: fixed domain border collision key mapping

Sebastián Barschkis noreply at git.blender.org
Fri Jun 9 22:40:31 CEST 2017


Commit: aab52d938f5f2643b79ac4f89c095d9400ac528f
Author: Sebastián Barschkis
Date:   Fri Jun 9 22:40:19 2017 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBaab52d938f5f2643b79ac4f89c095d9400ac528f

fixed domain border collision key mapping

textual descriptions of borders did not match blender views

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

M	intern/mantaflow/intern/FLUID.cpp

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

diff --git a/intern/mantaflow/intern/FLUID.cpp b/intern/mantaflow/intern/FLUID.cpp
index 4e818b2cc43..a668922a335 100644
--- a/intern/mantaflow/intern/FLUID.cpp
+++ b/intern/mantaflow/intern/FLUID.cpp
@@ -555,16 +555,16 @@ std::string FLUID::getRealValue(const std::string& varName,  SmokeModifierData *
 		ss << (((smd->domain->border_collisions & closedDomain) == closedDomain) ? "False" : "True");
 	} else if (varName == "BOUNDCONDITIONS") {
 		if (smd->domain->manta_solver_res == 2) {
-			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_BACK) == 0) ss << "x";
-			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_FRONT) == 0) ss << "X";
-			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_LEFT) == 0) ss << "y";
-			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_RIGHT) == 0) ss << "Y";
+			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_LEFT) == 0) ss << "x";
+			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_RIGHT) == 0) ss << "X";
+			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_FRONT) == 0) ss << "y";
+			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_BACK) == 0) ss << "Y";
 		}
 		if (smd->domain->manta_solver_res == 3) {
-			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_BACK) == 0) ss << "x";
-			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_FRONT) == 0) ss << "X";
-			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_LEFT) == 0) ss << "y";
-			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_RIGHT) == 0) ss << "Y";
+			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_LEFT) == 0) ss << "x";
+			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_RIGHT) == 0) ss << "X";
+			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_FRONT) == 0) ss << "y";
+			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_BACK) == 0) ss << "Y";
 			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_BOTTOM) == 0) ss << "z";
 			if ((smd->domain->border_collisions & MOD_SMOKE_BORDER_TOP) == 0) ss << "Z";
 		}




More information about the Bf-blender-cvs mailing list