]> git.tdb.fi Git - r2c2.git/commitdiff
Avoid crash if an object does not have a shape
authorMikko Rasa <tdb@tdb.fi>
Thu, 21 Nov 2013 11:42:37 +0000 (13:42 +0200)
committerMikko Rasa <tdb@tdb.fi>
Thu, 21 Nov 2013 11:48:22 +0000 (13:48 +0200)
source/3d/layout.cpp

index 59a23c935aab6be2f3e41c5e53c4e383e3975f14..be19b0020a9a2680b64e4750690cd288b0b8c1c6 100644 (file)
@@ -41,7 +41,11 @@ void Layout3D::get_bounds(Vector &minp, Vector &maxp) const
        Geometry::BoundingBox<float, 3> bbox;
 
        for(ObjectMap::const_iterator i=objects.begin(); i!=objects.end(); ++i)
-               bbox = bbox|i->second->get_object().get_type().get_shape()->get_axis_aligned_bounding_box();
+       {
+               const Shape *shape = i->second->get_object().get_shape();
+               if(shape)
+                       bbox = bbox|shape->get_axis_aligned_bounding_box();
+       }
 
        minp = bbox.get_minimum_point();
        maxp = bbox.get_maximum_point();