Nux

Merge lp://qastaging/~nick-dedekind/nux/remove-animation-on-tick into lp://qastaging/nux

  1. remove-animation-on-tick
  2. Merge into trunk
Proposed by Nick Dedekind
Status: Merged
Approved by: Francis Ginther
Approved revision: 710
Merged at revision: 736
Proposed branch: lp://qastaging/~nick-dedekind/nux/remove-animation-on-tick
Merge into: lp://qastaging/nux
Diff against target: 82 lines (+39/-1)
2 files modified
NuxCore/AnimationController.cpp (+11/-1)
tests/gtest-nuxcore-animation.cpp (+28/-0)
To merge this branch: bzr merge lp://qastaging/~nick-dedekind/nux/remove-animation-on-tick
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Brandon Schaefer (community) Approve
Tim Penhey Pending
Review via email: mp+136069@code.qastaging.launchpad.net

Commit message

Added support for removal of animations during tick.

Description of the change

= Problem description =

Nux animation framework does not support deleting an animation during a tick cycle.
This is required for chaining animations for LP: #1060948

= The fix =

Do not tick items which have been marked for removal in the animation controller

= Test coverage =

Unit test for removal of animation during tick.

To post a comment you must log in.
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Looks good to me.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/77/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=panda-pbuilder,distribution=quantal,flavor=armhf/77/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/77/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/77/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Re-approving. I updated the job to use a better test and result collection hook script, but I used the wrong one. The job should be configured to use the correct one now. I'll monitor this MP in case there is another failure.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches