diff options
| author | Daniel Genrich <daniel.genrich@gmx.net> | 2012-11-07 22:11:13 +0400 |
|---|---|---|
| committer | Daniel Genrich <daniel.genrich@gmx.net> | 2012-11-07 22:11:13 +0400 |
| commit | b51908b913f318986a91c766980ed01010c5249a (patch) | |
| tree | a7784dfbd5d5887c6ee0fa0b86f9abe31c38b24a /source/blender/editors/physics/physics_fluid.c | |
| parent | 3e004d304395ba3c6b5969cfa2b1a0b62fb03eb8 (diff) | |
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.
Diffstat (limited to 'source/blender/editors/physics/physics_fluid.c')
| -rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 3 |
1 files changed, 2 insertions, 1 deletions
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); |