[Bf-blender-cvs] [39f65a9] fluid-mantaflow: adapted obstacle flags for mantaflow

Sebastián Barschkis noreply at git.blender.org
Mon Apr 25 16:24:39 CEST 2016


Commit: 39f65a97d2f63ba3aaf34b942d8109883d546364
Author: Sebastián Barschkis
Date:   Mon Apr 25 16:23:10 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB39f65a97d2f63ba3aaf34b942d8109883d546364

adapted obstacle flags for mantaflow

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

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

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

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 385f439..76f2eb5 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -791,10 +791,10 @@ static void obstacles_from_derivedmesh_task_cb(void *userdata, const int z)
 				}
 
 				/* tag obstacle cells */
-				data->obstacle_map[index] = 1;
+				data->obstacle_map[index] = 2;
 
 				if (data->has_velocity)
-					data->obstacle_map[index] |= 8;
+					data->obstacle_map[index] = 4;
 			}
 		}
 	}
@@ -914,9 +914,9 @@ static void update_obstacles(Scene *scene, Object *ob, SmokeDomainSettings *sds,
 	// TODO: delete old obstacle flags
 	for (z = 0; z < sds->res[0] * sds->res[1] * sds->res[2]; z++)
 	{
-		if (obstacles[z] & 8) // Do not delete static obstacles
+		if (obstacles[z] == 4) // Do not delete static obstacles
 		{
-			obstacles[z] = 0;
+			obstacles[z] = 2;
 		}
 
 		velx[z] = 0;
@@ -948,7 +948,7 @@ static void update_obstacles(Scene *scene, Object *ob, SmokeDomainSettings *sds,
 	/* obstacle cells should not contain any velocity from the smoke simulation */
 	for (z = 0; z < sds->res[0] * sds->res[1] * sds->res[2]; z++)
 	{
-		if (obstacles[z])
+		if (obstacles[z] & 2)
 		{
 			velxOrig[z] = 0;
 			velyOrig[z] = 0;




More information about the Bf-blender-cvs mailing list