← Back to branch summary

~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

Viewing changes to source/blender/python/api2_2x/NLA.c

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
https://launchpad.net/bugs/320045
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/python/api2_2x/NLA.c
1
1
/* 
2
 
 * $Id: NLA.c 14444 2008-04-16 22:40:48Z hos $
 
2
 * $Id: NLA.c 16856 2008-10-01 00:14:28Z aligorith $
3
3
 *
4
4
 * ***** BEGIN GPL LICENSE BLOCK *****
5
5
 *
803
803
 
804
804
#define ACTIONSTRIP_MASK (ACTSTRIP_SELECT | ACTSTRIP_USESTRIDE \
805
805
                | ACTSTRIP_HOLDLASTFRAME | ACTSTRIP_ACTIVE | ACTSTRIP_LOCK_ACTION \
806
 
                | ACTSTRIP_MUTE)
 
806
                | ACTSTRIP_MUTE | ACTSTRIP_CYCLIC_USEX | ACTSTRIP_CYCLIC_USEY | ACTSTRIP_CYCLIC_USEZ | ACTSTRIP_AUTO_BLENDS)
807
807
 
808
808
static PyObject *ActionStrip_getFlag( BPy_ActionStrip * self )
809
809
{
1169
1169
        
1170
1170
        if( S ) {
1171
1171
                BPy_constant *d = ( BPy_constant * ) S;
1172
 
                PyConstant_Insert( d, "SELECT",
1173
 
                                PyInt_FromLong( ACTSTRIP_SELECT ) );
1174
 
                PyConstant_Insert( d, "STRIDE_PATH",
1175
 
                                PyInt_FromLong( ACTSTRIP_USESTRIDE ) );
1176
 
                PyConstant_Insert( d, "HOLD",
1177
 
                                PyInt_FromLong( ACTSTRIP_HOLDLASTFRAME ) );
1178
 
                PyConstant_Insert( d, "ACTIVE",
1179
 
                                PyInt_FromLong( ACTSTRIP_ACTIVE ) );
1180
 
                PyConstant_Insert( d, "LOCK_ACTION",
1181
 
                                PyInt_FromLong( ACTSTRIP_LOCK_ACTION ) );
1182
 
                PyConstant_Insert( d, "MUTE",
1183
 
                                PyInt_FromLong( ACTSTRIP_MUTE ) );
 
1172
                PyConstant_Insert( d, "SELECT",                 PyInt_FromLong( ACTSTRIP_SELECT ) );
 
1173
                PyConstant_Insert( d, "STRIDE_PATH",    PyInt_FromLong( ACTSTRIP_USESTRIDE ) );
 
1174
                PyConstant_Insert( d, "HOLD",                   PyInt_FromLong( ACTSTRIP_HOLDLASTFRAME ) );
 
1175
                PyConstant_Insert( d, "ACTIVE",                 PyInt_FromLong( ACTSTRIP_ACTIVE ) );
 
1176
                PyConstant_Insert( d, "LOCK_ACTION",    PyInt_FromLong( ACTSTRIP_LOCK_ACTION ) );
 
1177
                PyConstant_Insert( d, "MUTE",                   PyInt_FromLong( ACTSTRIP_MUTE ) );
 
1178
                PyConstant_Insert( d, "USEX",                   PyInt_FromLong( ACTSTRIP_CYCLIC_USEX ) );
 
1179
                PyConstant_Insert( d, "USEY",                   PyInt_FromLong( ACTSTRIP_CYCLIC_USEY ) );
 
1180
                PyConstant_Insert( d, "USEZ",                   PyInt_FromLong( ACTSTRIP_CYCLIC_USEZ ) );
 
1181
                PyConstant_Insert( d, "AUTO_BLEND",     PyInt_FromLong( ACTSTRIP_AUTO_BLENDS ) );
1184
1182
        }
1185
1183
        return S;
1186
1184
}
1440
1438
    strip->flag = ACTSTRIP_LOCK_ACTION;
1441
1439
    find_stridechannel(ob, strip);
1442
1440
 
 
1441
        if(ob->nlastrips.first == NULL)
 
1442
                ob->nlaflag |= OB_NLA_OVERRIDE;
 
1443
        
1443
1444
    strip->repeat = 1.0;
 
1445
        strip->scale = 1.0;
1444
1446
    act->id.us++;
1445
1447
 
1446
1448
    BLI_addtail(&ob->nlastrips, strip);