summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-08-07 04:35:38 +0300
committerAndrei Karas <akaras@inbox.ru>2011-08-07 04:37:42 +0300
commit80546c30a78aba1d3565cfe6148348607d2b5d70 (patch)
treeca896394fbdbd2351e166222e51aaa744410d973
parent0b4ce8c4594c2e70c2e3157c58491757e13558be (diff)
downloadplus-80546c30a78aba1d3565cfe6148348607d2b5d70.tar.gz
plus-80546c30a78aba1d3565cfe6148348607d2b5d70.tar.bz2
plus-80546c30a78aba1d3565cfe6148348607d2b5d70.tar.xz
plus-80546c30a78aba1d3565cfe6148348607d2b5d70.zip
For opengl and uncacheble complex sprites return behavior
like was before commit 4e7096f15eba73e6ea28066df6ab389aab3f052c.
-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;
}
}