[Bf-blender-cvs] [e283052] fluid-mantaflow: small fix for obstacle flag

Sebastián Barschkis noreply at git.blender.org
Sun Sep 4 23:25:08 CEST 2016


Commit: e283052af4e6e2f58bb7ba1c386083f4500af8ac
Author: Sebastián Barschkis
Date:   Fri Aug 26 23:39:20 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBe283052af4e6e2f58bb7ba1c386083f4500af8ac

small fix for obstacle flag

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

M	source/blender/blenkernel/intern/smoke.c

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

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 29a551e..d72b205 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -972,7 +972,7 @@ static void update_obstacles(Scene *scene, Object *ob, SmokeDomainSettings *sds,
 	{
 		if (obstacles && obstacles[z] & 8) // Do not delete static obstacles
 		{
-			obstacles[z] = 2; // mantaflow convention (FlagObstacle)
+			obstacles[z] = 4; // mantaflow convention (FlagObstacle)
 		}
 
 		if (velx && velz && velz) {




More information about the Bf-blender-cvs mailing list