[Bf-blender-cvs] [19c0c79] master: Fix T37003, Fix T37859: smoke modifier taking deforming modifiers into account in some cases.

Brecht Van Lommel noreply at git.blender.org
Thu Dec 19 18:30:22 CET 2013


Commit: 19c0c7992a890590914809ac47179c61ce956abd
Author: Brecht Van Lommel
Date:   Thu Dec 19 18:25:14 2013 +0100
http://developer.blender.org/rB19c0c7992a890590914809ac47179c61ce956abd

Fix T37003, Fix T37859: smoke modifier taking deforming modifiers into account
in some cases.

The smoke modifier now ignores the modifier evaluation for generated texture
coordinates, which would previously cause the undeformed mesh to be cached for
flow objects. Dynamic paint has a similar exception, and other physics systems
avoid it by not being a constructive modifier.

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

M	source/blender/modifiers/intern/MOD_smoke.c

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

diff --git a/source/blender/modifiers/intern/MOD_smoke.c b/source/blender/modifiers/intern/MOD_smoke.c
index 3e107b7..0fff0b3 100644
--- a/source/blender/modifiers/intern/MOD_smoke.c
+++ b/source/blender/modifiers/intern/MOD_smoke.c
@@ -101,10 +101,13 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md)
 
 static DerivedMesh *applyModifier(ModifierData *md, Object *ob, 
                                   DerivedMesh *dm,
-                                  ModifierApplyFlag UNUSED(flag))
+                                  ModifierApplyFlag flag)
 {
 	SmokeModifierData *smd = (SmokeModifierData *) md;
 
+	if(flag & MOD_APPLY_ORCO)
+		return dm;
+
 	return smokeModifier_do(smd, md->scene, ob, dm);
 }




More information about the Bf-blender-cvs mailing list