[Bf-blender-cvs] [31bd8e6bf3a] master: Fix T74642: Take gravity field weight into account

Jacques Lucke noreply at git.blender.org
Fri Mar 27 12:41:27 CET 2020


Commit: 31bd8e6bf3aeecf7968249c7b7e832fc639a52d5
Author: Jacques Lucke
Date:   Fri Mar 27 12:39:21 2020 +0100
Branches: master
https://developer.blender.org/rB31bd8e6bf3aeecf7968249c7b7e832fc639a52d5

Fix T74642: Take gravity field weight into account

Reviewers: sebbas

Differential Revision: https://developer.blender.org/D7227

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

M	source/blender/blenkernel/intern/fluid.c

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

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(



More information about the Bf-blender-cvs mailing list