[Bf-blender-cvs] [2ae461b] fluid-mantaflow: small clean up. removed 'phi reset' which caused the mesh flickering

Sebastián Barschkis noreply at git.blender.org
Fri Oct 7 00:50:11 CEST 2016


Commit: 2ae461bfb1053bf7659a95283abe930e5b56361a
Author: Sebastián Barschkis
Date:   Tue Oct 4 14:52:10 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB2ae461bfb1053bf7659a95283abe930e5b56361a

small clean up. removed 'phi reset' which caused the mesh flickering

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

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

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

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 3c29c03..3e360b9 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -968,7 +968,6 @@ static void update_obstacles(Scene *scene, Object *ob, SmokeDomainSettings *sds,
 	float *r = smoke_get_color_r(sds->fluid);
 	float *g = smoke_get_color_g(sds->fluid);
 	float *b = smoke_get_color_b(sds->fluid);
-	float *phi = liquid_get_phi(sds->fluid);
 	float *phiObsInit = liquid_get_phiobsinit(sds->fluid);
 	unsigned int z;
 
@@ -1032,9 +1031,6 @@ static void update_obstacles(Scene *scene, Object *ob, SmokeDomainSettings *sds,
 				g[z] = 0;
 				b[z] = 0;
 			}
-			if (phi) {
-				//phi[z] = 0.5; // TODO (sebbas): if enabled this causes the mesh "flickering"
-			}
 		}
 		/* average velocities from multiple obstacles in one cell */
 		if (num_obstacles[z]) {




More information about the Bf-blender-cvs mailing list