[Bf-blender-cvs] [a29e47a] fluid-mantaflow: re-enabled smoke ensure functions

[Sebastián Barschkis]

Commit: a29e47ad2361eba66c9daa6a22edd65173c9e2dd
Author: Sebastián Barschkis
Date:   Thu Jun 2 23:02:44 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBa29e47ad2361eba66c9daa6a22edd65173c9e2dd

re-enabled smoke ensure functions

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

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

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

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index d89b40a..93d83ac 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2417,17 +2417,16 @@ static void update_flowsfluids(Scene *scene, Object *ob, SmokeDomainSettings *sd
 	}
 #else
 	/* Initialize new data fields if any */
-//	TODO (sebbas) disabled during liquid integration
-//	if (active_fields & SM_ACTIVE_HEAT) {
-//		smoke_ensure_heat(sds->fluid, sds->smd);
-//	}
-//	if (active_fields & SM_ACTIVE_FIRE) {
-//		smoke_ensure_fire(sds->fluid, sds->smd);
-//	}
-//	if (active_fields & SM_ACTIVE_COLORS) {
-//		/* initialize all smoke with "active_color" */
-//		smoke_ensure_colors(sds->fluid, sds->smd);
-//	}
+	if (active_fields & SM_ACTIVE_HEAT) {
+		smoke_ensure_heat(sds->fluid, sds->smd);
+	}
+	if (active_fields & SM_ACTIVE_FIRE) {
+		smoke_ensure_fire(sds->fluid, sds->smd);
+	}
+	if (active_fields & SM_ACTIVE_COLORS) {
+		/* initialize all smoke with "active_color" */
+		smoke_ensure_colors(sds->fluid, sds->smd);
+	}
 #endif
 
 	sds->active_fields = active_fields;