diff options
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 871861c3167..1fcc10f13a9 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -3107,7 +3107,7 @@ void BKE_object_dimensions_set(Object *ob, const float value[3], int axis_mask) BKE_object_dimensions_set_ex(ob, value, axis_mask, NULL, NULL); } -void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool use_hidden) +void BKE_object_minmax(Object *ob, float r_min[3], float r_max[3], const bool use_hidden) { BoundBox bb; float vec[3]; @@ -3118,19 +3118,19 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us case OB_FONT: case OB_SURF: { bb = *BKE_curve_boundbox_get(ob); - BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r); + BKE_boundbox_minmax(&bb, ob->obmat, r_min, r_max); changed = true; break; } case OB_MESH: { bb = *BKE_mesh_boundbox_get(ob); - BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r); + BKE_boundbox_minmax(&bb, ob->obmat, r_min, r_max); changed = true; break; } case OB_GPENCIL: { bb = *BKE_gpencil_boundbox_get(ob); - BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r); + BKE_boundbox_minmax(&bb, ob->obmat, r_min, r_max); changed = true; break; } @@ -3143,7 +3143,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us for (v = 0; v < lt->pntsv; v++) { for (u = 0; u < lt->pntsu; u++, bp++) { mul_v3_m4v3(vec, ob->obmat, bp->vec); - minmax_v3v3_v3(min_r, max_r, vec); + minmax_v3v3_v3(r_min, r_max, vec); } } } @@ -3151,7 +3151,7 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us break; } case OB_ARMATURE: { - changed = BKE_pose_minmax(ob, min_r, max_r, use_hidden, false); + changed = BKE_pose_minmax(ob, r_min, r_max, use_hidden, false); break; } case OB_MBALL: { @@ -3159,27 +3159,27 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us changed = BKE_mball_minmax_ex(ob->data, ob_min, ob_max, ob->obmat, 0); if (changed) { - minmax_v3v3_v3(min_r, max_r, ob_min); - minmax_v3v3_v3(min_r, max_r, ob_max); + minmax_v3v3_v3(r_min, r_max, ob_min); + minmax_v3v3_v3(r_min, r_max, ob_max); } break; } case OB_HAIR: { bb = *BKE_hair_boundbox_get(ob); - BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r); + BKE_boundbox_minmax(&bb, ob->obmat, r_min, r_max); changed = true; break; } case OB_POINTCLOUD: { bb = *BKE_pointcloud_boundbox_get(ob); - BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r); + BKE_boundbox_minmax(&bb, ob->obmat, r_min, r_max); changed = true; break; } case OB_VOLUME: { bb = *BKE_volume_boundbox_get(ob); - BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r); + BKE_boundbox_minmax(&bb, ob->obmat, r_min, r_max); changed = true; break; } @@ -3193,15 +3193,15 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us mul_v3_fl(size, ob->empty_drawsize); } - minmax_v3v3_v3(min_r, max_r, ob->obmat[3]); + minmax_v3v3_v3(r_min, r_max, ob->obmat[3]); copy_v3_v3(vec, ob->obmat[3]); add_v3_v3(vec, size); - minmax_v3v3_v3(min_r, max_r, vec); + minmax_v3v3_v3(r_min, r_max, vec); copy_v3_v3(vec, ob->obmat[3]); sub_v3_v3(vec, size); - minmax_v3v3_v3(min_r, max_r, vec); + minmax_v3v3_v3(r_min, r_max, vec); } } |