Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <jacques@blender.org>2020-03-27 14:39:21 +0300
committerJacques Lucke <jacques@blender.org>2020-03-27 14:41:14 +0300
commit31bd8e6bf3aeecf7968249c7b7e832fc639a52d5 (patch)
treeb3edefdc6fd96cc2350ab6e9b1e9d78c99bc9f43 /source/blender/blenkernel/intern/fluid.c
parent7fd71c1694ebd2d20f9aa8bf594be0b24bd690b9 (diff)
Fix T74642: Take gravity field weight into account
Reviewers: sebbas Differential Revision: https://developer.blender.org/D7227
Diffstat (limited to 'source/blender/blenkernel/intern/fluid.c')
-rw-r--r--source/blender/blenkernel/intern/fluid.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 310410d8e0f..b8d9718920e 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -497,6 +497,8 @@ static void manta_set_domain_gravity(Scene *scene, FluidDomainSettings *mds)
copy_v3_v3(mds->gravity, gravity);
}
+
+ mul_v3_fl(mds->gravity, mds->effector_weights->global_gravity);
}
static bool BKE_fluid_modifier_init(