Updating own scripts to use Blender.Main, remove Base files.
authorCampbell Barton <ideasman42@gmail.com>
Thu, 22 Feb 2007 15:48:26 +0000 (15:48 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 22 Feb 2007 15:48:26 +0000 (15:48 +0000)
17 files changed:
release/scripts/3ds_export.py
release/scripts/3ds_import.py
release/scripts/armature_symmetry.py
release/scripts/bpymodules/BPyMesh.py
release/scripts/bpymodules/BPyMesh_redux.py
release/scripts/bvh_import.py
release/scripts/mesh_skin.py
release/scripts/mesh_solidify.py
release/scripts/object_apply_def.py
release/scripts/object_batch_name_edit.py
release/scripts/uvcalc_follow_active_coords.py
release/scripts/uvcalc_from_adjacent.py
release/scripts/uvcalc_lightmap.py
release/scripts/uvcalc_quad_clickproj.py
release/scripts/uvcalc_smart_project.py
source/blender/python/api2_2x/Base.c [deleted file]
source/blender/python/api2_2x/Base.h [deleted file]

index 1507913093959884e952b7cc14ec7140bf1ec1fc..2ea6efc20805ec5c43895bf060984f293c33d78c 100644 (file)
@@ -877,7 +877,7 @@ def save_3ds(filename):
        
        time1= Blender.sys.time()
        Blender.Window.WaitCursor(1)
-       scn= Blender.Scene.GetCurrent()
+       scn= Blender.Main.scenes.active
        
        # Initialize the main chunk (primary):
        primary = _3ds_chunk(PRIMARY)
index 56525d56611e51bbe977c8e9b0af9b5e604472d2..cf4c5e511c3fb854b846daa239c9efe656b8a6ea 100644 (file)
@@ -117,7 +117,7 @@ Loader is based on 3ds loader from www.gametutorials.com (Thanks DigiBen).
 # Importing modules
 
 import Blender
-from Blender import Mesh, Scene, Object, Material, Image, Texture, Lamp, Mathutils
+from Blender import Mesh, Main, Object, Material, Image, Texture, Lamp, Mathutils
 from Blender.Mathutils import Vector
 import BPyImage
 
@@ -809,7 +809,7 @@ def load_3ds(filename, PREF_UI= True):
        
        ##IMAGE_SEARCH
        
-       scn= Scene.GetCurrent()
+       scn= Main.scenes.active
        SCN_OBJECTS = scn.objects
        SCN_OBJECTS.selected = [] # de select all
        
index b4b3e54516c8fcaf96678937056fc947f6ecbfbe..85e4d1a3afece8f02bd43a94bf88d79aec8c134b 100644 (file)
@@ -39,7 +39,7 @@ Hidden bones are ignored, and optionally only operate on selected bones.
 # --------------------------------------------------------------------------
 
 import Blender
-from Blender import Scene
+from Blender import Main
 Vector= Blender.Mathutils.Vector
 
 
@@ -248,7 +248,7 @@ def main():
        User interface function that gets the options and calls armature_symetry()
        '''
        
-       scn= Scene.GetCurrent()
+       scn= Main.scenes.active
        arm_ob= scn.objects.active
        
        if not arm_ob or arm_ob.type!='Armature':
index 91f0348549d7da0a57089e30be67fe66540edf5f..8aec94ca555ecc746e67d4983e8f6eb5f2644cd2 100644 (file)
@@ -384,7 +384,7 @@ def getMeshFromObject(ob, container_mesh=None, apply_modifiers=True, vgroups=Tru
        '''
        
        if not scn:
-               scn= Blender.Scene.GetCurrent()
+               scn= Blender.Main.scenes.active
        if not container_mesh:
                mesh = Blender.Mesh.New()       
        else:
index 581c10f1ec52af85b2da6281fd13d60154a519e4..86a2975caba990973c98c03962bb876a8d987799 100644 (file)
@@ -642,8 +642,8 @@ def redux(ob, REDUX=0.5, BOUNDRY_WEIGHT=2.0, REMOVE_DOUBLES=False, FACE_AREA_WEI
 # Example usage
 def main():
        Blender.Window.EditMode(0)
-       scn= Blender.Scene.GetCurrent()
-       active_ob= scn.getActiveObject()
+       scn= Blender.Main.scenes.active
+       active_ob= scn.objects.active
        t= Blender.sys.time()
        redux(active_ob, 0.5)
        print '%.4f' % (Blender.sys.time()-t)
index 7b0c3928cbb20176006cbfeeec4354aee6646508..0b6effe44be92bb34deeeec926619138144c71fb 100644 (file)
@@ -310,7 +310,7 @@ def bvh_node_dict2objects(bvh_nodes, IMPORT_START_FRAME= 1):
        if IMPORT_START_FRAME<1:
                IMPORT_START_FRAME= 1
                
-       scn= Blender.Scene.GetCurrent()
+       scn= Blender.Main.scenes.active
        scn.objects.selected = []
        
        objects= []
@@ -441,7 +441,7 @@ def bvh_node_dict2armature(bvh_nodes, IMPORT_START_FRAME= 1):
        
        
        
-       scn= Blender.Scene.GetCurrent()
+       scn= Blender.Main.scenes.active
        
        scn.objects.selected = []
        
@@ -731,7 +731,7 @@ def main():
 if __name__ == '__main__':
        main()
        '''
-       scn = Blender.Scene.GetCurrent()
+       scn = Blender.Main.scenes.active
        for ob in list(scn.objects): scn.objects.unlink(ob)
        load_bvh_ui('/test.bvh', False)
        '''
index a8a74eeb24d59bdee9c16a9c2b01e299aacb58b6..7c38e8a8b7947d6d8a151b3b1aee0b75b49518ed 100644 (file)
@@ -520,7 +520,7 @@ def main():
        
        is_editmode = Window.EditMode()
        if is_editmode: Window.EditMode(0)
-       ob = Blender.Scene.GetCurrent().objects.active
+       ob = Blender.Main.scenes.objects.active
        if ob == None or ob.type != 'Mesh':
                BPyMessages.Error_NoMeshActive()
                return
index fd72af4e6580e9ba22abd6ccddf1cc1429dff499..dca45b9c377b4ed28e7b08ffa57ae171a5f628fe 100644 (file)
@@ -100,7 +100,7 @@ def lengthFromAngle(angle):
 
 
 def main():
-       scn = Scene.GetCurrent()
+       scn = Main.scenes.active
        ob = scn.objects.active
        
        if not ob or ob.type != 'Mesh':
index 3046f0fea781657aee54928f7ac344494537c743..77dff67acb9af70d149965054f46ab7f3ec8e56e 100644 (file)
@@ -85,7 +85,7 @@ def copy_vgroups(source_ob, target_ob):
 
 
 def apply_deform():
-       scn= Blender.Scene.GetCurrent()
+       scn= Blender.Main.scenes.active
        #Blender.Window.EditMode(0)
        
        NAME_LENGTH = 19
index 812eee9dfe6871c377711276622fade2b835e248..eff43e05fa8abe1f77be4795278dba0ec3330edf 100644 (file)
@@ -46,7 +46,7 @@ from Blender import *
 
 global renameCount
 renameCount = 0
-obsel = Scene.GetCurrent().objects.context
+obsel = Main.scenes.active.objects.context
 
 def setDataNameWrapper(ob, newname):
        if ob.getData(name_only=1) == newname:
index d9a0d8c0c18f39152e9c452d2a03736a4ff4760b..c932106a7510407e445eed8c4acfa596e25ad98a 100644 (file)
@@ -43,7 +43,7 @@ import BPyMesh
 reload(BPyMesh)
 
 def extend():
-       scn = Scene.GetCurrent()
+       scn = Main.scenes.active
        ob = scn.objects.active
        
        # print ob, ob.type
index a476d4f110c12cad1423118b692167b2d38fca0b..ccf24c4ac52b69d3ee744e1c32aa46ab2c473f35 100644 (file)
@@ -70,7 +70,7 @@ def mostUsedImage(imageList): # Returns the image most used in the list.
 
 
 def main():
-       scn = Scene.GetCurrent()
+       scn = Main.scenes.active
        ob = scn.objects.active
        if ob == None or ob.type != 'Mesh':
                Draw.PupMenu('ERROR: No mesh object in face select mode.')
index 37c34c68710326490bc8db8ab2af6dca8edf3d11..b3a2bcfd9bfa904d1f8753c4677a33b36352e167 100644 (file)
@@ -466,7 +466,7 @@ def lightmap_uvpack(me, BOX_DIV = 8, MARGIN_DIV = 512):
 
 
 def main():
-       scn = Scene.GetCurrent()
+       scn = Main.scenes.active
        ob = scn.objects.active
        
        # print ob, ob.type
index 734306e28555417bf71a53c5a14727b7eabf0fba..dfaf653ecf36874120726fac0ceb7ccc21c0f2d9 100644 (file)
@@ -74,7 +74,7 @@ def mousedown_wait():
 
 def main():
        
-       scn = Scene.GetCurrent()
+       scn = Blender.Main.scenes.active
        ob = scn.objects.active
        if not ob or ob.type!='Mesh':
                return
index 775594a1bb4bade8528dc18a4c45fbf7aee4ed42..d805cbf3f06493be0b9169da79275b697c3c3acf 100644 (file)
@@ -42,7 +42,7 @@ selected faces, or all faces.
 # -------------------------------------------------------------------------- 
 
 
-from Blender import Object, Scene, Draw, Window, sys, Mesh, Geometry
+from Blender import Object, Draw, Window, sys, Mesh, Geometry
 from Blender.Mathutils import CrossVecs, Matrix, Vector, RotationMatrix, DotVecs
 
 from math import cos
@@ -833,12 +833,11 @@ def main():
        global USER_STRETCH_ASPECT
        global USER_ISLAND_MARGIN
        
-       objects= Scene.GetCurrent().objects
+       objects= Main.scenes.active.objects
        
        # Use datanames as kesy so as not to unwrap a mesh more then once.
        obList =  dict([(ob.getData(name_only=1), ob) for ob in objects.context if ob.type == 'Mesh'])
        
-       
        # Face select object may not be selected.
        ob = objects.active
        if ob and ob.sel == 0 and ob.type == 'Mesh':
diff --git a/source/blender/python/api2_2x/Base.c b/source/blender/python/api2_2x/Base.c
deleted file mode 100644 (file)
index 883cce5..0000000
+++ /dev/null
@@ -1,723 +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" /* BaseSeq_new */
-#include "DNA_texture_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"
-
-#include "BKE_global.h"
-#include "BKE_main.h"
-#include "BKE_library.h"
-#include "BKE_object.h"
-#include "BKE_scene.h"
-#include "BKE_sca.h" /*free_text_controllers*/
-#include "BKE_font.h"
-#include "BKE_mball.h" /* add_mball */
-#include "BKE_mesh.h" /* add_mesh */
-#include "BKE_curve.h" /* add_curve */
-#include "BKE_material.h"
-#include "BKE_group.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 */
-
-/* python types */
-#include "../BPY_extern.h" /* clearing scriptlinks */
-
-#include "gen_utils.h"
-
-#include "Object.h"
-#include "Camera.h"
-#include "Armature.h"
-#include "Lamp.h"
-#include "CurNurb.h"
-#include "NMesh.h"
-#include "Mesh.h"
-#include "Lattice.h"
-#include "Metaball.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 "Base.h"
-#include "Scene.h"
-
-static PyObject *BaseSeq_CreatePyObject( Link *iter, int type )
-{
-       BPy_BaseSeq *seq = PyObject_NEW( BPy_BaseSeq, &BaseSeq_Type);
-       seq->iter = iter;
-       seq->type = type;
-       return (PyObject *)seq;
-}
-
-static PyObject *Link_as_BPyData( Link *link, short type )
-{
-       switch (type) {
-       case ID_SCE:
-               return Scene_CreatePyObject( ( Scene *) link );
-               break;
-       case ID_OB:
-               return Object_CreatePyObject( (Object *) link );
-               break;
-       case ID_ME:
-               return Mesh_CreatePyObject( (Mesh *)link, NULL );
-               break;
-       case ID_CU: /*todo, support curnurbs?*/
-               return Curve_CreatePyObject((Curve *)link);
-               break;
-       case ID_MB:
-               return Metaball_CreatePyObject((MetaBall *)link);
-               break;
-       case ID_MA:
-               return Material_CreatePyObject((Material *)link);
-               break;
-       case ID_TE:
-               return Texture_CreatePyObject((Tex *)link);
-               break;
-       case ID_IM:
-               return Image_CreatePyObject((Image *)link);
-               break;
-       case ID_LT:
-               return Lattice_CreatePyObject((Lattice *)link);
-               break;
-       case ID_LA:
-               return Lamp_CreatePyObject((Lamp *)link);
-               break;
-       case ID_CA:
-               return Camera_CreatePyObject((Camera *)link);
-               break;
-       case ID_IP:
-               return Ipo_CreatePyObject((Ipo *)link);
-               break;
-       case ID_WO:
-               return World_CreatePyObject((World *)link);
-               break;
-       case ID_VF:
-               return Font_CreatePyObject((VFont *)link);
-               break;
-       case ID_TXT:
-               return Text_CreatePyObject((Text *)link);
-               break;
-       case ID_SO:
-               return Sound_CreatePyObject((bSound *)link);
-               break;
-       case ID_GR:
-               return Group_CreatePyObject((Group *)link);
-               break;
-       case ID_AR:
-               return Armature_CreatePyObject((bArmature *)link);
-               break;
-       case ID_AC:
-               return Action_CreatePyObject((bAction *)link);
-               break;
-       }
-       Py_RETURN_NONE;
-}
-
-static int BaseSeq_len( BPy_BaseSeq * self )
-{
-       ListBase *lb = wich_libbase(G.main, self->type);
-       return BLI_countlist( lb );
-}
-
-static PyObject * BaseSeq_subscript(BPy_BaseSeq * 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 Link_as_BPyData((Link *)id, self->type);
-                       }
-               }
-       }
-       return ( EXPP_ReturnPyObjError
-                                ( PyExc_KeyError, "Requested data does not exist") );
-}
-
-static PyMappingMethods BaseSeq_as_mapping = {
-       ( inquiry ) BaseSeq_len,        /* mp_length */
-       ( binaryfunc ) BaseSeq_subscript,       /* mp_subscript */
-       ( objobjargproc ) 0,    /* mp_ass_subscript */
-};
-
-
-/************************************************************************
- *
- * Python BaseSeq_Type iterator (iterates over GroupObjects)
- *
- ************************************************************************/
-
-/*
- * Initialize the interator index
- */
-
-static PyObject *BaseSeq_getIter( BPy_BaseSeq * 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 BaseSeq_CreatePyObject(link, self->type);
-       }
-}
-
-/*
- * Return next BaseOb.
- */
-
-static PyObject *BaseSeq_nextIter( BPy_BaseSeq * self )
-{
-       PyObject *object;
-       Link *link;
-       if( !(self->iter) ) {
-               self->iter= NULL;
-               return EXPP_ReturnPyObjError( PyExc_StopIteration,
-                               "iterator at end" );
-       }
-       
-       object = Link_as_BPyData(self->iter, self->type);
-       
-       link= self->iter->next;
-       self->iter= link;
-       return object;
-}
-
-PyObject *BaseSeq_getActive(BPy_BaseSeq *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;
-       }
-       
-       return EXPP_ReturnPyObjError( PyExc_TypeError,
-                       "Only Scene and Image types have the active attribute" );
-}
-
-static int BaseSeq_setActive(BPy_BaseSeq *self, PyObject *value)
-{
-       switch (self->type) {
-       case ID_SCE:
-               if (!Scene_CheckPyObject(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 (!Image_CheckPyObject(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;
-       }
-       
-       return EXPP_ReturnIntError( PyExc_TypeError,
-                       "Only Scene and Image types have the active attribute" );
-}
-
-
-Mesh *add_mesh__internal(char *name)
-{
-       Mesh *mesh = add_mesh(); /* 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;
-       mesh->id.us = 0;
-       rename_id( &mesh->id, name );
-       return mesh;
-}
-
-Curve *add_curve__internal(char *name)
-{
-       Curve *blcurve = NULL;  /* for actual Curve Data we create in Blender */
-       
-       blcurve = add_curve( OB_CURVE );        /* first create the Curve Data in Blender */
-
-       /* null check? */
-
-       /* return user count to zero because add_curve() inc'd it */
-       blcurve->id.us = 0;
-       rename_id( &blcurve->id, name );
-       return blcurve;
-}
-
-MetaBall *add_metaball__internal(char *name)
-{
-       MetaBall *blmball;      /* for actual Data we create in Blender */
-       blmball = add_mball(  );        /* first create the MetaBall Data in Blender */
-
-       /* null check? */
-
-       /* return user count to zero because add_curve() inc'd it */
-       blmball->id.us = 0;
-       rename_id( &blmball->id, name );
-       return blmball;
-}
-
-
-PyObject *BaseSeq_new(BPy_BaseSeq *self, PyObject * args)
-{
-       
-       char *name;
-       if( !PyArg_ParseTuple( args, "s#", &name, 21 ) )
-               return EXPP_ReturnPyObjError( PyExc_TypeError,
-                               "string expected as argument" );
-       
-       /* TODO, New data functions */
-       
-       /*
-       switch (type) {
-       case ID_SCE:
-               return Scene_CreatePyObject( add_scene( name ) );
-       case ID_OB:
-               return EXPP_ReturnPyObjError( PyExc_RuntimeError,
-                       "Add objects through the scenes objects iterator" );
-       case ID_ME:
-               return Mesh_CreatePyObject( add_mesh__internal( name ) );
-       case ID_CU:
-               return Curve_CreatePyObject(add_curve__internal( name ) );
-       case ID_MB:
-               return Metaball_CreatePyObject((MetaBall *)link);
-               
-               break;
-       case ID_MA:
-               
-               break;
-       case ID_TE:
-               
-               break;
-       case ID_IM:
-               
-               break;
-       case ID_LT:
-               
-               break;
-       case ID_LA:
-               
-               break;
-       
-       case ID_CA:
-               
-               break;
-       case ID_IP:
-               
-               break;
-       case ID_WO:
-               
-               break;
-       case ID_VF:
-               
-               break;
-       case ID_TXT:
-               
-               break;
-       case ID_SO:
-               
-               break;
-       case ID_GR:
-               
-               break;
-       case ID_AR:
-               
-               break;
-       case ID_AC:
-               
-               break;
-       }
-       */
-       Py_RETURN_NONE;
-}
-
-
-PyObject *BaseSeq_unlink(BPy_BaseSeq *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" );  
-}
-
-/************************************************************************
- *
- * Python BaseSeq_Type standard operations
- *
- ************************************************************************/
-static void BaseSeq_dealloc( BPy_BaseSeq * self )
-{
-       PyObject_DEL( self );
-}
-
-static int BaseSeq_compare( BPy_BaseSeq * a, BPy_BaseSeq * b )
-{
-       return ( a->type == b->type) ? 0 : -1;  
-}
-
-/*
- * repr function
- * callback functions building meaninful string to representations
- */
-static PyObject *BaseSeq_repr( BPy_BaseSeq * self )
-{
-       return PyString_FromFormat( "[Base Iterator]");
-}
-
-static PyGetSetDef BaseSeq_getseters[] = {
-       {"active",
-        (getter)BaseSeq_getActive, (setter)BaseSeq_setActive,
-        "active object",
-        NULL},
-       {NULL,NULL,NULL,NULL,NULL}  /* Sentinel */
-};
-
-static struct PyMethodDef BPy_BaseSeq_methods[] = {
-       {"new", (PyCFunction)BaseSeq_new, METH_VARARGS,
-               "Create a new object in this scene from the obdata given and return a new object"},
-       {"unlink", (PyCFunction)BaseSeq_unlink, METH_VARARGS,
-               "unlinks the object from the scene"},
-       {NULL, NULL, 0, NULL}
-};
-
-/*****************************************************************************/
-/* Python BaseSeq_Type structure definition:                               */
-/*****************************************************************************/
-PyTypeObject BaseSeq_Type = {
-       PyObject_HEAD_INIT( NULL )  /* required py macro */
-       0,                          /* ob_size */
-       /*  For printing, in format "<module>.<name>" */
-       "Blender BaseSeq",           /* char *tp_name; */
-       sizeof( BPy_BaseSeq ),       /* int tp_basicsize; */
-       0,                          /* tp_itemsize;  For allocation */
-
-       /* Methods to implement standard operations */
-
-       ( destructor ) BaseSeq_dealloc,/* destructor tp_dealloc; */
-       NULL,                       /* printfunc tp_print; */
-       NULL,                       /* getattrfunc tp_getattr; */
-       NULL,                       /* setattrfunc tp_setattr; */
-       ( cmpfunc ) BaseSeq_compare, /* cmpfunc tp_compare; */
-       ( reprfunc ) BaseSeq_repr,   /* reprfunc tp_repr; */
-
-       /* Method suites for standard classes */
-
-       NULL,                       /* PyNumberMethods *tp_as_number; */
-       NULL,       /* PySequenceMethods *tp_as_sequence; */
-       &BaseSeq_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) BaseSeq_getIter, /* getiterfunc tp_iter; */
-       ( iternextfunc ) BaseSeq_nextIter, /* iternextfunc tp_iternext; */
-
-  /*** Attribute descriptor and subclassing stuff ***/
-       BPy_BaseSeq_methods,       /* struct PyMethodDef *tp_methods; */
-       NULL,                       /* struct PyMemberDef *tp_members; */
-       BaseSeq_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
-};
-
-
-/*-----------------------Base module Init())-----------------------------*/
-
-static char M_Base_doc[] = "The Blender.Base submodule";
-
-PyObject *Base_Init( void )
-{
-       PyObject *submodule;
-
-       if( PyType_Ready( &BaseSeq_Type ) < 0 )
-               return NULL;
-
-       submodule = Py_InitModule3( "Blender.Base", NULL, M_Base_doc );
-       
-       PyModule_AddObject( submodule, "scenes", BaseSeq_CreatePyObject(NULL, ID_SCE) );
-       PyModule_AddObject( submodule, "objects", BaseSeq_CreatePyObject(NULL, ID_OB) );
-       PyModule_AddObject( submodule, "meshes", BaseSeq_CreatePyObject(NULL, ID_ME) );
-       PyModule_AddObject( submodule, "curves", BaseSeq_CreatePyObject(NULL, ID_CU) );
-       PyModule_AddObject( submodule, "metaballs", BaseSeq_CreatePyObject(NULL, ID_MB) );
-       PyModule_AddObject( submodule, "materials", BaseSeq_CreatePyObject(NULL, ID_MA) );
-       PyModule_AddObject( submodule, "textures", BaseSeq_CreatePyObject(NULL, ID_TE) );
-       PyModule_AddObject( submodule, "images", BaseSeq_CreatePyObject(NULL, ID_IM) );
-       PyModule_AddObject( submodule, "lattices", BaseSeq_CreatePyObject(NULL, ID_LT) );
-       PyModule_AddObject( submodule, "lamps", BaseSeq_CreatePyObject(NULL, ID_LA) );
-       PyModule_AddObject( submodule, "cameras", BaseSeq_CreatePyObject(NULL, ID_CA) );
-       PyModule_AddObject( submodule, "ipos", BaseSeq_CreatePyObject(NULL, ID_IP) );
-       PyModule_AddObject( submodule, "worlds", BaseSeq_CreatePyObject(NULL, ID_WO) );
-       PyModule_AddObject( submodule, "fonts", BaseSeq_CreatePyObject(NULL, ID_VF) );
-       PyModule_AddObject( submodule, "texts", BaseSeq_CreatePyObject(NULL, ID_TXT) );
-       PyModule_AddObject( submodule, "sounds", BaseSeq_CreatePyObject(NULL, ID_SO) );
-       PyModule_AddObject( submodule, "groups", BaseSeq_CreatePyObject(NULL, ID_GR) );
-       PyModule_AddObject( submodule, "armatures", BaseSeq_CreatePyObject(NULL, ID_AR) );
-       PyModule_AddObject( submodule, "actions", BaseSeq_CreatePyObject(NULL, ID_AC) );
-       
-       return submodule;
-}
diff --git a/source/blender/python/api2_2x/Base.h b/source/blender/python/api2_2x/Base.h
deleted file mode 100644 (file)
index e6fb4f5..0000000
+++ /dev/null
@@ -1,55 +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 *****
-*/
-
-#ifndef EXPP_BASE_H
-#define EXPP_BASE_H
-
-#include <Python.h>
-
-/* The Base PyType Object defined in Base.c */
-extern PyTypeObject BaseSeq_Type;
-
-#define BPy_BaseSeq_Check(v) \
-    ((v)->ob_type == &BaseSeq_Type)
-
-/* Base sequence, iterate on the libdatas listbase*/
-typedef struct {
-       PyObject_VAR_HEAD /* required python macro   */
-       Link *iter; /* so we can iterate over the listbase */
-       
-       short type; /* store the ID type such as ID_ME */
-} BPy_BaseSeq;
-
-
-PyObject *Base_Init( void );
-
-#endif                         /* EXPP_BASE_H */