diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2010-09-09 11:52:35 +0400 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2010-09-09 11:52:35 +0400 |
| commit | a755f9f7ede2e60afa964460e00f613790bf064e (patch) | |
| tree | dd6902ad813e6f09f7583d316591507a01c10fa7 /source/blender/blenkernel/intern/effect.c | |
| parent | 45cf7633fec697fcfcf9ed8985a2a7e1ebfa01a8 (diff) | |
Fix for [#23734] Force Fields Min/Max don't work
*Special case for planar vortex field
Diffstat (limited to 'source/blender/blenkernel/intern/effect.c')
| -rw-r--r-- | source/blender/blenkernel/intern/effect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 6f6d405dd90..05fcabd371f 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -667,10 +667,10 @@ int get_effector_data(EffectorCache *eff, EffectorData *efd, EffectedPoint *poin /* for vortex the shape chooses between old / new force */ if(eff->pd && eff->pd->shape == PFIELD_SHAPE_PLANE) { /* efd->loc is closes point on effector xy-plane */ - float temp[3]; + float temp[3], translate[3]; sub_v3_v3v3(temp, point->loc, ob->obmat[3]); - project_v3_v3v3(efd->loc, temp, efd->nor); - sub_v3_v3v3(efd->loc, point->loc, efd->loc); + project_v3_v3v3(translate, temp, efd->nor); + add_v3_v3v3(efd->loc, ob->obmat[3], translate); } else { VECCOPY(efd->loc, ob->obmat[3]); |