From af286ac95b5dbd0a09e433ba672c75f126b206c2 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 26 Jul 2011 18:51:35 +0000 Subject: =?UTF-8?q?vgroup=5Fmodifiers:=20Addressed=20most=20ideasman?= =?UTF-8?q?=E2=80=99s=20remarks=20and=20suggestions=20in=20his=20last=20re?= =?UTF-8?q?view.=20*Removed=20curve=20init=20code=20in=20readfile=20(no=20?= =?UTF-8?q?more=20needed=20since=20the=20split=20broke=20anyway=20compatib?= =?UTF-8?q?ility=20with=20earlier=20WeightVGroup=20files=E2=80=A6).=20*Upd?= =?UTF-8?q?ated=20get=5Fob2ob=5Fdistance()=20code=20(much=20simpler=20?= =?UTF-8?q?=E2=80=93=C2=A0I=E2=80=99m=20not=20a=20matrices=E2=80=99=20god!?= =?UTF-8?q?).=20*Enhanced=20a=20few=20RNA=20names=20(Campbell=20has=20othe?= =?UTF-8?q?rs=20in=20mind=20here,=20though,=20I=20think).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- source/blender/modifiers/intern/MOD_weightvgproximity.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'source/blender/modifiers') diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.c b/source/blender/modifiers/intern/MOD_weightvgproximity.c index 7349d90c1ec..06ffb5e4510 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.c +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.c @@ -197,20 +197,7 @@ static void get_vert2ob_distance(int numVerts, float (*v_cos)[3], float *dist, */ static float get_ob2ob_distance(const Object* ob, const Object* obr) { - /* Both objects coordinates. */ - float o_wco[3], - o_wro[3][3], /*unused*/ - o_wsz[3], /*unused*/ - or_wco[3], - or_wro[3][3],/*unused*/ - or_wsz[3]; /*unused*/ - /* Get world-coordinates of both objects (constraints and anim included). - * We also get rotation and scale, even though we do not want them… - */ - mat4_to_loc_rot_size(o_wco, o_wro, o_wsz, (float (*)[4])ob->obmat); - mat4_to_loc_rot_size(or_wco, or_wro, or_wsz, (float (*)[4])obr->obmat); - /* Return distance between both coordinates. */ - return len_v3v3(o_wco, or_wco); + return len_v3v3(ob->obmat[3], obr->obmat[3]); } /************************************** -- cgit v1.2.3