← Back to branch summary

~ubuntu-branches/ubuntu/saucy/blender/saucy-proposed

« back to all changes in this revision

Viewing changes to source/blender/editors/space_nla/nla_intern.h

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/space_nla/nla_intern.h
55
55
 
56
56
/* defines for left-right select tool */
57
57
enum {
58
 
        NLAEDIT_LRSEL_TEST      = -1,
 
58
        NLAEDIT_LRSEL_TEST  = -1,
59
59
        NLAEDIT_LRSEL_NONE,
60
60
        NLAEDIT_LRSEL_LEFT,
61
61
        NLAEDIT_LRSEL_RIGHT
131
131
/* nla_ops.c */
132
132
 
133
133
int nlaop_poll_tweakmode_off(bContext *C);
134
 
int nlaop_poll_tweakmode_on (bContext *C);
 
134
int nlaop_poll_tweakmode_on(bContext *C);
135
135
 
136
136
short nlaedit_is_tweakmode_on(bAnimContext *ac);
137
137