Merge "Move updateMatrix() call to animateCommon" into mnc-dev

2015-07-23 23:48:40 +00:00
parent f199ac84f3 49dec430e8
commit 8b1154c487
1 changed files with 1 additions and 1 deletions
--- a/libs/hwui/AnimatorManager.cpp
+++ b/libs/hwui/AnimatorManager.cpp
@@ -117,7 +117,6 @@ uint32_t AnimatorManager::animate(TreeInfo& info) {

    uint32_t dirty = animateCommon(info);

-    mParent.mProperties.updateMatrix();
    info.damageAccumulator->pushTransform(&mParent);
    mParent.damageSelf(info);

@@ -136,6 +135,7 @@ uint32_t AnimatorManager::animateCommon(TreeInfo& info) {
    newEnd = std::remove_if(mAnimators.begin(), mAnimators.end(), functor);
    mAnimators.erase(newEnd, mAnimators.end());
    mAnimationHandle->notifyAnimationsRan();
+    mParent.mProperties.updateMatrix();
    return functor.dirtyMask;
 }