← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to source/blender/blenkernel/intern/anim_sys.c

  • Committer: Package Import Robot
  • Author(s): Matteo F. Vescovi
  • Date: 2012-05-12 20:02:22 UTC
  • mfrom: (14.2.16 sid)
  • Revision ID: package-import@ubuntu.com-20120512200222-lznjs2cxzaq96wua
Tags: 2.63a-1
* New upstream bugfix release
  + debian/patches/: re-worked since source code changed

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/blenkernel/intern/anim_sys.c
2039
2039
        
2040
2040
        /* add 'active' Action (may be tweaking track) as last strip to evaluate in NLA stack
2041
2041
         *      - only do this if we're not exclusively evaluating the 'solo' NLA-track
 
2042
         *      - however, if the 'solo' track houses the current 'tweaking' strip, 
 
2043
         *        then we should allow this to play, otherwise nothing happens
2042
2044
         */
2043
 
        if ((adt->action) && !(adt->flag & ADT_NLA_SOLO_TRACK)) {
 
2045
        if ((adt->action) && ((adt->flag & ADT_NLA_SOLO_TRACK)==0 || (adt->flag & ADT_NLA_EDIT_ON))) {
2044
2046
                /* if there are strips, evaluate action as per NLA rules */
2045
2047
                if ((has_strips) || (adt->actstrip)) {
2046
2048
                        /* make dummy NLA strip, and add that to the stack */