diff options
author | mano-wii <germano.costa@ig.com.br> | 2018-11-26 15:48:27 +0300 |
---|---|---|
committer | mano-wii <germano.costa@ig.com.br> | 2018-11-26 16:02:14 +0300 |
commit | e6322abad23a8ae71b72e54befffc17ae35e30d9 (patch) | |
tree | 5cb12797ebcf663aab7f782091c411c24a52ba5b | |
parent | bb52ef4ee9b1e7776d36bf0a4a4ed4aa184137c6 (diff) |
Inline function BKE_mesh_boundbox_calc inside BKE_mesh_texspace_calc to avoid confusion.
-rw-r--r-- | source/blender/blenkernel/BKE_mesh.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 25 |
2 files changed, 7 insertions, 19 deletions
diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index aba42820519..e8d6c096be7 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -134,7 +134,6 @@ bool BKE_mesh_ensure_facemap_customdata(struct Mesh *me); bool BKE_mesh_clear_facemap_customdata(struct Mesh *me); void BKE_mesh_make_local(struct Main *bmain, struct Mesh *me, const bool lib_local); -void BKE_mesh_boundbox_calc(struct Mesh *me, float r_loc[3], float r_size[3]); void BKE_mesh_texspace_calc(struct Mesh *me); float (*BKE_mesh_orco_verts_get(struct Object *ob))[3]; void BKE_mesh_orco_verts_transform(struct Mesh *me, float (*orco)[3], int totvert, int invert); diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index aa41cf3bc10..6f7c9435298 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -863,18 +863,15 @@ bool BKE_mesh_uv_cdlayer_rename(Mesh *me, const char *old_name, const char *new_ } } -void BKE_mesh_boundbox_calc(Mesh *me, float r_loc[3], float r_size[3]) +void BKE_mesh_texspace_calc(Mesh *me) { BoundBox *bb; float min[3], max[3]; - float mloc[3], msize[3]; + float loc[3], size[3]; if (me->bb == NULL) me->bb = MEM_callocN(sizeof(BoundBox), "boundbox"); bb = me->bb; - if (!r_loc) r_loc = mloc; - if (!r_size) r_size = msize; - INIT_MINMAX(min, max); if (!(me->edit_btmesh ? BM_mesh_minmax(me->edit_btmesh->bm, min, max) : @@ -884,26 +881,18 @@ void BKE_mesh_boundbox_calc(Mesh *me, float r_loc[3], float r_size[3]) max[0] = max[1] = max[2] = 1.0f; } - mid_v3_v3v3(r_loc, min, max); + mid_v3_v3v3(loc, min, max); - r_size[0] = (max[0] - min[0]) / 2.0f; - r_size[1] = (max[1] - min[1]) / 2.0f; - r_size[2] = (max[2] - min[2]) / 2.0f; + size[0] = (max[0] - min[0]) / 2.0f; + size[1] = (max[1] - min[1]) / 2.0f; + size[2] = (max[2] - min[2]) / 2.0f; BKE_boundbox_init_from_minmax(bb, min, max); bb->flag &= ~BOUNDBOX_DIRTY; -} - -void BKE_mesh_texspace_calc(Mesh *me) -{ - float loc[3], size[3]; - int a; - - BKE_mesh_boundbox_calc(me, loc, size); if (me->texflag & ME_AUTOSPACE) { - for (a = 0; a < 3; a++) { + for (int a = 0; a < 3; a++) { if (size[a] == 0.0f) size[a] = 1.0f; else if (size[a] > 0.0f && size[a] < 0.00001f) size[a] = 0.00001f; else if (size[a] < 0.0f && size[a] > -0.00001f) size[a] = -0.00001f; |