diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2011-07-26 22:51:35 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2011-07-26 22:51:35 +0400 |
| commit | af286ac95b5dbd0a09e433ba672c75f126b206c2 (patch) | |
| tree | 8525567c4a67a0fcfd6b833a617a369a0829e149 /source/blender/modifiers | |
| parent | 07dc73fa3139622853391b740f1ebcafe5d48014 (diff) | |
vgroup_modifiers: Addressed most ideasman’s remarks and suggestions in his last review.
*Removed curve init code in readfile (no more needed since the split broke anyway compatibility with earlier WeightVGroup files…).
*Updated get_ob2ob_distance() code (much simpler – I’m not a matrices’ god!).
*Enhanced a few RNA names (Campbell has others in mind here, though, I think).
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_weightvgproximity.c | 15 |
1 files changed, 1 insertions, 14 deletions
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]); } /************************************** |