archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

GPencil: Include gpencil objects in BKE_object_minmax

Browse Source 
Also remove redundant check for meshes.
This commit is contained in:
Campbell Barton
2019-03-20 00:05:58 +11:00
parent 8a125e3b55
commit 58e27cca97
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
source/blender/blenkernel/intern/object.c
View File

@@ -2762,6 +2762,20 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
changed = true;
break;
}
case OB_MESH:
{
bb = *BKE_mesh_boundbox_get(ob);
BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r);
changed = true;
break;
}
case OB_GPENCIL:
{
bb = *BKE_gpencil_boundbox_get(ob);
BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r);
changed = true;
break;
}
case OB_LATTICE:
{
Lattice *lt = ob->data;
@@ -2784,17 +2798,6 @@ void BKE_object_minmax(Object *ob, float min_r[3], float max_r[3], const bool us
changed = BKE_pose_minmax(ob, min_r, max_r, use_hidden, false);
break;
}
case OB_MESH:
{
Mesh *me = BKE_mesh_from_object(ob);
if (me) {
bb = *BKE_mesh_boundbox_get(ob);
BKE_boundbox_minmax(&bb, ob->obmat, min_r, max_r);
changed = true;
}
break;
}
case OB_MBALL:
{
float ob_min[3], ob_max[3];