Commit: 240ed366ce700f0894779b627ccd490f9c7ac168
Author: Sebastián Barschkis
Date: Fri May 27 10:39:03 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB240ed366ce700f0894779b627ccd490f9c7ac168
disabling smoke and fire grid 'ensures' for now - conflict with liquids
===================================================================
M source/blender/blenkernel/intern/smoke.c
===================================================================
diff --git a/source/blender/blenkernel/intern/smoke.c
b/source/blender/blenkernel/intern/smoke.c
index d50cacf..41e1aa1 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -2387,16 +2387,17 @@ static void update_flowsfluids(Scene *scene, Object
*ob, SmokeDomainSettings *sd
}
#else
/* Initialize new data fields if any */
- 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);
- }
+// 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);
+// }
#endif
sds->active_fields = active_fields;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
