Stupid me! Committed in wrong console with wrong dir... here's the rest of

all files for the Ipo/Action/NLA makeover...

9 files changed, 122 insertions, 136 deletions

diff --git a/source/blender/python/api2_2x/Bone.c b/source/blender/python/api2_2x/Bone.c
index 6a6980107a2..9fd751248aa 100644
--- a/source/blender/python/api2_2x/Bone.c
+++ b/source/blender/python/api2_2x/Bone.c
@@ -48,6 +48,7 @@ struct ScrArea; /*keep me up here */
 #include "BKE_utildefines.h"
 
 #include "BIF_editaction.h"
+#include "BSE_editipo.h"
 
 #include "NLA.h"
 
@@ -1401,7 +1402,6 @@ static PyObject *Bone_setPose( BPy_Bone * self, PyObject * args )
 	Bone *root = NULL;
 	bPoseChannel *chan = NULL;
 	bPoseChannel *setChan = NULL;
-	bPoseChannel *test = NULL;
 	Object *object = NULL;
 	bArmature *arm = NULL;
 	Bone *bone = NULL;
@@ -1410,7 +1410,6 @@ static PyObject *Bone_setPose( BPy_Bone * self, PyObject * args )
 	BPy_Action *py_action = NULL;
 	int x;
 	int flagValue = 0;
-	int makeCurve = 1;
 
 	if( !self->bone ) {	//test to see if linked to armature
 		//use python vars
@@ -1502,43 +1501,26 @@ static PyObject *Bone_setPose( BPy_Bone * self, PyObject * args )
 
 		//create an action if one not already assigned to object
 		if( !py_action && !object->action ) {
-			object->action = ( bAction * ) add_empty_action(  );
-			object->ipowin = ID_AC;
-		} else {
-			//test if posechannel is already in action
-			for( test = object->action->chanbase.first; test;
-			     test = test->next ) {
-				if( test == setChan )
-					makeCurve = 0;	//already there
-			}
+			object->action = ( bAction * ) add_empty_action(ID_PO);
+			object->ipowin = ID_PO;
 		}
 
-		//set action keys
+		//set action keys (note, new uniform API for Pose ipos (ton)
 		if( setChan->flag & POSE_ROT ) {
-			set_action_key( object->action, setChan, AC_QUAT_X,
-					(short)makeCurve );
-			set_action_key( object->action, setChan, AC_QUAT_Y,
-					(short)makeCurve );
-			set_action_key( object->action, setChan, AC_QUAT_Z,
-					(short)makeCurve );
-			set_action_key( object->action, setChan, AC_QUAT_W,
-					(short)makeCurve );
+			insertkey(&object->id, ID_PO, setChan->name, NULL, AC_QUAT_X);
+			insertkey(&object->id, ID_PO, setChan->name, NULL, AC_QUAT_Y);
+			insertkey(&object->id, ID_PO, setChan->name, NULL, AC_QUAT_Z);
+			insertkey(&object->id, ID_PO, setChan->name, NULL, AC_QUAT_W);
 		}
 		if( setChan->flag & POSE_SIZE ) {
-			set_action_key( object->action, setChan, AC_SIZE_X,
-					(short)makeCurve );
-			set_action_key( object->action, setChan, AC_SIZE_Y,
-					(short)makeCurve );
-			set_action_key( object->action, setChan, AC_SIZE_Z,
-					(short)makeCurve );
+			insertkey(&object->id, ID_PO, setChan->name, NULL, AC_SIZE_X);
+			insertkey(&object->id, ID_PO, setChan->name, NULL, AC_SIZE_Y);
+			insertkey(&object->id, ID_PO, setChan->name, NULL, AC_SIZE_Z);
 		}
 		if( setChan->flag & POSE_LOC ) {
-			set_action_key( object->action, setChan, AC_LOC_X,
-					(short)makeCurve );
-			set_action_key( object->action, setChan, AC_LOC_Y,
-					(short)makeCurve );
-			set_action_key( object->action, setChan, AC_LOC_Z,
-					(short)makeCurve );
+			insertkey(&object->id, ID_PO, setChan->name, NULL, AC_LOC_X);
+			insertkey(&object->id, ID_PO, setChan->name, NULL, AC_LOC_Y);
+			insertkey(&object->id, ID_PO, setChan->name, NULL, AC_LOC_Z);
 		}
 		//rebuild ipos
 		remake_action_ipos( object->action );
diff --git a/source/blender/python/api2_2x/Camera.c b/source/blender/python/api2_2x/Camera.c
index 6314ff908f0..a8625def1c9 100644
--- a/source/blender/python/api2_2x/Camera.c
+++ b/source/blender/python/api2_2x/Camera.c
@@ -959,11 +959,11 @@ static PyObject *Camera_insertIpoKey( BPy_Camera * self, PyObject * args )
 										"expected int argument" ) );
 
 	if (key == IPOKEY_LENS){
-		insertkey((ID *)self->camera, CAM_LENS);     
+		insertkey((ID *)self->camera, ID_CA, NULL, NULL, CAM_LENS);     
 	}
 	else if (key == IPOKEY_CLIPPING){
-		insertkey((ID *)self->camera, CAM_STA);
-		insertkey((ID *)self->camera, CAM_END);   
+		insertkey((ID *)self->camera, ID_CA, NULL, NULL, CAM_STA);
+		insertkey((ID *)self->camera, ID_CA, NULL, NULL, CAM_END);   
 	}
 
 	allspace(REMAKEIPO, 0);
diff --git a/source/blender/python/api2_2x/Ipo.c b/source/blender/python/api2_2x/Ipo.c
index 55f6147012c..8ecd3bb5041 100644
--- a/source/blender/python/api2_2x/Ipo.c
+++ b/source/blender/python/api2_2x/Ipo.c
@@ -212,9 +212,9 @@ static PyObject *M_Ipo_New( PyObject * self, PyObject * args )
 	if( !strcmp( code, "Lamp" ) )
 		idcode = ID_LA;
 	if( !strcmp( code, "Action" ) )
-		idcode = ID_AC;
+		idcode = ID_PO;
 	if( !strcmp( code, "Constraint" ) )
-		idcode = IPO_CO;
+		idcode = ID_CO;
 	if( !strcmp( code, "Sequence" ) )
 		idcode = ID_SEQ;
 	if( !strcmp( code, "Curve" ) )
@@ -890,10 +890,10 @@ static PyObject *Ipo_addCurve( BPy_Ipo * self, PyObject * args )
 	case ID_MA:
 		ok = Ipo_maIcuName( cur_name, &param );
 		break;
-	case ID_AC:
+	case ID_PO:
 		ok = Ipo_acIcuName( cur_name, &param );
 		break;
-	case IPO_CO:
+	case ID_CO:
 		ok = Ipo_coIcuName( cur_name, &param );
 		break;
 	case ID_CU:
@@ -913,14 +913,13 @@ static PyObject *Ipo_addCurve( BPy_Ipo * self, PyObject * args )
 		return EXPP_ReturnPyObjError
 			( PyExc_NameError, "curve name was invalid" );
 
-	/* ask blender to create the new ipo curve */
-	icu = get_ipocurve( NULL, ipo->blocktype, param, self->ipo );
-
-	if( icu == 0 )		/* could not create curve */
-		return EXPP_ReturnPyObjError
-			( PyExc_RuntimeError,
-			  "blender could not create ipo curve" );
-
+	/* create the new ipo curve */
+	icu = MEM_callocN(sizeof(IpoCurve), "Pyhon added ipocurve");
+	icu->blocktype= ipo->blocktype;
+	icu->flag |= IPO_VISIBLE|IPO_AUTO_HORIZ;
+	icu->blocktype= ipo->blocktype;
+	icu->adrcode= param;
+	
 	allspace( REMAKEIPO, 0 );
 	EXPP_allqueue( REDRAWIPO, 0 );
 
diff --git a/source/blender/python/api2_2x/Ipocurve.c b/source/blender/python/api2_2x/Ipocurve.c
index 612da52cd18..f4fbd539b99 100644
--- a/source/blender/python/api2_2x/Ipocurve.c
+++ b/source/blender/python/api2_2x/Ipocurve.c
@@ -416,7 +416,7 @@ static PyObject *IpoCurve_getName( C_IpoCurve * self )
 	case ID_WO:
 		return PyString_FromString( getname_world_ei
 					    ( self->ipocurve->adrcode ) );
-	case ID_AC:
+	case ID_PO:
 		return PyString_FromString( getname_ac_ei
 					    ( self->ipocurve->adrcode ) );
 	case ID_CU:
@@ -427,7 +427,7 @@ static PyObject *IpoCurve_getName( C_IpoCurve * self )
 	case ID_SEQ:
 		return PyString_FromString( getname_seq_ei
 					    ( self->ipocurve->adrcode ) );
-	case IPO_CO:
+	case ID_CO:
 		return PyString_FromString( getname_co_ei
 					    ( self->ipocurve->adrcode ) );
 	default:
@@ -605,7 +605,7 @@ char *getIpoCurveName( IpoCurve * icu )
 		return getname_tex_ei( icu->adrcode );
 	case ID_LA:
 		return getname_la_ei( icu->adrcode );
-	case ID_AC:
+	case ID_PO:
 		return getname_ac_ei( icu->adrcode );
 	case ID_CU:
 		return getname_cu_ei( icu->adrcode );
@@ -613,7 +613,7 @@ char *getIpoCurveName( IpoCurve * icu )
 		return "Key";	/* ipo curves have no names... that was only meant for drawing the buttons... (ton) */
 	case ID_SEQ:
 		return getname_seq_ei( icu->adrcode );
-	case IPO_CO:
+	case ID_CO:
 		return getname_co_ei( icu->adrcode );
 	}
 	return NULL;
diff --git a/source/blender/python/api2_2x/Lamp.c b/source/blender/python/api2_2x/Lamp.c
index 89d0eef891c..f3e6214e966 100644
--- a/source/blender/python/api2_2x/Lamp.c
+++ b/source/blender/python/api2_2x/Lamp.c
@@ -1395,25 +1395,25 @@ static PyObject *Lamp_insertIpoKey( BPy_Lamp * self, PyObject * args )
 	map = texchannel_to_adrcode(self->lamp->texact);
 
 	if (key == IPOKEY_RGB ) {
-		insertkey((ID *)self->lamp,LA_COL_R);
-		insertkey((ID *)self->lamp,LA_COL_G);
-		insertkey((ID *)self->lamp,LA_COL_B);      
+		insertkey((ID *)self->lamp, ID_LA, NULL, NULL, LA_COL_R);
+		insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_COL_G);
+		insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_COL_B);      
 	}
 	if (key == IPOKEY_ENERGY ) {
-		insertkey((ID *)self->lamp,LA_ENERGY);    
+		insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_ENERGY);    
 	}	
 	if (key == IPOKEY_SPOTSIZE ) {
-		insertkey((ID *)self->lamp,LA_SPOTSI);    
+		insertkey((ID *)self->lamp, ID_LA, NULL, NULL,LA_SPOTSI);    
 	}
 	if (key == IPOKEY_OFFSET ) {
-		insertkey((ID *)self->lamp, map+MAP_OFS_X);
-		insertkey((ID *)self->lamp, map+MAP_OFS_Y);
-		insertkey((ID *)self->lamp, map+MAP_OFS_Z);  
+		insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_X);
+		insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_Y);
+		insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_OFS_Z);  
 	}
 	if (key == IPOKEY_SIZE ) {
-		insertkey((ID *)self->lamp, map+MAP_SIZE_X);
-		insertkey((ID *)self->lamp, map+MAP_SIZE_Y);
-		insertkey((ID *)self->lamp, map+MAP_SIZE_Z);  
+		insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_X);
+		insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_Y);
+		insertkey((ID *)self->lamp, ID_LA, NULL, NULL, map+MAP_SIZE_Z);  
 	}
 
 	allspace(REMAKEIPO, 0);
diff --git a/source/blender/python/api2_2x/Material.c b/source/blender/python/api2_2x/Material.c
index 7a3bbc89f45..50390025ee2 100644
--- a/source/blender/python/api2_2x/Material.c
+++ b/source/blender/python/api2_2x/Material.c
@@ -1829,58 +1829,58 @@ static PyObject *Material_insertIpoKey( BPy_Material * self, PyObject * args )
 	map = texchannel_to_adrcode(self->material->texact);
 	
 	if(key==IPOKEY_RGB || key==IPOKEY_ALLCOLOR) {
-		insertkey((ID *)self->material, MA_COL_R);
-		insertkey((ID *)self->material, MA_COL_G);
-		insertkey((ID *)self->material, MA_COL_B);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_COL_R);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_COL_G);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_COL_B);
 	}
 	if(key==IPOKEY_ALPHA || key==IPOKEY_ALLCOLOR) {
-		insertkey((ID *)self->material, MA_ALPHA);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_ALPHA);
 	}
 	if(key==IPOKEY_HALOSIZE || key==IPOKEY_ALLCOLOR) {
-		insertkey((ID *)self->material, MA_HASIZE);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_HASIZE);
 	}
 	if(key==IPOKEY_MODE || key==IPOKEY_ALLCOLOR) {
-		insertkey((ID *)self->material, MA_MODE);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_MODE);
 	}
 	if(key==IPOKEY_ALLCOLOR) {
-		insertkey((ID *)self->material, MA_SPEC_R);
-		insertkey((ID *)self->material, MA_SPEC_G);
-		insertkey((ID *)self->material, MA_SPEC_B);
-		insertkey((ID *)self->material, MA_REF);
-		insertkey((ID *)self->material, MA_EMIT);
-		insertkey((ID *)self->material, MA_AMB);
-		insertkey((ID *)self->material, MA_SPEC);
-		insertkey((ID *)self->material, MA_HARD);
-		insertkey((ID *)self->material, MA_MODE);
-		insertkey((ID *)self->material, MA_TRANSLU);
-		insertkey((ID *)self->material, MA_ADD);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_SPEC_R);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_SPEC_G);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_SPEC_B);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_REF);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_EMIT);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_AMB);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_SPEC);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_HARD);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_MODE);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_TRANSLU);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_ADD);
 	}
 	if(key==IPOKEY_ALLMIRROR) {
-		insertkey((ID *)self->material, MA_RAYM);
-		insertkey((ID *)self->material, MA_FRESMIR);
-		insertkey((ID *)self->material, MA_FRESMIRI);
-		insertkey((ID *)self->material, MA_FRESTRA);
-		insertkey((ID *)self->material, MA_FRESTRAI);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_RAYM);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_FRESMIR);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_FRESMIRI);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_FRESTRA);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, MA_FRESTRAI);
 	}
 	if(key==IPOKEY_OFS || key==IPOKEY_ALLMAPPING) {
-		insertkey((ID *)self->material, map+MAP_OFS_X);
-		insertkey((ID *)self->material, map+MAP_OFS_Y);
-		insertkey((ID *)self->material, map+MAP_OFS_Z);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_OFS_X);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_OFS_Y);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_OFS_Z);
 	}
 	if(key==IPOKEY_SIZE || key==IPOKEY_ALLMAPPING) {
-		insertkey((ID *)self->material, map+MAP_SIZE_X);
-		insertkey((ID *)self->material, map+MAP_SIZE_Y);
-		insertkey((ID *)self->material, map+MAP_SIZE_Z);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_SIZE_X);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_SIZE_Y);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_SIZE_Z);
 	}
 	if(key==IPOKEY_ALLMAPPING) {
-		insertkey((ID *)self->material, map+MAP_R);
-		insertkey((ID *)self->material, map+MAP_G);
-		insertkey((ID *)self->material, map+MAP_B);
-		insertkey((ID *)self->material, map+MAP_DVAR);
-		insertkey((ID *)self->material, map+MAP_COLF);
-		insertkey((ID *)self->material, map+MAP_NORF);
-		insertkey((ID *)self->material, map+MAP_VARF);
-		insertkey((ID *)self->material, map+MAP_DISP);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_R);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_G);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_B);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_DVAR);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_COLF);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_NORF);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_VARF);
+		insertkey((ID *)self->material, ID_MA, NULL, NULL, map+MAP_DISP);
 	}
 
 	allspace(REMAKEIPO, 0);
diff --git a/source/blender/python/api2_2x/NLA.c b/source/blender/python/api2_2x/NLA.c
index f2d9b657816..a07f15b3cab 100644
--- a/source/blender/python/api2_2x/NLA.c
+++ b/source/blender/python/api2_2x/NLA.c
@@ -307,7 +307,7 @@ static PyObject *Action_getChannelIpo( BPy_Action * self, PyObject * args )
 		return NULL;
 	}
 
-	chan = get_named_actionchannel( self->action, chanName );
+	chan = get_action_channel( self->action, chanName );
 	if( chan == NULL ) {
 		EXPP_ReturnPyObjError( PyExc_AttributeError,
 				       "no channel with that name..." );
@@ -328,7 +328,7 @@ static PyObject *Action_removeChannel( BPy_Action * self, PyObject * args )
 		return NULL;
 	}
 
-	chan = get_named_actionchannel( self->action, chanName );
+	chan = get_action_channel( self->action, chanName );
 	if( chan == NULL ) {
 		EXPP_ReturnPyObjError( PyExc_AttributeError,
 				       "no channel with that name..." );
diff --git a/source/blender/python/api2_2x/Object.c b/source/blender/python/api2_2x/Object.c
index 888cab2bc92..4da5dfc74ae 100644
--- a/source/blender/python/api2_2x/Object.c
+++ b/source/blender/python/api2_2x/Object.c
@@ -1991,50 +1991,55 @@ static PyObject *Object_setIpo( BPy_Object * self, PyObject * args )
 /*
  * Object_insertIpoKey()
  *  inserts Object IPO key for LOC, ROT, SIZE, LOCROT, or LOCROTSIZE
+ *  Note it also inserts actions! 
  */
 
 static PyObject *Object_insertIpoKey( BPy_Object * self, PyObject * args )
 {
+	Object *ob= self->object;
     int key = 0;
+	char *actname= NULL;
     
 	if( !PyArg_ParseTuple( args, "i", &( key ) ) )
 		return ( EXPP_ReturnPyObjError( PyExc_AttributeError,
 										"expected int argument" ) );
-
+	if(ob->ipoflag & OB_ACTION_OB)
+		actname= "Object";
+	
 	if (key == IPOKEY_LOC || key == IPOKEY_LOCROT || key == IPOKEY_LOCROTSIZE){
-		insertkey((ID *)self->object,OB_LOC_X);
-		insertkey((ID *)self->object,OB_LOC_Y);
-		insertkey((ID *)self->object,OB_LOC_Z);      
+		insertkey((ID *)ob, ID_OB, actname, NULL,OB_LOC_X);
+		insertkey((ID *)ob, ID_OB, actname, NULL,OB_LOC_Y);
+		insertkey((ID *)ob, ID_OB, actname, NULL,OB_LOC_Z);      
 	}
     if (key == IPOKEY_ROT || key == IPOKEY_LOCROT || key == IPOKEY_LOCROTSIZE){
-		insertkey((ID *)self->object,OB_ROT_X);
-		insertkey((ID *)self->object,OB_ROT_Y);
-		insertkey((ID *)self->object,OB_ROT_Z);      
+		insertkey((ID *)ob, ID_OB, actname, NULL,OB_ROT_X);
+		insertkey((ID *)ob, ID_OB, actname, NULL,OB_ROT_Y);
+		insertkey((ID *)ob, ID_OB, actname, NULL,OB_ROT_Z);      
 	}
     if (key == IPOKEY_SIZE || key == IPOKEY_LOCROTSIZE ){
-		insertkey((ID *)self->object,OB_SIZE_X);
-		insertkey((ID *)self->object,OB_SIZE_Y);
-		insertkey((ID *)self->object,OB_SIZE_Z);      
+		insertkey((ID *)ob, ID_OB, actname, NULL,OB_SIZE_X);
+		insertkey((ID *)ob, ID_OB, actname, NULL,OB_SIZE_Y);
+		insertkey((ID *)ob, ID_OB, actname, NULL,OB_SIZE_Z);      
 	}
 
     if (key == IPOKEY_PI_STRENGTH ){
-        insertkey((ID *)self->object, OB_PD_FSTR);   
+        insertkey((ID *)ob, ID_OB, actname, NULL, OB_PD_FSTR);   
 	}
 
     if (key == IPOKEY_PI_FALLOFF ){
-        insertkey((ID *)self->object, OB_PD_FFALL);   
+        insertkey((ID *)ob, ID_OB, actname, NULL, OB_PD_FFALL);   
 	}
 	
     if (key == IPOKEY_PI_SURFACEDAMP ){
-        insertkey((ID *)self->object, OB_PD_SDAMP);   
+        insertkey((ID *)ob, ID_OB, actname, NULL, OB_PD_SDAMP);   
 	}
 
     if (key == IPOKEY_PI_RANDOMDAMP ){
-        insertkey((ID *)self->object, OB_PD_RDAMP);   
+        insertkey((ID *)ob, ID_OB, actname, NULL, OB_PD_RDAMP);   
 	}
 
     if (key == IPOKEY_PI_PERM ){
-        insertkey((ID *)self->object, OB_PD_PERM);   
+        insertkey((ID *)ob, ID_OB, actname, NULL, OB_PD_PERM);   
 	}
 
 
diff --git a/source/blender/python/api2_2x/World.c b/source/blender/python/api2_2x/World.c
index f065f3ebf58..c91f2b1a2d8 100644
--- a/source/blender/python/api2_2x/World.c
+++ b/source/blender/python/api2_2x/World.c
@@ -1113,37 +1113,37 @@ static PyObject *World_insertIpoKey( BPy_World * self, PyObject * args )
 	map = texchannel_to_adrcode(self->world->texact);
 
 	if(key == IPOKEY_ZENITH) {
-		insertkey((ID *)self->world, WO_ZEN_R);
-		insertkey((ID *)self->world, WO_ZEN_G);
-		insertkey((ID *)self->world, WO_ZEN_B);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_ZEN_R);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_ZEN_G);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_ZEN_B);
 	}
 	if(key == IPOKEY_HORIZON) {
-		insertkey((ID *)self->world, WO_HOR_R);
-		insertkey((ID *)self->world, WO_HOR_G);
-		insertkey((ID *)self->world, WO_HOR_B);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_HOR_R);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_HOR_G);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_HOR_B);
 	}
 	if(key == IPOKEY_MIST) {
-		insertkey((ID *)self->world, WO_MISI);
-		insertkey((ID *)self->world, WO_MISTDI);
-		insertkey((ID *)self->world, WO_MISTSTA);
-		insertkey((ID *)self->world, WO_MISTHI);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_MISI);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_MISTDI);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_MISTSTA);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_MISTHI);
 	}
 	if(key == IPOKEY_STARS) {
-		insertkey((ID *)self->world, WO_STAR_R);
-		insertkey((ID *)self->world, WO_STAR_G);
-		insertkey((ID *)self->world, WO_STAR_B);
-		insertkey((ID *)self->world, WO_STARDIST);
-		insertkey((ID *)self->world, WO_STARSIZE);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STAR_R);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STAR_G);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STAR_B);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STARDIST);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, WO_STARSIZE);
 	}
 	if(key == IPOKEY_OFFSET) {
-		insertkey((ID *)self->world, map+MAP_OFS_X);
-		insertkey((ID *)self->world, map+MAP_OFS_Y);
-		insertkey((ID *)self->world, map+MAP_OFS_Z);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_OFS_X);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_OFS_Y);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_OFS_Z);
 	}
 	if(key == IPOKEY_SIZE) {
-		insertkey((ID *)self->world, map+MAP_SIZE_X);
-		insertkey((ID *)self->world, map+MAP_SIZE_Y);
-		insertkey((ID *)self->world, map+MAP_SIZE_Z);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_SIZE_X);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_SIZE_Y);
+		insertkey((ID *)self->world, ID_WO, NULL, NULL, map+MAP_SIZE_Z);
 	}
 
 	allspace(REMAKEIPO, 0);