From b51908b913f318986a91c766980ed01010c5249a Mon Sep 17 00:00:00 2001 From: Daniel Genrich Date: Wed, 7 Nov 2012 18:11:13 +0000 Subject: [PATCH] Bugfix [#32939] Fluid sim reversed on X and Y with animated Control object Bug was introduced in r48531 by accident since fluid control object abuse a variable for another flag which got reset. --- source/blender/editors/physics/physics_fluid.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 218af8f0f33..7cd153d9564 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -574,7 +574,8 @@ static void export_fluid_objects(ListBase *fobjects, Scene *scene, int length) fsmesh.channelScale = NULL; /* Override user settings, only noslip is supported here! */ - fsmesh.obstacleType = FLUIDSIM_OBSTACLE_NOSLIP; + if (fsmesh.type != OB_FLUIDSIM_CONTROL) + fsmesh.obstacleType = FLUIDSIM_OBSTACLE_NOSLIP; } elbeemAddMesh(&fsmesh);