Revision: 16626
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16626
Author: aligorith
Date: 2008-09-20 12:30:10 +0200 (Sat, 20 Sep 2008)
Log Message:
-----------
PyAPI - *.insertkey()
Updated insertkey calls in PyAPI so that they behave like the new
common_insertkey() behaviour.
Modified Paths:
--------------
trunk/blender/source/blender/python/api2_2x/Camera.c
trunk/blender/source/blender/python/api2_2x/Lamp.c
trunk/blender/source/blender/python/api2_2x/Material.c
trunk/blender/source/blender/python/api2_2x/Object.c
trunk/blender/source/blender/python/api2_2x/Pose.c
trunk/blender/source/blender/python/api2_2x/World.c
Modified: trunk/blender/source/blender/python/api2_2x/Camera.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Camera.c 2008-09-20
10:11:42 UTC (rev 16625)
+++ trunk/blender/source/blender/python/api2_2x/Camera.c 2008-09-20
10:30:10 UTC (rev 16626)
@@ -36,6 +36,7 @@
#include "BKE_utildefines.h"
#include "BLI_blenlib.h"
#include "BLI_arithb.h" /* for M_PI */
+#include "DNA_userdef_types.h"
#include "BSE_editipo.h"
#include "BIF_keyframing.h"
#include "BIF_space.h"
@@ -1032,18 +1033,21 @@
static PyObject *Camera_insertIpoKey( BPy_Camera * self, PyObject * args )
{
- int key = 0;
+ int key = 0, flag = 0;
if( !PyArg_ParseTuple( args, "i", &( key ) ) )
return ( EXPP_ReturnPyObjError( PyExc_AttributeError,
"expected int argument" ) );
-
+
+ /* flag should be initialised with the 'autokeying' flags like for
normal keying */
+ if (IS_AUTOKEY_FLAG(INSERTNEEDED)) flag |= INSERTKEY_NEEDED;
+
if (key == IPOKEY_LENS){
- insertkey((ID *)self->camera, ID_CA, NULL, NULL, CAM_LENS, 0);
+ insertkey((ID *)self->camera, ID_CA, NULL, NULL, CAM_LENS,
flag);
}
else if (key == IPOKEY_CLIPPING){
- insertkey((ID *)self->camera, ID_CA, NULL, NULL, CAM_STA, 0);
- insertkey((ID *)self->camera, ID_CA, NULL, NULL, CAM_END, 0);
+ insertkey((ID *)self->camera, ID_CA, NULL, NULL, CAM_STA, flag);
+ insertkey((ID *)self->camera, ID_CA, NULL, NULL, CAM_END,
flag);
}
allspace(REMAKEIPO, 0);
Modified: trunk/blender/source/blender/python/api2_2x/Lamp.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Lamp.c 2008-09-20 10:11:42 UTC
(rev 16625)
+++ trunk/blender/source/blender/python/api2_2x/Lamp.c 2008-09-20 10:30:10 UTC
(rev 16626)
@@ -46,6 +46,7 @@
#include "gen_utils.h"
#include "gen_library.h"
#include "BKE_utildefines.h"
+#include "DNA_userdef_types.h"
#include "MEM_guardedalloc.h"
/*****************************************************************************/
@@ -1336,7 +1337,7 @@
static PyObject *Lamp_insertIpoKey( BPy_Lamp * self, PyObject * args )
{
- int key = 0, map;
+ int key = 0, flag = 0, map;
if( !PyArg_ParseTuple( args, "i", &( key ) ) )
return ( EXPP_ReturnPyObjError( PyExc_AttributeError,
@@ -1344,26 +1345,29 @@
map = texchannel_to_adrcode(self->lamp->texact);
+ /* flag should be initialised with the 'autokeying' flags like for
normal keying */
+ if (IS_AUTOKEY_FLAG(INSERTNEEDED)) flag |= INSERTKEY_NEEDED;
+
if (key == IPOKEY_RGB ) {
- insertkey((ID *)self->lamp, ID_LA, NULL, NULL, LA_COL_R, 0);
- insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_COL_G, 0);
- insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_COL_B, 0);
+ insertkey((ID *)self->lamp, ID_LA, NULL, NULL, LA_COL_R, flag);
+ insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_COL_G, flag);
+ insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_COL_B, flag);
}
if (key == IPOKEY_ENERGY ) {
- insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_ENERGY, 0);
+ insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_ENERGY, flag);
}
if (key == IPOKEY_SPOTSIZE ) {
- insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_SPOTSI, 0);
+ insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_SPOTSI, flag);
}
if (key == IPOKEY_OFFSET ) {
- insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_X,
0);
- insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_Y,
0);
- insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_Z,
0);
+ insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_X,
flag);
+ insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_Y,
flag);
+ insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_Z,
flag);
}
if (key == IPOKEY_SIZE ) {
- insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_X,
0);
- insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_Y,
0);
- insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_Z,
0);
+ insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_X,
flag);
+ insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_Y,
flag);
+ insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_Z,
flag);
}
allspace(REMAKEIPO, 0);
Modified: trunk/blender/source/blender/python/api2_2x/Material.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Material.c 2008-09-20
10:11:42 UTC (rev 16625)
+++ trunk/blender/source/blender/python/api2_2x/Material.c 2008-09-20
10:30:10 UTC (rev 16626)
@@ -32,6 +32,7 @@
#include "DNA_space_types.h"
#include "DNA_material_types.h"
+#include "DNA_userdef_types.h"
#include "BKE_main.h"
#include "BKE_global.h"
#include "BKE_library.h"
@@ -1873,7 +1874,7 @@
static PyObject *Material_insertIpoKey( BPy_Material * self, PyObject * args )
{
- int key = 0, map;
+ int key = 0, flag = 0, map;
if( !PyArg_ParseTuple( args, "i", &( key ) ) )
return ( EXPP_ReturnPyObjError( PyExc_AttributeError,
@@ -1881,59 +1882,62 @@
map = texchannel_to_adrcode(self->material->texact);
+ /* flag should be initialised with the 'autokeying' flags like for
normal keying */
+ if (IS_AUTOKEY_FLAG(INSERTNEEDED)) flag |= INSERTKEY_NEEDED;
+
if(key==IPOKEY_RGB || key==IPOKEY_ALLCOLOR) {
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_COL_R, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_COL_G, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_COL_B, 0);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_COL_R,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_COL_G,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_COL_B,
flag);
}
if(key==IPOKEY_ALPHA || key==IPOKEY_ALLCOLOR) {
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_ALPHA, 0);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_ALPHA,
flag);
}
if(key==IPOKEY_HALOSIZE || key==IPOKEY_ALLCOLOR) {
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_HASIZE,
0);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_HASIZE,
flag);
}
if(key==IPOKEY_MODE || key==IPOKEY_ALLCOLOR) {
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_MODE, 0);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_MODE,
flag);
}
if(key==IPOKEY_ALLCOLOR) {
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_SPEC_R,
0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_SPEC_G,
0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_SPEC_B,
0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_REF, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_EMIT, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_AMB, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_SPEC, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_HARD, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_MODE, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_TRANSLU,
0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_ADD, 0);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_SPEC_R,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_SPEC_G,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_SPEC_B,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_REF,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_EMIT,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_AMB,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_SPEC,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_HARD,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_MODE,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_TRANSLU,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_ADD,
flag);
}
if(key==IPOKEY_ALLMIRROR) {
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_RAYM, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_FRESMIR,
0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_FRESMIRI,
0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_FRESTRA,
0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_FRESTRAI,
0);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_RAYM,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_FRESMIR,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_FRESMIRI,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_FRESTRA,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_FRESTRAI,
flag);
}
if(key==IPOKEY_OFS || key==IPOKEY_ALLMAPPING) {
- insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_OFS_X, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_OFS_Y, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_OFS_Z, 0);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_OFS_X, flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_OFS_Y, flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_OFS_Z, flag);
}
if(key==IPOKEY_SIZE || key==IPOKEY_ALLMAPPING) {
- insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_SIZE_X, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_SIZE_Y, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_SIZE_Z, 0);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_SIZE_X, flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_SIZE_Y, flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_SIZE_Z, flag);
}
if(key==IPOKEY_ALLMAPPING) {
- insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_R,
0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_G,
0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_B,
0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_DVAR, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_COLF, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_NORF, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_VARF, 0);
- insertkey((ID *)self->material, ID_MA, NULL, NULL,
map+MAP_DISP, 0);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_R,
flag);
+ insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_G,
flag);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
