[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18316] branches/blender2.5/blender: 2.5 / Cleanup

Nathan Letwory jesterking at letwory.net
Sun Jan 4 19:16:35 CET 2009


Revision: 18316
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18316
Author:   jesterking
Date:     2009-01-04 19:16:34 +0100 (Sun, 04 Jan 2009)

Log Message:
-----------
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.

Modified Paths:
--------------
    branches/blender2.5/blender/CMakeLists.txt
    branches/blender2.5/blender/config/darwin-config.py
    branches/blender2.5/blender/config/irix6-config.py
    branches/blender2.5/blender/config/linux2-config.py
    branches/blender2.5/blender/config/linuxcross-config.py
    branches/blender2.5/blender/config/win32-mingw-config.py
    branches/blender2.5/blender/config/win32-vc-config.py
    branches/blender2.5/blender/extern/SConscript
    branches/blender2.5/blender/source/Makefile
    branches/blender2.5/blender/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h
    branches/blender2.5/blender/source/blender/blenkernel/BKE_image.h
    branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
    branches/blender2.5/blender/source/blender/blenkernel/SConscript
    branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/Makefile
    branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/mesh.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/writeavi.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/writeffmpeg.c
    branches/blender2.5/blender/source/blender/blenlib/BLI_editVert.h
    branches/blender2.5/blender/source/blender/blenlib/BLI_storage_types.h
    branches/blender2.5/blender/source/blender/blenlib/CMakeLists.txt
    branches/blender2.5/blender/source/blender/blenlib/SConscript
    branches/blender2.5/blender/source/blender/blenloader/CMakeLists.txt
    branches/blender2.5/blender/source/blender/blenloader/SConscript
    branches/blender2.5/blender/source/blender/blenloader/intern/Makefile
    branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
    branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
    branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt
    branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
    branches/blender2.5/blender/source/blender/editors/transform/transform.h
    branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
    branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c
    branches/blender2.5/blender/source/blender/imbuf/CMakeLists.txt
    branches/blender2.5/blender/source/blender/imbuf/SConscript
    branches/blender2.5/blender/source/blender/makesdna/DNA_ID.h
    branches/blender2.5/blender/source/blender/makesdna/DNA_image_types.h
    branches/blender2.5/blender/source/blender/makesdna/DNA_mesh_types.h
    branches/blender2.5/blender/source/blender/makesdna/DNA_object_types.h
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c
    branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt
    branches/blender2.5/blender/source/blender/nodes/SConscript
    branches/blender2.5/blender/source/blender/python/CMakeLists.txt
    branches/blender2.5/blender/source/blender/python/intern/Makefile
    branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
    branches/blender2.5/blender/source/blender/windowmanager/intern/Makefile
    branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c
    branches/blender2.5/blender/source/creator/CMakeLists.txt
    branches/blender2.5/blender/source/nan_definitions.mk
    branches/blender2.5/blender/source/nan_link.mk
    branches/blender2.5/blender/tools/btools.py

Removed Paths:
-------------
    branches/blender2.5/blender/extern/verse/
    branches/blender2.5/blender/source/blender/blenkernel/BKE_verse.h
    branches/blender2.5/blender/source/blender/blenkernel/intern/verse_bitmap_node.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/verse_geometry_node.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/verse_method.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/verse_node.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/verse_object_node.c
    branches/blender2.5/blender/source/blender/blenkernel/intern/verse_session.c

Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt	2009-01-04 17:54:34 UTC (rev 18315)
+++ branches/blender2.5/blender/CMakeLists.txt	2009-01-04 18:16:34 UTC (rev 18316)
@@ -57,7 +57,6 @@
 OPTION(WITH_GAMEENGINE		"Enable Game Engine"					ON)
 OPTION(WITH_BULLET		"Enable Bullet (Physics Engine)"			ON)
 OPTION(WITH_INTERNATIONAL	"Enable I18N   (International fonts and text)"		ON)
-OPTION(WITH_VERSE		"Enable Verse  (http://verse.blender.org)"		OFF)
 OPTION(WITH_ELBEEM		"Enable Elbeem (Fluid Simulation)"			ON)
 OPTION(WITH_QUICKTIME		"Enable Quicktime Support"				OFF)
 OPTION(WITH_OPENEXR		"Enable OpenEXR Support (http://www.openexr.com)"	ON)
@@ -425,7 +424,6 @@
 
 #-----------------------------------------------------------------------------
 # Common.
-SET(VERSE_INC ${CMAKE_SOURCE_DIR}/extern/verse/dist)
 
 SET(FTGL ${CMAKE_SOURCE_DIR}/extern/bFTGL)
 SET(FTGL_INC ${FTGL}/include)

Modified: branches/blender2.5/blender/config/darwin-config.py
===================================================================
--- branches/blender2.5/blender/config/darwin-config.py	2009-01-04 17:54:34 UTC (rev 18315)
+++ branches/blender2.5/blender/config/darwin-config.py	2009-01-04 18:16:34 UTC (rev 18316)
@@ -46,12 +46,6 @@
 #BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 #BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
 
-WITH_BF_VERSE = False
-BF_VERSE = "#extern/verse/dist"
-BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
-BF_VERSE_INCLUDE = BF_VERSE
-BF_VERSE_LIBS = "libverse"
-
 # python.org libs install in /library we want to use that for 2.5 
 #
 # if you want py2.5 on leopard without installing

Modified: branches/blender2.5/blender/config/irix6-config.py
===================================================================
--- branches/blender2.5/blender/config/irix6-config.py	2009-01-04 17:54:34 UTC (rev 18315)
+++ branches/blender2.5/blender/config/irix6-config.py	2009-01-04 18:16:34 UTC (rev 18316)
@@ -2,11 +2,7 @@
 
 LCGDIR = os.getcwd()+"/../lib/irix-6.5-mips"
 LIBDIR = LCGDIR
-print LCGDIR
 
-WITH_BF_VERSE = 'false'
-BF_VERSE_INCLUDE = "#extern/verse/dist"
-
 BF_PYTHON = LCGDIR+'/python'
 BF_PYTHON_VERSION = '2.5'
 WITH_BF_STATICPYTHON = 'true'

Modified: branches/blender2.5/blender/config/linux2-config.py
===================================================================
--- branches/blender2.5/blender/config/linux2-config.py	2009-01-04 17:54:34 UTC (rev 18315)
+++ branches/blender2.5/blender/config/linux2-config.py	2009-01-04 18:16:34 UTC (rev 18316)
@@ -1,9 +1,6 @@
 LCGDIR = '../lib/linux2'
 LIBDIR = "${LCGDIR}"
 
-WITH_BF_VERSE = False
-BF_VERSE_INCLUDE = "#extern/verse/dist"
-
 BF_PYTHON = '/usr'
 BF_PYTHON_VERSION = '2.5'
 WITH_BF_STATICPYTHON = False

Modified: branches/blender2.5/blender/config/linuxcross-config.py
===================================================================
--- branches/blender2.5/blender/config/linuxcross-config.py	2009-01-04 17:54:34 UTC (rev 18315)
+++ branches/blender2.5/blender/config/linuxcross-config.py	2009-01-04 18:16:34 UTC (rev 18316)
@@ -1,9 +1,6 @@
 LCGDIR = '#../lib/windows'
 LIBDIR = '${LCGDIR}'
 
-WITH_BF_VERSE = False
-BF_VERSE_INCLUDE = "#extern/verse/dist"
-
 WITH_BF_YAFRAY = True
 
 BF_PYTHON = LIBDIR + '/python'

Modified: branches/blender2.5/blender/config/win32-mingw-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-mingw-config.py	2009-01-04 17:54:34 UTC (rev 18315)
+++ branches/blender2.5/blender/config/win32-mingw-config.py	2009-01-04 18:16:34 UTC (rev 18316)
@@ -1,9 +1,6 @@
 LCGDIR = '#../lib/windows'
 LIBDIR = "${LCGDIR}"
 
-WITH_BF_VERSE = False
-BF_VERSE_INCLUDE = "#extern/verse/dist"
-
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '2.5'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'

Modified: branches/blender2.5/blender/config/win32-vc-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-vc-config.py	2009-01-04 17:54:34 UTC (rev 18315)
+++ branches/blender2.5/blender/config/win32-vc-config.py	2009-01-04 18:16:34 UTC (rev 18316)
@@ -1,9 +1,6 @@
 LCGDIR = '#../lib/windows'
 LIBDIR = '${LCGDIR}'
 
-WITH_BF_VERSE = False
-BF_VERSE_INCLUDE = "#extern/verse/dist"
-
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True  # -DWITH_FFMPEG
 BF_FFMPEG = LIBDIR +'/ffmpeg'

Modified: branches/blender2.5/blender/extern/SConscript
===================================================================
--- branches/blender2.5/blender/extern/SConscript	2009-01-04 17:54:34 UTC (rev 18315)
+++ branches/blender2.5/blender/extern/SConscript	2009-01-04 18:16:34 UTC (rev 18316)
@@ -14,9 +14,6 @@
 if env['WITH_BF_INTERNATIONAL']:
     SConscript(['bFTGL/SConscript'])
 
-if env['WITH_BF_VERSE']:
-    SConscript(['verse/dist/SConstruct'])
-
 if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
     SConscript(['x264/SConscript'])
     SConscript(['libmp3lame/SConscript'])

Modified: branches/blender2.5/blender/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/Makefile	2009-01-04 17:54:34 UTC (rev 18315)
+++ branches/blender2.5/blender/source/Makefile	2009-01-04 18:16:34 UTC (rev 18316)
@@ -200,18 +200,6 @@
     endif
 endif
 
-ifeq ($(WITH_VERSE), true)
-   ifeq ($(OS), windows)
-       ifeq ($(FREE_WINDOWS), true)
-           COMLIB += $(NAN_VERSE)/lib/libverse.a
-       else
-           COMLIB += $(NAN_VERSE)/lib/verse.lib
-       endif
-   else
-       COMLIB += $(NAN_VERSE)/lib/libverse.a
-   endif
-endif
-
 ifeq ($(OS), irix)
     COMLIB += $(NAN_SDL)/lib/libSDL.a
 endif

Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_DerivedMesh.h	2009-01-04 17:54:34 UTC (rev 18315)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_DerivedMesh.h	2009-01-04 18:16:34 UTC (rev 18316)
@@ -83,7 +83,7 @@
 	/* copy a single vert/edge/face from the derived mesh into
 	 * *{vert/edge/face}_r. note that the current implementation
 	 * of this function can be quite slow, iterating over all
-	 * elements (editmesh, verse mesh)
+	 * elements (editmesh)
 	 */
 	void (*getVert)(DerivedMesh *dm, int index, struct MVert *vert_r);
 	void (*getEdge)(DerivedMesh *dm, int index, struct MEdge *edge_r);

Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h	2009-01-04 17:54:34 UTC (rev 18315)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h	2009-01-04 18:16:34 UTC (rev 18316)
@@ -152,10 +152,7 @@
 #define G_DRAW_EDGEANG  (1 << 24)
 
 /* #define G_RECORDKEYS	(1 << 25)   also removed */
-/*#ifdef WITH_VERSE*/
-#define G_VERSE_CONNECTED  (1 << 26)
-#define G_DRAW_VERSE_DEBUG (1 << 27)
-/*#endif*/
+
 #define G_DRAWSHARP     (1 << 28) /* draw edges with the sharp flag */
 #define G_SCULPTMODE    (1 << 29)
 #define G_PARTICLEEDIT	(1 << 30)

Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_image.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_image.h	2009-01-04 17:54:34 UTC (rev 18315)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_image.h	2009-01-04 18:16:34 UTC (rev 18316)
@@ -82,7 +82,6 @@
 #define IMA_TYPE_MULTILAYER	1
 		/* generated */
 #define IMA_TYPE_UV_TEST	2
-#define IMA_TYPE_VERSE		3
 		/* viewers */
 #define IMA_TYPE_R_RESULT   4
 #define IMA_TYPE_COMPOSITE	5

Deleted: branches/blender2.5/blender/source/blender/blenkernel/BKE_verse.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_verse.h	2009-01-04 17:54:34 UTC (rev 18315)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_verse.h	2009-01-04 18:16:34 UTC (rev 18316)
@@ -1,583 +0,0 @@
-/**
- * $Id$
- *
- * ***** BEGIN GPL 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.
- *
- * 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.
- *
- * Contributor(s): Jiri Hnidek.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/* #define WITH_VERSE */
-
-#ifndef BKE_VERSE_H
-#define BKE_VERSE_H
-
-#include "DNA_listBase.h"
-#include "BLI_dynamiclist.h"
-
-#include "verse.h"
-#include "verse_ms.h"
-
-struct VNode;
-struct VerseEdge;
-
-/*
- * Verse Edge Hash (similar to edit edge hash)
- */
-#define VEDHASHSIZE    (512*512)
-#define VEDHASH(a, b)  ((a<b ? a : b) % VEDHASHSIZE)
-
-/*
- * verse data: 4 float value
- */
-typedef struct quat_real32_item {
-	struct quat_real32_item *next, *prev;
-	struct VLayer *vlayer;		/* pointer at VerseLayer */
-	uint32 id;			/* id of item */
-	real32 value[4];
-} quat_real32_item;
-
-/*
- * verse data: 4 uint32 values
- */
-typedef struct quat_uint32_item {
-	struct quat_uint32_item *next, *prev;
-	struct VLayer *vlayer;		/* pointer at VerseLayer */
-	uint32 id;			/* id of item */
-	uint32 value[4];
-} quat_uint32_item;
-
-/*
- * verse data: 3 float values
- */
-typedef struct vec_real32_item {
-	struct vec_real32_item *next, *prev;
-	struct VLayer *vlayer;		/* pointer at VerseLayer */
-	uint32 id;			/* id of item */
-	real32 value[3];
-} vec_real32_item;
-
-/*
- * verse data: float value (weight)
- */
-typedef struct real32_item {
-	struct real32_item *next, *prev;
-	struct VLayer *vlayer;		/* pointer at VerseLayer */
-	uint32 id;			/* id of item */
-	real32 value;
-} real32_item;
-
-/*
- * verse data: uint32 value
- */
-typedef struct uint32_item {
-	struct uint32_item *next, *prev;

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list