diff options
author | Emmanuele Bassi <ebassi@gnome.org> | 2013-10-10 13:31:50 +0100 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gnome.org> | 2013-10-10 13:40:42 +0100 |
commit | 32ccff85254f731cef6dab88d302eb3dcba93887 (patch) | |
tree | eeef81575ea1282a87d09be3e76e3a96bfc1322d | |
parent | c87b794739d93df6547cf40aba93b2efbf70c22f (diff) | |
download | clutter-32ccff85254f731cef6dab88d302eb3dcba93887.tar.gz |
image: Do not premultiply the blend color
ClutterTextureNode will do that for us when converting the ClutterColor
to a CoglColor, so we can simply pass a white color with the correct
alpha channel.
-rw-r--r-- | clutter/clutter-image.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/clutter/clutter-image.c b/clutter/clutter-image.c index cfc0ae34e..96dba913f 100644 --- a/clutter/clutter-image.c +++ b/clutter/clutter-image.c @@ -119,9 +119,12 @@ clutter_image_paint_content (ClutterContent *content, clutter_actor_get_content_scaling_filters (actor, &min_f, &mag_f); repeat = clutter_actor_get_content_repeat (actor); - color.red = paint_opacity; - color.green = paint_opacity; - color.blue = paint_opacity; + /* ClutterTextureNode will premultiply the blend color, so we + * want it to be white with the paint opacity + */ + color.red = 255; + color.green = 255; + color.blue = 255; color.alpha = paint_opacity; node = clutter_texture_node_new (priv->texture, &color, min_f, mag_f); |