Commit: 831332dfbb8535ad2ed25388deb4338c5a6470e1
Author: Sebastián Barschkis
Date: Sun Oct 23 13:55:15 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB831332dfbb8535ad2ed25388deb4338c5a6470e1
small clean up
===================================================================
M intern/mantaflow/intern/FLUID.cpp
M intern/mantaflow/intern/strings/shared_script.h
===================================================================
diff --git a/intern/mantaflow/intern/FLUID.cpp
b/intern/mantaflow/intern/FLUID.cpp
index 6f70cf1..098bccd 100644
--- a/intern/mantaflow/intern/FLUID.cpp
+++ b/intern/mantaflow/intern/FLUID.cpp
@@ -512,7 +512,7 @@ std::string FLUID::getRealValue(const std::string& varName,
SmokeModifierData *
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_VERTICAL) ss << "xX";
+ else if (smd->domain->border_collisions ==
SM_BORDER_HORIZONTAL) ss << "xX";
else if (smd->domain->border_collisions ==
SM_BORDER_CLOSED) ss << "";
}
if (smd->domain->manta_solver_res == 3) {
diff --git a/intern/mantaflow/intern/strings/shared_script.h
b/intern/mantaflow/intern/strings/shared_script.h
index 60979b4..4c20665 100644
--- a/intern/mantaflow/intern/strings/shared_script.h
+++ b/intern/mantaflow/intern/strings/shared_script.h
@@ -87,7 +87,7 @@ s.timestep = dt0\n";
const std::string fluid_adaptive_time_stepping_high = "\n\
mantaMsg('Adaptive time stepping high')\n\
xl.frameLength = s.frameLength\n\
-xl.timestepMin = s.timestepMin / 10\n\
+xl.timestepMin = s.timestepMin\n\
xl.timestepMax = s.timestepMax\n\
xl.cfl = s.cfl\n";
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
