Commit 923b1657 authored by Robert Bragg's avatar Robert Bragg

paint-volumes: fix unioning with empty volumes

When calculating the union of a volume with an empty volume we aim to
simply take the contents of the non-empty volume, but we were not
copying the flags across. We now use
_clutter_paint_volume_set_from_volume which copies all the flags except
the is_static flag.
parent 394512b2
......@@ -434,7 +434,6 @@ clutter_paint_volume_union (ClutterPaintVolume *pv,
const ClutterPaintVolume *another_pv)
{
ClutterPaintVolume aligned_pv;
static const int key_vertices[4] = { 0, 1, 3, 4 };
g_return_if_fail (pv != NULL);
g_return_if_fail (pv->is_axis_aligned);
......@@ -452,10 +451,7 @@ clutter_paint_volume_union (ClutterPaintVolume *pv,
if (pv->is_empty)
{
int i;
for (i = 0; i < 4; i++)
pv->vertices[key_vertices[i]] = another_pv->vertices[key_vertices[i]];
pv->is_2d = another_pv->is_2d;
_clutter_paint_volume_set_from_volume (pv, another_pv);
goto done;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment