From a4de12dbe8165c3acd453804af36d46e4405b1ba Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Thu, 5 Feb 2009 20:00:05 +0000 Subject: [PATCH] [clutter-texture] Fix the no_slice property The 'no_slice' property means the texture should never be sliced. We want cogl to create a texture with any amount of waste so we pass max_waste as -1. However this got broken in commit 168d55 so that the meaning got negated (no_slice enabled slicing). --- clutter/clutter-texture.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/clutter/clutter-texture.c b/clutter/clutter-texture.c index bd05456bf..dda5f6717 100644 --- a/clutter/clutter-texture.c +++ b/clutter/clutter-texture.c @@ -1539,7 +1539,7 @@ clutter_texture_async_load_complete (ClutterTexture *self, if (error == NULL) { - if (priv->no_slice) + if (!priv->no_slice) waste = priv->max_tile_waste; if (priv->filter_quality == CLUTTER_TEXTURE_QUALITY_HIGH) @@ -1744,7 +1744,7 @@ clutter_texture_set_from_file (ClutterTexture *texture, return clutter_texture_async_load (texture, error); } - if (priv->no_slice) + if (!priv->no_slice) max_waste = priv->max_tile_waste; if (priv->filter_quality == CLUTTER_TEXTURE_QUALITY_HIGH)