py api

* stopped bpy from importing automaticaly as decieded in the meeting.
* removed Blender.Main, since we agree it will be called bpy, renamed files also.
* updated epydocs from this and last commit.
* updated scripts to use bpy.*, and bugfix's for widgetwizard

1 files changed, 0 insertions, 829 deletions

diff --git a/source/blender/python/api2_2x/Main.c b/source/blender/python/api2_2x/Main.c
deleted file mode 100644
index 276d0b04660..00000000000
--- a/source/blender/python/api2_2x/Main.c
+++ /dev/null
@@ -1,829 +0,0 @@
-/* 
- * $Id$
- *
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA	02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * This is a new part of Blender.
- *
- * Contributor(s): Campbell Barton
- *
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
-*/
-
-
-#include "MEM_guardedalloc.h"	/* for MEM_callocN */
-#include "DNA_space_types.h"	/* SPACE_VIEW3D, SPACE_SEQ */
-#include "DNA_scene_types.h"
-#include "DNA_object_types.h" /* MainSeq_new */
-#include "DNA_texture_types.h"
-#include "DNA_curve_types.h"
-#include "DNA_ipo_types.h"
-#include "DNA_group_types.h"
-#include "DNA_world_types.h"
-#include "DNA_vfont_types.h"
-#include "DNA_armature_types.h"
-#include "DNA_sound_types.h"
-#include "DNA_text_types.h"
-#include "DNA_action_types.h"
-#include "DNA_meta_types.h"
-
-/* Use the add_* from BKE_* */
-#include "BKE_global.h"
-#include "BKE_utildefines.h" /* clamp */
-#include "BKE_armature.h"
-#include "BKE_ipo.h"
-#include "BKE_image.h"
-#include "BKE_main.h"
-#include "BKE_library.h"
-#include "BKE_lattice.h"
-#include "BKE_object.h"
-#include "BKE_scene.h"
-#include "BKE_sca.h" /*free_text_controllers*/
-#include "BKE_font.h"
-#include "BKE_mball.h"
-#include "BKE_mesh.h"
-#include "BKE_curve.h"
-#include "BKE_material.h"
-#include "BKE_group.h"
-#include "BKE_text.h"
-#include "BKE_texture.h"
-#include "BKE_world.h"
-
-#include "BLI_blenlib.h" /* BLI_countlist */
-#include "BIF_drawscene.h"	/* for set_scene */
-#include "BIF_screen.h"		/* curarea */
-#include "BIF_drawimage.h" /* what image */
-#include "BIF_drawtext.h" /* unlink_text */
-#include "BIF_editsound.h" /* sound_new_sound */
-#include "BIF_editaction.h" /* add_empty_action */
-
-/* python types */
-#include "../BPY_extern.h" /* clearing scriptlinks */
-
-#include "gen_utils.h"
-#include "gen_library.h" /* generic ID functions */
-
-#include "Object.h"
-#include "Camera.h"
-#include "Armature.h"
-#include "Lamp.h"
-/*#include " CurNurb.h" do we need this ? */
-#include "Curve.h"
-#include "NMesh.h"
-#include "Mesh.h"
-#include "Lattice.h"
-#include "Metaball.h"
-#include "Text.h"
-#include "Text3d.h"
-#include "Font.h"
-#include "Group.h"
-#include "World.h"
-#include "Texture.h"
-#include "Ipo.h"
-#include "Text.h"
-#include "Sound.h"
-#include "NLA.h"
-#include "Main.h"
-#include "Scene.h"
-#include "Library.h"
-
-#include "Config.h" /* config pydata */
-
-/* used only for texts.active */
-#include "BIF_screen.h"
-#include "DNA_space_types.h"
-#include "DNA_screen_types.h"
-
-
-static PyObject *MainSeq_CreatePyObject( Link *iter, int type )
-{
-	BPy_MainSeq *seq = PyObject_NEW( BPy_MainSeq, &MainSeq_Type);
-	seq->iter = iter;
-	seq->type = type;
-	return (PyObject *)seq;
-}
-
-
-static int MainSeq_len( BPy_MainSeq * self )
-{
-	ListBase *lb = wich_libbase(G.main, self->type);
-	return BLI_countlist( lb );
-}
-
-static PyObject * MainSeq_subscript(BPy_MainSeq * self, PyObject *key)
-{
-	char *name;
-	char *lib= NULL;
-	char use_lib = 0;
-	ID *id;
-	
-	id = (ID *)wich_libbase(G.main, self->type)->first;
-	
-	if ( PyString_Check(key) ) {
-		name = PyString_AsString ( key );
-	} else if (PyTuple_Check(key) && (PyTuple_Size(key) == 2) ) {
-		PyObject *pydata;
-		use_lib = 1;
-		
-		/* Get the first arg */
-		pydata = PyTuple_GET_ITEM(key, 0);
-		if (!PyString_Check(pydata)) {
-			return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"the data name must be a string" );
-		}
-		
-		name = PyString_AsString ( pydata );
-		
-		/* Get the second arg */
-		pydata = PyTuple_GET_ITEM(key, 1);
-		if (pydata == Py_None) {
-			lib = NULL; /* data must be local */
-		} else if (PyString_Check(pydata)) {
-			lib = PyString_AsString ( pydata );
-			if (!strcmp( "", lib)) {
-				lib = NULL; /* and empty string also means data must be local */
-			}
-		} else {
-			return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"the lib name must be a string or None" );
-		}
-	} else {
-		return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"expected the a name string or a tuple (lib, name)" );
-	}
-	
-	for (; id; id = id->next) {
-		if(!strcmp( name, id->name+2 )) {
-			if (
-				(!use_lib) || /* any data, local or external lib data */
-				(use_lib && !lib && !id->lib) || /* only local */
-				(lib && use_lib && id->lib && (!strcmp( id->lib->name, lib))) /* only external lib */
-			)
-			{
-				return GetPyObjectFromID(id);
-			}
-		}
-	}
-	return ( EXPP_ReturnPyObjError
-				 ( PyExc_KeyError, "Requested data does not exist") );
-}
-
-static PyMappingMethods MainSeq_as_mapping = {
-	( inquiry ) MainSeq_len,	/* mp_length */
-	( binaryfunc ) MainSeq_subscript,	/* mp_subscript */
-	( objobjargproc ) 0,	/* mp_ass_subscript */
-};
-
-
-/************************************************************************
- *
- * Python MainSeq_Type iterator (iterates over GroupObjects)
- *
- ************************************************************************/
-
-/*
- * Initialize the interator index
- */
-
-static PyObject *MainSeq_getIter( BPy_MainSeq * self )
-{
-	/* we need to get the first base, but for selected context we may need to advance
-	to the first selected or first conext base */
-	
-	ListBase *lb;
-	Link *link;
-	lb = wich_libbase(G.main, self->type);
-	
-	link = lb->first;
-	
-	/* create a new iterator if were alredy using this one */
-	if (self->iter==NULL) {
-		self->iter = link;
-		return EXPP_incr_ret ( (PyObject *) self );
-	} else {
-		return MainSeq_CreatePyObject(link, self->type);
-	}
-}
-
-/*
- * Return next MainOb.
- */
-
-static PyObject *MainSeq_nextIter( BPy_MainSeq * self )
-{
-	PyObject *object;
-	Link *link;
-	if( !(self->iter) ) {
-		self->iter= NULL;
-		return EXPP_ReturnPyObjError( PyExc_StopIteration,
-				"iterator at end" );
-	}
-	
-	object = GetPyObjectFromID((ID *)self->iter);
-	
-	link= self->iter->next;
-	self->iter= link;
-	return object;
-}
-
-PyObject *MainSeq_getActive(BPy_MainSeq *self)
-{
-	switch (self->type) {
-	case ID_SCE:
-		if ( !G.scene ) {
-			Py_RETURN_NONE;
-		} else {
-			return Scene_CreatePyObject( ( Scene * ) G.scene );
-		}
-		
-		break;
-	case ID_IM:
-		if (!G.sima || !G.sima->image) {
-			Py_RETURN_NONE;
-		} else {
-			what_image( G.sima );	/* make sure image data exists */
-			return Image_CreatePyObject( G.sima->image );
-		}
-		break;
-	case ID_TXT: {
-			SpaceText *st= curarea->spacedata.first;
-			
-			if (st->spacetype!=SPACE_TEXT || st->text==NULL) {
-				Py_RETURN_NONE;
-			} else {
-				return Text_CreatePyObject( st->text );
-			}
-		}
-	}
-	
-	return EXPP_ReturnPyObjError( PyExc_TypeError,
-			"Only Scene and Image types have the active attribute" );
-}
-
-static int MainSeq_setActive(BPy_MainSeq *self, PyObject *value)
-{
-	switch (self->type) {
-	case ID_SCE:
-		if (!BPy_Scene_Check(value)) {
-			return EXPP_ReturnIntError(PyExc_TypeError,
-					"Must be a scene" );
-		} else {
-			BPy_Scene *bpydata;
-			Scene *data;
-			
-			bpydata = (BPy_Scene *)value;
-			data= bpydata->scene;
-			
-			if (!data)
-				return EXPP_ReturnIntError(PyExc_RuntimeError,
-					"This Scene has been removed" );
-			
-			if (data != G.scene) {
-				set_scene( data );
-				scene_update_for_newframe(data, data->lay);
-			}
-		}
-		return 0;
-		
-	case ID_IM:
-		if (!BPy_Image_Check(value)) {
-			return EXPP_ReturnIntError(PyExc_TypeError,
-					"Must be a scene" );
-		} else {
-			BPy_Image *bpydata;
-			Image *data;
-			
-			if (!G.sima) 
-				return 0;
-			
-			bpydata = (BPy_Image *)value;
-			data= bpydata->image;
-			
-			if (!data)
-				return EXPP_ReturnIntError(PyExc_RuntimeError,
-					"This Scene has been removed" );
-			
-			if (data != G.sima->image)
-				G.sima->image= data;
-		}
-		return 0;
-	
-	case ID_TXT:
-		if (!BPy_Text_Check(value)) {
-			return EXPP_ReturnIntError(PyExc_TypeError,
-					"Must be a text" );
-		} else {
-			SpaceText *st= curarea->spacedata.first;	
-			Text *data = ((BPy_Text *)value)->text;
-			
-			if( !data )
-				return EXPP_ReturnIntError( PyExc_RuntimeError,
-						      "This object isn't linked to a Blender Text Object" );
-			if(st->spacetype!=SPACE_TEXT)
-				return 0;
-			st->text = data;
-		}
-		return 0;
-	}
-	
-	return EXPP_ReturnIntError( PyExc_TypeError,
-			"Only Scene and Image types have the active attribute" );
-}
-
-static int MainSeq_setTag(BPy_MainSeq *self, PyObject *value)
-{
-	int param = PyObject_IsTrue( value );
-	ID *id;
-	
-	if( param == -1 )
-		return EXPP_ReturnIntError( PyExc_TypeError,
-				"expected int argument in range [0,1]" );
-	
-	id = (ID *)wich_libbase(G.main, self->type)->first;
-	
-	if (param) {
-		for (; id; id = id->next) {
-			id->flag |= LIB_DOIT;
-		}
-	} else {
-		for (; id; id = id->next) {
-			id->flag &= ~LIB_DOIT;
-		}
-	}
-	
-	return 0;	
-}
-
-
-/* New Data, internal functions */
-Mesh *add_mesh__internal(char *name)
-{
-	Mesh *mesh = add_mesh(name); /* doesn't return NULL now, but might someday */
-	
-	/* Bound box set to null needed because a new mesh is initialized
-	with a bounding box of -1 -1 -1 -1 -1 -1
-	if its not set to null the bounding box is not re-calculated
-	when ob.getBoundBox() is called.*/
-	MEM_freeN(mesh->bb);
-	mesh->bb= NULL;
-	return mesh;
-}
-
-/* used for new and load */
-PyObject *MainSeq_new(BPy_MainSeq *self, PyObject * args, PyObject *kwd)
-{
-	ID *id = NULL;
-	char *name=NULL, *filename=NULL, *ipo_type;
-	int img_width=256, img_height=256;
-	short ipo_code = 0;
-	int user_count = 0;
-	
-	/* Load from file */
-	if ( (	self->type==ID_IM || self->type==ID_VF 		||
-			self->type==ID_SO || self->type==ID_TXT) 	&&
-				( PyTuple_Size( args ) < 3		))
-	{
-		static char *kwlist[] = {"name", "filename", NULL};
-		
-		if(PyArg_ParseTupleAndKeywords(args, kwd, "|ss", kwlist, &name, &filename) && filename ) {
-			PyObject *ret;
-			
-			if (strlen(filename) > FILE_MAXDIR + FILE_MAXFILE - 1)
-					return ( EXPP_ReturnPyObjError( PyExc_IOError,
-								"filename too long" ) );
-			
-			if (self->type == ID_IM) {
-				Image *img = BKE_add_image_file( filename );
-				if (!img)
-					return ( EXPP_ReturnPyObjError( PyExc_IOError,
-								"couldn't load image" ) );
-				ret = Image_CreatePyObject( img );
-				
-			} else if (self->type == ID_VF) {
-				VFont *vf = load_vfont (filename);
-				if (!vf)
-					return EXPP_ReturnPyObjError( PyExc_IOError,
-								"couldn't load font" );
-				ret = Font_CreatePyObject(vf);
-				
-			} else if (self->type == ID_SO) {
-				bSound  *snd = sound_new_sound( filename );
-				if (!snd)
-					return EXPP_ReturnPyObjError( PyExc_IOError,
-								"couldn't load sound" );
-				ret = Sound_CreatePyObject(snd);
-				
-			} else if (self->type == ID_TXT) {
-				Text *txt = NULL;
-				txt = add_text( filename );
-				if( !txt )
-					return EXPP_ReturnPyObjError( PyExc_IOError,
-						      "couldn't load text" );
-				ret = Text_CreatePyObject(txt);
-			}
-			
-			if (!ret)
-					return EXPP_ReturnPyObjError( PyExc_IOError,
-						      "couldn't create pyobject on load, unknown error" );
-			if (name) {
-				ID *id = ((BPy_GenericLib *)ret)->id;
-				rename_id( id, name );
-			}
-			return ret;
-		}
-	}
-	
-	/* New Data */
-	if (self->type == ID_IM) {
-		/* Image, accepts width and height*/
-		if( !PyArg_ParseTuple( args, "s|ii", &name, &img_width, &img_height ) )
-			return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"one string and two ints expected as arguments" );
-		CLAMP(img_width,  4, 5000);
-		CLAMP(img_height, 4, 5000);
-		
-	} else if (self->type == ID_IP) {
-		/* IPO, needs name and type strings */
-		if( !PyArg_ParseTuple( args, "ss", &name, &ipo_type ) )
-			return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"two strings expected as arguments" );
-		
-		if( !strcmp( ipo_type, "Object" ) )
-			ipo_code = ID_OB;
-		else if( !strcmp( ipo_type, "Camera" ) )
-			ipo_code = ID_CA;
-		else if( !strcmp( ipo_type, "World" ) )
-			ipo_code = ID_WO;
-		else if( !strcmp( ipo_type, "Material" ) )
-			ipo_code = ID_MA;
-		else if( !strcmp( ipo_type, "Texture" ) )
-			ipo_code = ID_TE;
-		else if( !strcmp( ipo_type, "Lamp" ) )
-			ipo_code = ID_LA;
-		else if( !strcmp( ipo_type, "Action" ) )
-			ipo_code = ID_PO;
-		else if( !strcmp( ipo_type, "Constraint" ) )
-			ipo_code = ID_CO;
-		else if( !strcmp( ipo_type, "Sequence" ) )
-			ipo_code = ID_SEQ;
-		else if( !strcmp( ipo_type, "Curve" ) )
-			ipo_code = ID_CU;
-		else if( !strcmp( ipo_type, "Key" ) )
-			ipo_code = ID_KE;
-		else 
-			return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"Second argument for IPO type incorrect\t\nmust be a string in (Object, Camera, World, Material, Texture, Lamp, Action, Sequence, Curve, Key)" );
-		
-	} else {
-		/* Other types only need the name */
-		if( !PyArg_ParseTuple( args, "s", &name ) )
-			return EXPP_ReturnPyObjError( PyExc_TypeError,
-				"new(name) - name must be a string argument" );
-	}
-	
-	switch (self->type) {
-	case ID_SCE:
-		id = (ID *)add_scene( name );
-		user_count = 1;
-		break;
-	case ID_OB:
-		return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-			"Add objects through the scenes objects iterator" );
-	case ID_ME:
-		id = (ID *)add_mesh__internal( name );
-		break;
-	case ID_CU:
-		id = (ID *)add_curve( name, OB_CURVE );
-		break;
-	case ID_MB:
-		id = (ID *)add_mball( name );
-		break;
-	case ID_MA:
-		id = (ID *)add_material( name );
-		break;
-	case ID_TE:
-		id = (ID *)add_texture( name );
-		break;
-	case ID_IM: 
-	{
-		id = (ID *)BKE_add_image_size(img_width, img_height, name, 0);
-		if( !id )
-			return ( EXPP_ReturnPyObjError( PyExc_MemoryError,
-				"couldn't create PyObject Image_Type" ) );
-		/* new images have zero user count */
-		break;
-	}
-	case ID_LT:
-		id = (ID *)add_lattice( name );
-		break;
-	case ID_LA:
-		id = (ID *)add_lamp( name );
-		break;
-	case ID_CA:
-		id = (ID *)add_camera( name );
-		break;
-	case ID_IP:
-		id = (ID *)add_ipo( name, ipo_code );
-		break;
-	case ID_WO:
-		id = (ID *)add_world( name );
-		break;
-	case ID_VF:
-		return EXPP_ReturnPyObjError( PyExc_TypeError,
-			"Cannot create new fonts, use the load() function to load from a file" );
-	case ID_TXT:
-		id = (ID *)add_empty_text( name );
-		user_count = 1;
-		break;
-	case ID_SO:
-		return EXPP_ReturnPyObjError( PyExc_TypeError,
-			"Cannot create new sounds, use the load() function to load from a file" );
-	case ID_GR:	
-		id = (ID *)add_group( name );
-		user_count = 1;
-		break;
-	case ID_AR:
-		id = (ID *)add_armature( name );
-		break;
-	case ID_AC:
-		id = (ID *)add_empty_action( name );
-		user_count = 1;
-		break;
-	}
-
-	if (!id)
-		Py_RETURN_NONE;
-
-	/* set some types user count to 1, otherwise zero */
-	id->us = user_count;
-	
-	return GetPyObjectFromID(id);
-}
-
-
-PyObject *MainSeq_unlink(BPy_MainSeq *self, PyObject * args)
-{
-	PyObject *pyobj;
-	
-	switch (self->type) {
-	case ID_SCE:
-		if( !PyArg_ParseTuple( args, "O!", &Scene_Type, &pyobj ) ) {
-			return EXPP_ReturnPyObjError( PyExc_TypeError,
-					"expected Scene object" );
-		} else {
-			BPy_Scene *bpydata;
-			Scene *data;
-			
-			bpydata = (BPy_Scene *)pyobj;
-			data = bpydata->scene;
-			
-			if (!data)
-				return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-						"This Scene has been removed" );
-			
-			/* Run the removal code */
-			free_libblock( &G.main->scene, data );
-			bpydata->scene= NULL;
-			
-			Py_RETURN_NONE;
-		}
-	case ID_GR:
-		if( !PyArg_ParseTuple( args, "O!", &Group_Type, &pyobj ) ) {
-			return EXPP_ReturnPyObjError( PyExc_TypeError,
-					"expected Group object" );
-		} else {
-			BPy_Group *bpydata;
-			Group *data;
-			
-			bpydata = (BPy_Group *)pyobj;
-			data = bpydata->group;
-			
-			if (!data)
-				return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-						"This Group has been removed alredy" );
-			
-			/* Run the removal code */
-			free_group(data);
-			unlink_group(data);
-			data->id.us= 0;
-			free_libblock( &G.main->group, data );
-			bpydata->group= NULL;
-			
-			Py_RETURN_NONE;
-		}
-
-	case ID_TXT:
-		if( !PyArg_ParseTuple( args, "O!", &Text_Type, &pyobj ) ) {
-			return EXPP_ReturnPyObjError( PyExc_TypeError,
-					"expected Text object" );
-		} else {
-			BPy_Text *bpydata;
-			Text *data;
-			bpydata = (BPy_Text *)pyobj;
-			data = bpydata->text;
-			
-			if (!data)
-				return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-						"This Group has been removed alredy" );
-			
-			/* Run the removal code */
-			BPY_clear_bad_scriptlinks( data );
-			free_text_controllers( data );
-			unlink_text( data );
-			free_libblock( &G.main->text, data );
-			bpydata->text = NULL;
-			
-			Py_RETURN_NONE;
-		}
-	}
-	return EXPP_ReturnPyObjError( PyExc_TypeError,
-				      "Only types Scene, Group and Text can unlink" );	
-}
-
-static int MainSeq_compare( BPy_MainSeq * a, BPy_MainSeq * b )
-{
-	return ( a->type == b->type) ? 0 : -1;	
-}
-
-/*
- * repr function
- * callback functions building meaninful string to representations
- */
-static PyObject *MainSeq_repr( BPy_MainSeq * self )
-{
-	return PyString_FromFormat( "[Main Iterator]");
-}
-
-static PyGetSetDef MainSeq_getseters[] = {
-	{"active",
-	 (getter)MainSeq_getActive, (setter)MainSeq_setActive,
-	 "active object",
-	 NULL},
-	{"tag",
-	 (getter)NULL, (setter)MainSeq_setTag,
-	 "tag all data in True or False (write only)",
-	 NULL},
-	{NULL,NULL,NULL,NULL,NULL}  /* Sentinel */
-};
-
-static struct PyMethodDef BPy_MainSeq_methods[] = {
-	{"new", (PyCFunction)MainSeq_new, METH_VARARGS | METH_KEYWORDS,
-		"(name) - Create a new object in this scene from the obdata given and return a new object"},
-	{"unlink", (PyCFunction)MainSeq_unlink, METH_VARARGS,
-		"unlinks the object from the scene"},
-	{NULL, NULL, 0, NULL}
-};
-
-/*****************************************************************************/
-/* Python MainSeq_Type structure definition:                               */
-/*****************************************************************************/
-PyTypeObject MainSeq_Type = {
-	PyObject_HEAD_INIT( NULL )  /* required py macro */
-	0,                          /* ob_size */
-	/*  For printing, in format "<module>.<name>" */
-	"Blender MainSeq",           /* char *tp_name; */
-	sizeof( BPy_MainSeq ),       /* int tp_basicsize; */
-	0,                          /* tp_itemsize;  For allocation */
-
-	/* Methods to implement standard operations */
-
-	NULL,						/* destructor tp_dealloc; */
-	NULL,                       /* printfunc tp_print; */
-	NULL,                       /* getattrfunc tp_getattr; */
-	NULL,                       /* setattrfunc tp_setattr; */
-	( cmpfunc ) MainSeq_compare, /* cmpfunc tp_compare; */
-	( reprfunc ) MainSeq_repr,   /* reprfunc tp_repr; */
-
-	/* Method suites for standard classes */
-
-	NULL,                       /* PyNumberMethods *tp_as_number; */
-	NULL,	    /* PySequenceMethods *tp_as_sequence; */
-	&MainSeq_as_mapping,                       /* PyMappingMethods *tp_as_mapping; */
-
-	/* More standard operations (here for binary compatibility) */
-
-	NULL,                       /* hashfunc tp_hash; */
-	NULL,                       /* ternaryfunc tp_call; */
-	NULL,                       /* reprfunc tp_str; */
-	NULL,                       /* getattrofunc tp_getattro; */
-	NULL,                       /* setattrofunc tp_setattro; */
-
-	/* Functions to access object as input/output buffer */
-	NULL,                       /* PyBufferProcs *tp_as_buffer; */
-
-  /*** Flags to define presence of optional/expanded features ***/
-	Py_TPFLAGS_DEFAULT,         /* long tp_flags; */
-
-	NULL,                       /*  char *tp_doc;  Documentation string */
-  /*** Assigned meaning in release 2.0 ***/
-	/* call function for all accessible objects */
-	NULL,                       /* traverseproc tp_traverse; */
-
-	/* delete references to contained objects */
-	NULL,                       /* inquiry tp_clear; */
-
-  /***  Assigned meaning in release 2.1 ***/
-  /*** rich comparisons ***/
-	NULL,                       /* richcmpfunc tp_richcompare; */
-
-  /***  weak reference enabler ***/
-	0,                          /* long tp_weaklistoffset; */
-
-  /*** Added in release 2.2 ***/
-	/*   Iterators */
-	( getiterfunc) MainSeq_getIter, /* getiterfunc tp_iter; */
-	( iternextfunc ) MainSeq_nextIter, /* iternextfunc tp_iternext; */
-
-  /*** Attribute descriptor and subclassing stuff ***/
-	BPy_MainSeq_methods,       /* struct PyMethodDef *tp_methods; */
-	NULL,                       /* struct PyMemberDef *tp_members; */
-	MainSeq_getseters,       /* struct PyGetSetDef *tp_getset; */
-	NULL,                       /* struct _typeobject *tp_base; */
-	NULL,                       /* PyObject *tp_dict; */
-	NULL,                       /* descrgetfunc tp_descr_get; */
-	NULL,                       /* descrsetfunc tp_descr_set; */
-	0,                          /* long tp_dictoffset; */
-	NULL,                       /* initproc tp_init; */
-	NULL,                       /* allocfunc tp_alloc; */
-	NULL,                       /* newfunc tp_new; */
-	/*  Low-level free-memory routine */
-	NULL,                       /* freefunc tp_free;  */
-	/* For PyObject_IS_GC */
-	NULL,                       /* inquiry tp_is_gc;  */
-	NULL,                       /* PyObject *tp_bases; */
-	/* method resolution order */
-	NULL,                       /* PyObject *tp_mro;  */
-	NULL,                       /* PyObject *tp_cache; */
-	NULL,                       /* PyObject *tp_subclasses; */
-	NULL,                       /* PyObject *tp_weaklist; */
-	NULL
-};
-
-
-/*-----------------------Main module Init())-----------------------------*/
-
-static char M_Main_doc[] = "The Blender.Main submodule";
-
-PyObject *Main_Init( void )
-{
-	PyObject *submodule;
-	PyObject *dict;
-
-
-	if( PyType_Ready( &MainSeq_Type ) < 0 )
-		return NULL;
-	if( PyType_Ready( &Config_Type ) < 0 ) /* see Config.c */
-		return NULL;	
-	
-	submodule = Py_InitModule3( "Blender.Main", NULL, M_Main_doc );
-	dict = PyModule_GetDict( submodule );
-
-	PyDict_SetItemString( dict, "libraries", Library_Init(  ) );
-
-	
-	/* Python Data Types */
-	PyModule_AddObject( submodule, "scenes", MainSeq_CreatePyObject(NULL, ID_SCE) );
-	PyModule_AddObject( submodule, "objects", MainSeq_CreatePyObject(NULL, ID_OB) );
-	PyModule_AddObject( submodule, "meshes", MainSeq_CreatePyObject(NULL, ID_ME) );
-	PyModule_AddObject( submodule, "curves", MainSeq_CreatePyObject(NULL, ID_CU) );
-	PyModule_AddObject( submodule, "metaballs", MainSeq_CreatePyObject(NULL, ID_MB) );
-	PyModule_AddObject( submodule, "materials", MainSeq_CreatePyObject(NULL, ID_MA) );
-	PyModule_AddObject( submodule, "textures", MainSeq_CreatePyObject(NULL, ID_TE) );
-	PyModule_AddObject( submodule, "images", MainSeq_CreatePyObject(NULL, ID_IM) );
-	PyModule_AddObject( submodule, "lattices", MainSeq_CreatePyObject(NULL, ID_LT) );
-	PyModule_AddObject( submodule, "lamps", MainSeq_CreatePyObject(NULL, ID_LA) );
-	PyModule_AddObject( submodule, "cameras", MainSeq_CreatePyObject(NULL, ID_CA) );
-	PyModule_AddObject( submodule, "ipos", MainSeq_CreatePyObject(NULL, ID_IP) );
-	PyModule_AddObject( submodule, "worlds", MainSeq_CreatePyObject(NULL, ID_WO) );
-	PyModule_AddObject( submodule, "fonts", MainSeq_CreatePyObject(NULL, ID_VF) );
-	PyModule_AddObject( submodule, "texts", MainSeq_CreatePyObject(NULL, ID_TXT) );
-	PyModule_AddObject( submodule, "sounds", MainSeq_CreatePyObject(NULL, ID_SO) );
-	PyModule_AddObject( submodule, "groups", MainSeq_CreatePyObject(NULL, ID_GR) );
-	PyModule_AddObject( submodule, "armatures", MainSeq_CreatePyObject(NULL, ID_AR) );
-	PyModule_AddObject( submodule, "actions", MainSeq_CreatePyObject(NULL, ID_AC) );
-	
-	/* Other Types */
-	PyModule_AddObject( submodule, "config", Config_CreatePyObject() );
-	
-	return submodule;
-}