mirror of
https://github.com/brl/mutter.git
synced 2024-11-28 19:10:43 -05:00
shaped-texture: Use actual texture if tower returned NULL
The texture tower can return no texture e.g. if the calculated level is
negative. This was handled before, but regressed with
e1370ee209
. This fixes a potential crash
observed occasionally when starting Firefox nightly using the Wayland
backend in overview mode.
This commit is contained in:
parent
173867c12b
commit
490f27efcb
@ -733,6 +733,8 @@ meta_shaped_texture_paint (ClutterActor *actor)
|
|||||||
stex->fast_updates < MIN_FAST_UPDATES_BEFORE_UNMIPMAP)
|
stex->fast_updates < MIN_FAST_UPDATES_BEFORE_UNMIPMAP)
|
||||||
{
|
{
|
||||||
paint_tex = meta_texture_tower_get_paint_texture (stex->paint_tower);
|
paint_tex = meta_texture_tower_get_paint_texture (stex->paint_tower);
|
||||||
|
if (!paint_tex)
|
||||||
|
paint_tex = stex->texture;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user