[clutter] paint-volumes: avoid is_complete assert in _axis_align
- From: Robert Bragg <rbragg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] paint-volumes: avoid is_complete assert in _axis_align
- Date: Thu, 16 Jun 2011 15:19:55 +0000 (UTC)
commit 4dc30c255fa9570853eae8c576c3403e5d3b1a2e
Author: Robert Bragg <robert linux intel com>
Date: Thu Jun 16 15:18:46 2011 +0100
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 files changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/clutter/clutter-paint-volume.c b/clutter/clutter-paint-volume.c
index 057d1d1..8c4c57e 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;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]