Commit: 58e27cca97c4dc348949c2df8138ba08b17743fc
Author: Campbell Barton
Date: Wed Mar 20 00:05:58 2019 +1100
Branches: master
https://developer.blender.org/rB58e27cca97c4dc348949c2df8138ba08b17743fc
GPencil: Include gpencil objects in BKE_object_minmax
Also remove redundant check for meshes.
===================================================================
M source/blender/blenkernel/intern/object.c
===================================================================
diff --git a/source/blender/blenkernel/intern/object.c
b/source/blender/blenkernel/intern/object.c
index f7a719726b9..66b888c84f2 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -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];
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
