Merge lp:~bregma/compiz/lp-1072206-trusty into lp:compiz/0.9.11

[Stephen M. Webb]

removed texture caching from animations

Do not cache textures in animation.cpp.

Cherry-picked from trunk.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3873
http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-ci/94/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-amd64-ci/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-armhf-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-0.9.11-trusty-i386-ci/78

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-0.9.11-ci/94/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

Yep

review: Approve

=== modified file 'plugins/animation/include/animation/animeffect.h'
--- plugins/animation/include/animation/animeffect.h	2012-09-04 06:54:16 +0000
+++ plugins/animation/include/animation/animeffect.h	2015-03-11 12:30:39 +0000
@@ -100,8 +100,6 @@
     int mDecorTopHeight;
     int mDecorBottomHeight;
     
-    GLTexture::List *texturesCache;
-    
     CompOption::Value &optVal (unsigned int optionId);
     
     inline bool       optValB (unsigned int optionId) { return optVal (optionId).b (); }

=== modified file 'plugins/animation/src/animation.cpp'
--- plugins/animation/src/animation.cpp	2013-10-30 20:31:20 +0000
+++ plugins/animation/src/animation.cpp	2015-03-11 12:30:39 +0000
@@ -479,16 +479,13 @@
 	mDecorBottomHeight = w->output ().bottom;
     }
 
-    texturesCache         = new GLTexture::List (GLWindow::get (w)->textures ());
     PrivateAnimScreen *as = mAWindow->priv->paScreen ();
 
     mTimestep = as->optionGetTimeStep ();
 }
 
 Animation::~Animation ()
-{
-    delete texturesCache;
-}
+{}
 
 CompOption::Value &
 Animation::optVal (unsigned int optionId)