kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

simplify get_vert2ob_distance, mat4_to_loc_rot_size isnt needed.

Browse Source
This commit is contained in:
Campbell Barton 2011-09-05 04:00:08 +00:00
parent 1ba71e2caf
commit e8346fa84c
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/modifiers/intern/MOD_weightvgproximity.c
View File

@ -169,25 +169,17 @@ static void get_vert2geom_distance(int numVerts, float (*v_cos)[3],
* Note that it works in final world space (i.e. with constraints etc. applied).
*/
static void get_vert2ob_distance(int numVerts, float (*v_cos)[3], float *dist,
const Object* ob, const Object* obr)
Object* ob, Object* obr)
{
/* Vertex and ref object coordinates. */
float v_wco[3],
or_wco[3],
or_wro[3][3], /*unused*/
or_wsz[3]; /*unused*/
int i;
float v_wco[3];
unsigned int i= numVerts;
/* Get world-coordinates of the reference object (constraints and anim included).
* We also get rotation and scale, even though we do not want them…
*/
mat4_to_loc_rot_size(or_wco, or_wro, or_wsz, (float (*)[4])obr->obmat);
for (i = 0; i < numVerts; i++) {
while(i-- > 0) {
/* Get world-coordinates of the vertex (constraints and anim included). */
mul_v3_m4v3(v_wco, (float (*)[4])ob->obmat, v_cos[i]);
mul_v3_m4v3(v_wco, ob->obmat, v_cos[i]);
/* Return distance between both coordinates. */
dist[i] = len_v3v3(v_wco, or_wco);
dist[i] = len_v3v3(v_wco, obr->obmat[3]);
}
}