diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 3 | ||||
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 3 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_types.h | 16 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 3 |
5 files changed, 2 insertions, 27 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 922931ca0b8..90cbd09b959 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -221,7 +221,6 @@ void free_object(Object *ob) MEM_freeN(ob->pose); } free_effects(&ob->effect); - BLI_freelistN(&ob->network); free_properties(&ob->prop); object_free_modifiers(ob); @@ -921,8 +920,6 @@ Object *copy_object(Object *ob) BLI_addtail(&obn->modifiers, nmd); } - obn->network.first= obn->network.last= 0; - BPY_copy_scriptlink(&ob->scriptlink); copy_properties(&obn->prop, &ob->prop); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 79e2f50c788..5053bfb9cc2 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2549,9 +2549,7 @@ static void direct_link_mesh(FileData *fd, Mesh *mesh) direct_link_customdata(fd, &mesh->edata, mesh->pv ? mesh->pv->totedge : mesh->totedge); direct_link_customdata(fd, &mesh->fdata, mesh->pv ? mesh->pv->totface : mesh->totface); - mesh->bb= NULL; - mesh->oc= 0; - mesh->mselect= NULL; + mesh->bb= mesh->mselect = NULL; /* Multires data */ mesh->mr= newdataadr(fd, mesh->mr); diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 04d5f2124c4..953c8176962 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -71,9 +71,6 @@ typedef struct Mesh { struct MSticky *msticky; struct Mesh *texcomesh; struct MSelect *mselect; - - struct OcInfo *oc; /* not written in file - TODO remove this! */ - void *sumohandle; /* this is not used anywhere anymore - TODO remove this too (Campbell)*/ struct CustomData vdata, edata, fdata; diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index 10d93205ed7..0ae38422b3e 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -69,21 +69,6 @@ typedef struct BoundBox { /* boundbox flag */ #define OB_BB_DISABLED 1 -/* OcInfo and LBuf structs are for the Enji gameengine - * These structs are not needed anymore, both should be removed */ - -typedef struct OcInfo { - float dvec[3]; - float size[3]; -} OcInfo; - -typedef struct LBuf { - short tot, max; - int pad; - struct Object **ob; -} LBuf; - - typedef struct Object { ID id; @@ -103,7 +88,6 @@ typedef struct Object { ListBase constraintChannels; ListBase effect; - ListBase network; /* This is not used anywhere - TODO, should be removed (Campbell)*/ ListBase disp; ListBase defbase; ListBase modifiers; /* list of ModifierData structures */ diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 21411528e21..b1e295d835a 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -422,9 +422,8 @@ typedef struct Scene { short use_nodes; struct bNodeTree *nodetree; - void *ed; + void *ed; /* sequence editor data is allocated here */ struct Radio *radio; - void *sumohandle; /* TODO - remove this, its not ued anywhere (Campbell) */ struct GameFraming framing; |