From 9e7643aa7c25ce551bfe59905fbf56156e264824 Mon Sep 17 00:00:00 2001 From: Nathan Letwory Date: Sun, 4 Jan 2009 18:16:34 +0000 Subject: 2.5 / Cleanup - remove Verse support. This will be brought back in The Future (probably jiri + me) This means 5k lines less in blenkernel. - fix two small errors for global cleanup, now compiles properly with FFMPEG enabled too. --- source/blender/makesdna/DNA_ID.h | 9 --------- source/blender/makesdna/DNA_image_types.h | 4 ---- source/blender/makesdna/DNA_mesh_types.h | 4 ---- source/blender/makesdna/DNA_object_types.h | 4 ---- 4 files changed, 21 deletions(-) (limited to 'source/blender/makesdna') diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h index 243f236ce3b..2846d138fbf 100644 --- a/source/blender/makesdna/DNA_ID.h +++ b/source/blender/makesdna/DNA_ID.h @@ -200,15 +200,6 @@ typedef struct PreviewImage { /* fluidsim Ipo */ #define ID_FLUIDSIM MAKE_ID2('F', 'S') - -/*#ifdef WITH_VERSE*/ -#define ID_VS MAKE_ID2('V', 'S') /* fake id for VerseSession, needed for outliner */ -#define ID_VN MAKE_ID2('V', 'N') /* fake id for VerseNode, needed for outliner */ -#define ID_MS MAKE_ID2('M', 'S') /* fake id for VerseServer root entry, needed for outliner */ -#define ID_SS MAKE_ID2('S', 'S') /* fake id for VerseServer entry, needed for ountliner */ -/*#endif*/ - - /* id->flag: set frist 8 bits always at zero while reading */ #define LIB_LOCAL 0 #define LIB_EXTERN 1 diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h index 7a6e1707dad..371b0d75951 100644 --- a/source/blender/makesdna/DNA_image_types.h +++ b/source/blender/makesdna/DNA_image_types.h @@ -95,10 +95,6 @@ typedef struct Image { /* display aspect - for UV editing images resized for faster openGL display */ float aspx, aspy; - -/*#ifdef WITH_VERSE*/ - void *vnode; /* pointer at verse bitmap node */ -/*#endif*/ } Image; diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index 8e9341cae0f..7da057efdb1 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -99,10 +99,6 @@ typedef struct Mesh { struct Multires *mr; /* Multiresolution modeling data */ struct PartialVisibility *pv; -/*ifdef WITH_VERSE*/ - /* not written in file, pointer at geometry VerseNode */ - void *vnode; -/*#endif*/ } Mesh; /* deprecated by MTFace, only here for file reading */ diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h index f3d18e0559b..7deea1899d1 100644 --- a/source/blender/makesdna/DNA_object_types.h +++ b/source/blender/makesdna/DNA_object_types.h @@ -225,10 +225,6 @@ typedef struct Object { unsigned int init_state; /* bit masks of initial state as recorded by the users */ int pad2; -/*#ifdef WITH_VERSE*/ - void *vnode; /* pointer at object VerseNode */ -/*#endif*/ - ListBase gpulamp; /* runtime, for lamps only */ } Object; -- cgit v1.2.3