[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).
This commit is contained in:
parent
6bc7f4c723
commit
a4de12dbe8
@ -1539,7 +1539,7 @@ clutter_texture_async_load_complete (ClutterTexture *self,
|
|||||||
|
|
||||||
if (error == NULL)
|
if (error == NULL)
|
||||||
{
|
{
|
||||||
if (priv->no_slice)
|
if (!priv->no_slice)
|
||||||
waste = priv->max_tile_waste;
|
waste = priv->max_tile_waste;
|
||||||
|
|
||||||
if (priv->filter_quality == CLUTTER_TEXTURE_QUALITY_HIGH)
|
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);
|
return clutter_texture_async_load (texture, error);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (priv->no_slice)
|
if (!priv->no_slice)
|
||||||
max_waste = priv->max_tile_waste;
|
max_waste = priv->max_tile_waste;
|
||||||
|
|
||||||
if (priv->filter_quality == CLUTTER_TEXTURE_QUALITY_HIGH)
|
if (priv->filter_quality == CLUTTER_TEXTURE_QUALITY_HIGH)
|
||||||
|
Loading…
Reference in New Issue
Block a user