summaryrefslogtreecommitdiff
path: root/src/compoundsprite.cpp
diff options
context:
space:
mode:
authorReid <reidyaro@gmail.com>2011-08-08 16:51:11 +0200
committerReid <reidyaro@gmail.com>2011-08-08 16:51:11 +0200
commit7f8498bf14338f67089881afb14b0b398a152c8c (patch)
treee0ba5648c775776be6177dae3c0c8b50922517b1 /src/compoundsprite.cpp
parent391a4c3a1e4d5c3815ba7c822fb9bd03969dea6e (diff)
parentbcd0bdb1f087c3153d070baa274e7ecf8c8268e1 (diff)
downloadmanaplus-7f8498bf14338f67089881afb14b0b398a152c8c.tar.gz
manaplus-7f8498bf14338f67089881afb14b0b398a152c8c.tar.bz2
manaplus-7f8498bf14338f67089881afb14b0b398a152c8c.tar.xz
manaplus-7f8498bf14338f67089881afb14b0b398a152c8c.zip
Merge branch 'master' of gitorious.org:manaplus/manaplus
Diffstat (limited to 'src/compoundsprite.cpp')
-rw-r--r--src/compoundsprite.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/compoundsprite.cpp b/src/compoundsprite.cpp
index 6f80e2c7b..1642416ea 100644
--- a/src/compoundsprite.cpp
+++ b/src/compoundsprite.cpp
@@ -406,13 +406,15 @@ void CompoundSprite::setAlpha(float alpha)
{
if (alpha != mAlpha)
{
- SpriteConstIterator it, it_end;
- for (it = begin(), it_end = end(); it != it_end; ++ it)
+ if (Image::mUseOpenGL == 0 && size() > 3)
{
- if (*it)
- (*it)->setAlpha(alpha);
+ SpriteConstIterator it, it_end;
+ for (it = begin(), it_end = end(); it != it_end; ++ it)
+ {
+ if (*it)
+ (*it)->setAlpha(alpha);
+ }
}
-
mAlpha = alpha;
}
}