From 4dc30c255fa9570853eae8c576c3403e5d3b1a2e Mon Sep 17 00:00:00 2001 From: Robert Bragg Date: Thu, 16 Jun 2011 15:18:46 +0100 Subject: [PATCH] paint-volumes: avoid is_complete assert in _axis_align The removes the pv->is_complete assertion from _clutter_paint_volume_axis_align() and instead if the volume isn't complete it calls _clutter_paint_volume_complete(). --- clutter/clutter-paint-volume.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/clutter/clutter-paint-volume.c b/clutter/clutter-paint-volume.c index 057d1d134..8c4c57ede 100644 --- a/clutter/clutter-paint-volume.c +++ b/clutter/clutter-paint-volume.c @@ -762,8 +762,6 @@ _clutter_paint_volume_axis_align (ClutterPaintVolume *pv) if (pv->is_empty) return; - g_return_if_fail (pv->is_complete); - if (G_LIKELY (pv->is_axis_aligned)) return; @@ -775,6 +773,9 @@ _clutter_paint_volume_axis_align (ClutterPaintVolume *pv) return; } + if (!pv->is_complete) + _clutter_paint_volume_complete (pv); + origin = pv->vertices[0]; max_x = pv->vertices[0].x; max_y = pv->vertices[0].y;