add missing flags for NLA strips
authorCampbell Barton <ideasman42@gmail.com>
Wed, 21 May 2008 19:24:35 +0000 (19:24 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 21 May 2008 19:24:35 +0000 (19:24 +0000)
source/blender/python/api2_2x/NLA.c
source/blender/python/api2_2x/doc/NLA.py

index 728d31398a91ebb53d50d99f09a2f6e5fb607d8a..cc477c7b5cf4b7e7657ba8bae4cbe4a3faa07b53 100644 (file)
@@ -803,7 +803,7 @@ static int ActionStrip_setBlendMode( BPy_ActionStrip * self, PyObject * value )
 
 #define ACTIONSTRIP_MASK (ACTSTRIP_SELECT | ACTSTRIP_USESTRIDE \
                | 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 )
 {
@@ -1169,18 +1169,16 @@ static PyObject *M_ActionStrip_FlagsDict( void )
        
        if( S ) {
                BPy_constant *d = ( BPy_constant * ) S;
-               PyConstant_Insert( d, "SELECT",
-                               PyInt_FromLong( ACTSTRIP_SELECT ) );
-               PyConstant_Insert( d, "STRIDE_PATH",
-                               PyInt_FromLong( ACTSTRIP_USESTRIDE ) );
-               PyConstant_Insert( d, "HOLD",
-                               PyInt_FromLong( ACTSTRIP_HOLDLASTFRAME ) );
-               PyConstant_Insert( d, "ACTIVE",
-                               PyInt_FromLong( ACTSTRIP_ACTIVE ) );
-               PyConstant_Insert( d, "LOCK_ACTION",
-                               PyInt_FromLong( ACTSTRIP_LOCK_ACTION ) );
-               PyConstant_Insert( d, "MUTE",
-                               PyInt_FromLong( ACTSTRIP_MUTE ) );
+               PyConstant_Insert( d, "SELECT",                 PyInt_FromLong( ACTSTRIP_SELECT ) );
+               PyConstant_Insert( d, "STRIDE_PATH",    PyInt_FromLong( ACTSTRIP_USESTRIDE ) );
+               PyConstant_Insert( d, "HOLD",                   PyInt_FromLong( ACTSTRIP_HOLDLASTFRAME ) );
+               PyConstant_Insert( d, "ACTIVE",                 PyInt_FromLong( ACTSTRIP_ACTIVE ) );
+               PyConstant_Insert( d, "LOCK_ACTION",    PyInt_FromLong( ACTSTRIP_LOCK_ACTION ) );
+               PyConstant_Insert( d, "MUTE",                   PyInt_FromLong( ACTSTRIP_MUTE ) );
+               PyConstant_Insert( d, "USEX",                   PyInt_FromLong( ACTSTRIP_CYCLIC_USEX ) );
+               PyConstant_Insert( d, "USEY",                   PyInt_FromLong( ACTSTRIP_CYCLIC_USEY ) );
+               PyConstant_Insert( d, "USEZ",                   PyInt_FromLong( ACTSTRIP_CYCLIC_USEZ ) );
+               PyConstant_Insert( d, "AUTO_BLEND",     PyInt_FromLong( ACTSTRIP_AUTO_BLENDS ) );
        }
        return S;
 }
index aeb5178f3d7a12ea32f703a9aa74fadde74dda1d..0e30bfb118f59bc95c0e6c8875248a636bad2c2b 100644 (file)
@@ -19,7 +19,11 @@ It is a bitmask and settings are ORed together.
        - ACTIVE: action strip is active in NLA window
        - LOCK_ACTION: action start/end are automatically mapped to strip duration
        - 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
 @var StrideAxes: Constant dict used by the L{ActionStrip.strideAxis} attribute.
 Values are STRIDEAXIS_X, STRIDEAXIS_Y, and STRIDEAXIS_Z.