diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2009-01-04 21:16:34 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2009-01-04 21:16:34 +0300 |
| commit | 9e7643aa7c25ce551bfe59905fbf56156e264824 (patch) | |
| tree | 7664a0ae5f539b9d9fb7ac476c78377373a80afb /source/blender/blenlib | |
| parent | 3aeb63cad2340d92c17df375bbe55629299661c0 (diff) | |
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.
Diffstat (limited to 'source/blender/blenlib')
| -rw-r--r-- | source/blender/blenlib/BLI_editVert.h | 9 | ||||
| -rw-r--r-- | source/blender/blenlib/BLI_storage_types.h | 3 | ||||
| -rw-r--r-- | source/blender/blenlib/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | source/blender/blenlib/SConscript | 4 |
4 files changed, 0 insertions, 21 deletions
diff --git a/source/blender/blenlib/BLI_editVert.h b/source/blender/blenlib/BLI_editVert.h index fec89690090..f0f54bae8ea 100644 --- a/source/blender/blenlib/BLI_editVert.h +++ b/source/blender/blenlib/BLI_editVert.h @@ -70,9 +70,6 @@ typedef struct EditVert short fast; /* only 0 or 1, for editmesh_fastmalloc, do not store temp data here! */ int hash; int keyindex; /* original index #, for restoring key information */ -/*#ifdef WITH_VERSE*/ - void *vvert; -/*#endif*/ void *data; /* custom vertex data */ } EditVert; @@ -132,9 +129,6 @@ typedef struct EditFace unsigned char f, f1, h; unsigned char fast; /* only 0 or 1, for editmesh_fastmalloc */ unsigned char fgonf; /* flag for fgon options */ -/*#ifdef WITH_VERSE*/ - void *vface; -/*#endif*/ void *data; /* custom face data */ } EditFace; @@ -187,9 +181,6 @@ typedef struct EditMesh CustomData vdata, edata, fdata; -#ifdef WITH_VERSE - void *vnode; -#endif } EditMesh; #endif diff --git a/source/blender/blenlib/BLI_storage_types.h b/source/blender/blenlib/BLI_storage_types.h index 01627f62e72..385aa39e6cb 100644 --- a/source/blender/blenlib/BLI_storage_types.h +++ b/source/blender/blenlib/BLI_storage_types.h @@ -74,9 +74,6 @@ struct direntry{ #define HIDDEN 1 #define FIRST 1 #define ACTIVE 2 -/*#ifdef WITH_VERSE*/ -#define VERSE 3 -/*#endif*/ #define DESELECT 0 #define NOT_YET 0 #define VISIBLE 0 diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt index 4eb01a50f39..b22e7b1dd70 100644 --- a/source/blender/blenlib/CMakeLists.txt +++ b/source/blender/blenlib/CMakeLists.txt @@ -40,11 +40,6 @@ SET(INC ) ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") -IF(WITH_VERSE) - ADD_DEFINITIONS(-DWITH_VERSE) - SET(INC ${INC} ${VERSE_INC}) -ENDIF(WITH_VERSE) - IF(WITH_INTERNATIONAL) ADD_DEFINITIONS(-DWITH_FREETYPE2) ENDIF(WITH_INTERNATIONAL) diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript index 39d4df62a93..142ffeb0a83 100644 --- a/source/blender/blenlib/SConscript +++ b/source/blender/blenlib/SConscript @@ -15,10 +15,6 @@ if env['WITH_BF_SDL']: if env['WITH_BF_INTERNATIONAL']: defs = 'WITH_FREETYPE2' -if env['WITH_BF_VERSE']: - defs += ' WITH_VERSE' - incs += ' ' + env['BF_VERSE_INCLUDE'] - if env['OURPLATFORM'] == 'linux2': cflags='-pthread' incs += ' ../../../extern/binreloc/include' |