[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31839] trunk/blender/source/blender/ blenkernel/intern/effect.c: Fix for [#23734] Force Fields Min/Max don' t work

[Janne Karhu]

Revision: 31839
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31839
Author:   jhk
Date:     2010-09-09 09:52:35 +0200 (Thu, 09 Sep 2010)

Log Message:
-----------
Fix for [#23734] Force Fields Min/Max don't work
*Special case for planar vortex field

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/effect.c

Modified: trunk/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/effect.c	2010-09-09 06:29:44 UTC (rev 31838)
+++ trunk/blender/source/blender/blenkernel/intern/effect.c	2010-09-09 07:52:35 UTC (rev 31839)
@@ -667,10 +667,10 @@
 		/* 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]);