~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/gameengine/Converter/BL_ActionActuator.h

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
48
48
                                                float endtime,
49
49
                                                struct bAction *action,
50
50
                                                short   playtype,
 
51
                                                short   blend_mode,
51
52
                                                short   blendin,
52
53
                                                short   priority,
53
54
                                                short   layer,
129
130
        float   m_stridelength;
130
131
        float   m_layer_weight;
131
132
        short   m_playtype;
 
133
        short   m_blendmode;
132
134
        short   m_priority;
133
135
        short   m_layer;
134
136
        short   m_ipo_flags;