kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

add missing flags for NLA strips

Browse Source
This commit is contained in:
Campbell Barton 2008-05-21 19:24:35 +00:00
parent e1b298cad8
commit 02f34de2b9
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
source/blender/python/api2_2x/NLA.c
View File

@ -803,7 +803,7 @@ static int ActionStrip_setBlendMode( BPy_ActionStrip * self, PyObject * value )
#define ACTIONSTRIP_MASK (ACTSTRIP_SELECT | ACTSTRIP_USESTRIDE \ #define ACTIONSTRIP_MASK (ACTSTRIP_SELECT | ACTSTRIP_USESTRIDE \
| ACTSTRIP_HOLDLASTFRAME | ACTSTRIP_ACTIVE | ACTSTRIP_LOCK_ACTION \ | ACTSTRIP_HOLDLASTFRAME | ACTSTRIP_ACTIVE | ACTSTRIP_LOCK_ACTION \
| ACTSTRIP_MUTE) | ACTSTRIP_MUTE | ACTSTRIP_CYCLIC_USEX | ACTSTRIP_CYCLIC_USEY | ACTSTRIP_CYCLIC_USEZ | ACTSTRIP_AUTO_BLENDS)
static PyObject *ActionStrip_getFlag( BPy_ActionStrip * self ) static PyObject *ActionStrip_getFlag( BPy_ActionStrip * self )
{ {
@ -1169,18 +1169,16 @@ static PyObject *M_ActionStrip_FlagsDict( void )
if( S ) { if( S ) {
BPy_constant *d = ( BPy_constant * ) S; BPy_constant *d = ( BPy_constant * ) S;
PyConstant_Insert( d, "SELECT", PyConstant_Insert( d, "SELECT", PyInt_FromLong( ACTSTRIP_SELECT ) );
PyInt_FromLong( ACTSTRIP_SELECT ) ); PyConstant_Insert( d, "STRIDE_PATH", PyInt_FromLong( ACTSTRIP_USESTRIDE ) );
PyConstant_Insert( d, "STRIDE_PATH", PyConstant_Insert( d, "HOLD", PyInt_FromLong( ACTSTRIP_HOLDLASTFRAME ) );
PyInt_FromLong( ACTSTRIP_USESTRIDE ) ); PyConstant_Insert( d, "ACTIVE", PyInt_FromLong( ACTSTRIP_ACTIVE ) );
PyConstant_Insert( d, "HOLD", PyConstant_Insert( d, "LOCK_ACTION", PyInt_FromLong( ACTSTRIP_LOCK_ACTION ) );
PyInt_FromLong( ACTSTRIP_HOLDLASTFRAME ) ); PyConstant_Insert( d, "MUTE", PyInt_FromLong( ACTSTRIP_MUTE ) );
PyConstant_Insert( d, "ACTIVE", PyConstant_Insert( d, "USEX", PyInt_FromLong( ACTSTRIP_CYCLIC_USEX ) );
PyInt_FromLong( ACTSTRIP_ACTIVE ) ); PyConstant_Insert( d, "USEY", PyInt_FromLong( ACTSTRIP_CYCLIC_USEY ) );
PyConstant_Insert( d, "LOCK_ACTION", PyConstant_Insert( d, "USEZ", PyInt_FromLong( ACTSTRIP_CYCLIC_USEZ ) );
PyInt_FromLong( ACTSTRIP_LOCK_ACTION ) ); PyConstant_Insert( d, "AUTO_BLEND", PyInt_FromLong( ACTSTRIP_AUTO_BLENDS ) );
PyConstant_Insert( d, "MUTE",
PyInt_FromLong( ACTSTRIP_MUTE ) );
} }
return S; return S;
} }

6
source/blender/python/api2_2x/doc/NLA.py
View File

@ -19,7 +19,11 @@ It is a bitmask and settings are ORed together.
- ACTIVE: action strip is active in NLA window - ACTIVE: action strip is active in NLA window
- LOCK_ACTION: action start/end are automatically mapped to strip duration - LOCK_ACTION: action start/end are automatically mapped to strip duration
- MUTE: action strip does not contribute to the NLA solution - MUTE: action strip does not contribute to the NLA solution
- USEX: Turn off automatic single-axis cycling and use X as an offset axis. Note that you can use multiple axes at once.
- USEY: Turn off automatic single-axis cycling and use Y as an offset axis. Note that you can use multiple axes at once.
- USEZ: Turn off automatic single-axis cycling and use Z as an offset axis. Note that you can use multiple axes at once.
- AUTO_BLEND: Automatic calculation of blend in/out values
@type StrideAxes: readonly dictionary @type StrideAxes: readonly dictionary
@var StrideAxes: Constant dict used by the L{ActionStrip.strideAxis} attribute. @var StrideAxes: Constant dict used by the L{ActionStrip.strideAxis} attribute.
Values are STRIDEAXIS_X, STRIDEAXIS_Y, and STRIDEAXIS_Z. Values are STRIDEAXIS_X, STRIDEAXIS_Y, and STRIDEAXIS_Z.