Revision: 21059
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21059
Author: campbellbarton
Date: 2009-06-21 18:18:38 +0200 (Sun, 21 Jun 2009)
Log Message:
-----------
Spring Cleaning
* removed radiosity render code, DNA and RNA (left in radio render pass
options), we'll get GI to replace this probably, better allow baking to vertex
colors for people who used this.
* removed deprecated solid physics library, sumo integrations and qhull, a
dependency
* removed ODE, was no longer being build or supported
* remove BEOS and AMIGA defines and references in Makefiles.
Modified Paths:
--------------
branches/blender2.5/blender/SConstruct
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/openbsd3-config.py
branches/blender2.5/blender/config/sunos5-config.py
branches/blender2.5/blender/config/win32-mingw-config.py
branches/blender2.5/blender/config/win32-vc-config.py
branches/blender2.5/blender/config/win64-vc-config.py
branches/blender2.5/blender/extern/CMakeLists.txt
branches/blender2.5/blender/extern/Makefile
branches/blender2.5/blender/extern/SConscript
branches/blender2.5/blender/intern/bsp/test/Makefile
branches/blender2.5/blender/intern/guardedalloc/intern/mallocn.c
branches/blender2.5/blender/intern/iksolver/test/Makefile
branches/blender2.5/blender/source/Makefile
branches/blender2.5/blender/source/blender/CMakeLists.txt
branches/blender2.5/blender/source/blender/Makefile
branches/blender2.5/blender/source/blender/SConscript
branches/blender2.5/blender/source/blender/blenkernel/BKE_utildefines.h
branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
branches/blender2.5/blender/source/blender/blenlib/intern/storage.c
branches/blender2.5/blender/source/blender/blenlib/intern/util.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
branches/blender2.5/blender/source/blender/blenpluginapi/intern/Makefile
branches/blender2.5/blender/source/blender/editors/space_buttons/SConscript
branches/blender2.5/blender/source/blender/editors/space_info/SConscript
branches/blender2.5/blender/source/blender/editors/space_logic/SConscript
branches/blender2.5/blender/source/blender/gpu/intern/Makefile
branches/blender2.5/blender/source/blender/imbuf/intern/imbuf.h
branches/blender2.5/blender/source/blender/imbuf/intern/readimage.c
branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
branches/blender2.5/blender/source/blender/makesdna/intern/makesdna.c
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_world.c
branches/blender2.5/blender/source/blender/render/extern/include/RE_render_ext.h
branches/blender2.5/blender/source/blender/render/intern/source/convertblender.c
branches/blender2.5/blender/source/blender/render/intern/source/pipeline.c
branches/blender2.5/blender/source/blender/render/intern/source/zbuf.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile
branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript
branches/blender2.5/blender/source/gameengine/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/blender2.5/blender/source/gameengine/Converter/Makefile
branches/blender2.5/blender/source/gameengine/Converter/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/common/Makefile
branches/blender2.5/blender/source/gameengine/GamePlayer/common/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/common/unix/GPU_Engine.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/common/unix/Makefile
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ClientObjectInfo.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/Makefile
branches/blender2.5/blender/source/gameengine/Ketsji/SConscript
branches/blender2.5/blender/source/gameengine/Physics/Dummy/Makefile
branches/blender2.5/blender/source/gameengine/Physics/Makefile
branches/blender2.5/blender/source/gameengine/Physics/common/Makefile
branches/blender2.5/blender/source/gameengine/SConscript
branches/blender2.5/blender/source/nan_compile.mk
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/qhull/
branches/blender2.5/blender/extern/solid/
branches/blender2.5/blender/source/blender/makesdna/DNA_radio_types.h
branches/blender2.5/blender/source/blender/makesrna/intern/rna_radio.c
branches/blender2.5/blender/source/blender/radiosity/
branches/blender2.5/blender/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_OdePhysicsController.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_SumoPhysicsController.h
branches/blender2.5/blender/source/gameengine/Physics/BlOde/
branches/blender2.5/blender/source/gameengine/Physics/Sumo/
Modified: branches/blender2.5/blender/SConstruct
===================================================================
--- branches/blender2.5/blender/SConstruct 2009-06-21 15:59:43 UTC (rev
21058)
+++ branches/blender2.5/blender/SConstruct 2009-06-21 16:18:38 UTC (rev
21059)
@@ -285,9 +285,7 @@
target_env_defs['WITH_BF_SDL'] = False
target_env_defs['WITH_BF_JPEG'] = False
target_env_defs['WITH_BF_PNG'] = False
- target_env_defs['WITH_BF_ODE'] = False
target_env_defs['WITH_BF_BULLET'] = False
- target_env_defs['WITH_BF_SOLID'] = False
target_env_defs['WITH_BF_BINRELOC'] = False
target_env_defs['BF_BUILDINFO'] = False
target_env_defs['BF_NO_ELBEEM'] = True
Modified: branches/blender2.5/blender/config/darwin-config.py
===================================================================
--- branches/blender2.5/blender/config/darwin-config.py 2009-06-21 15:59:43 UTC
(rev 21058)
+++ branches/blender2.5/blender/config/darwin-config.py 2009-06-21 16:18:38 UTC
(rev 21059)
@@ -141,20 +141,11 @@
WITH_BF_GAMEENGINE=True
WITH_BF_PLAYER=True
-WITH_BF_ODE = False
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = '${BF_ODE}/include'
-BF_ODE_LIB = '${BF_ODE}/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
#WITH_BF_NSPR = True
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
Modified: branches/blender2.5/blender/config/irix6-config.py
===================================================================
--- branches/blender2.5/blender/config/irix6-config.py 2009-06-21 15:59:43 UTC
(rev 21058)
+++ branches/blender2.5/blender/config/irix6-config.py 2009-06-21 16:18:38 UTC
(rev 21059)
@@ -74,20 +74,11 @@
WITH_BF_GAMEENGINE='false'
-WITH_BF_ODE = 'false'
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
WITH_BF_BULLET = 'true'
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
#WITH_BF_NSPR = 'true'
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
Modified: branches/blender2.5/blender/config/linux2-config.py
===================================================================
--- branches/blender2.5/blender/config/linux2-config.py 2009-06-21 15:59:43 UTC
(rev 21058)
+++ branches/blender2.5/blender/config/linux2-config.py 2009-06-21 16:18:38 UTC
(rev 21059)
@@ -77,20 +77,11 @@
WITH_BF_GAMEENGINE = True
WITH_BF_PLAYER = True
-WITH_BF_ODE = False
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
#WITH_BF_NSPR = True
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
Modified: branches/blender2.5/blender/config/linuxcross-config.py
===================================================================
--- branches/blender2.5/blender/config/linuxcross-config.py 2009-06-21
15:59:43 UTC (rev 21058)
+++ branches/blender2.5/blender/config/linuxcross-config.py 2009-06-21
16:18:38 UTC (rev 21059)
@@ -74,20 +74,11 @@
WITH_BF_GAMEENGINE = False
-WITH_BF_ODE = True
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
BF_WINTAB = LIBDIR + '/wintab'
BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
Modified: branches/blender2.5/blender/config/openbsd3-config.py
===================================================================
--- branches/blender2.5/blender/config/openbsd3-config.py 2009-06-21
15:59:43 UTC (rev 21058)
+++ branches/blender2.5/blender/config/openbsd3-config.py 2009-06-21
16:18:38 UTC (rev 21059)
@@ -61,20 +61,11 @@
WITH_BF_GAMEENGINE=False
-WITH_BF_ODE = False
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = '${BF_ODE}/include'
-BF_ODE_LIB = '${BF_ODE}/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
#WITH_BF_NSPR = True
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
Modified: branches/blender2.5/blender/config/sunos5-config.py
===================================================================
--- branches/blender2.5/blender/config/sunos5-config.py 2009-06-21 15:59:43 UTC
(rev 21058)
+++ branches/blender2.5/blender/config/sunos5-config.py 2009-06-21 16:18:38 UTC
(rev 21059)
@@ -69,20 +69,11 @@
WITH_BF_GAMEENGINE=False
-WITH_BF_ODE = False
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
#WITH_BF_NSPR = True
#BF_NSPR = $(LIBDIR)/nspr
#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
Modified: branches/blender2.5/blender/config/win32-mingw-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-mingw-config.py 2009-06-21
15:59:43 UTC (rev 21058)
+++ branches/blender2.5/blender/config/win32-mingw-config.py 2009-06-21
16:18:38 UTC (rev 21059)
@@ -77,20 +77,11 @@
WITH_BF_GAMEENGINE = False
-WITH_BF_ODE = True
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
BF_WINTAB = LIBDIR + '/wintab'
BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
Modified: branches/blender2.5/blender/config/win32-vc-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-vc-config.py 2009-06-21
15:59:43 UTC (rev 21058)
+++ branches/blender2.5/blender/config/win32-vc-config.py 2009-06-21
16:18:38 UTC (rev 21059)
@@ -90,20 +90,11 @@
WITH_BF_GAMEENGINE = True
WITH_BF_PLAYER = True
-WITH_BF_ODE = True
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
BF_WINTAB = LIBDIR + '/wintab'
BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
Modified: branches/blender2.5/blender/config/win64-vc-config.py
===================================================================
--- branches/blender2.5/blender/config/win64-vc-config.py 2009-06-21
15:59:43 UTC (rev 21058)
+++ branches/blender2.5/blender/config/win64-vc-config.py 2009-06-21
16:18:38 UTC (rev 21059)
@@ -93,20 +93,11 @@
WITH_BF_GAMEENGINE = True
WITH_BF_PLAYER = False
-WITH_BF_ODE = True
-BF_ODE = LIBDIR + '/ode'
-BF_ODE_INC = BF_ODE + '/include'
-BF_ODE_LIB = BF_ODE + '/lib/libode.a'
-
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
BF_BULLET_INC = '${BF_BULLET}'
BF_BULLET_LIB = 'extern_bullet'
-BF_SOLID = '#extern/solid'
-BF_SOLID_INC = '${BF_SOLID}'
-BF_SOLID_LIB = 'extern_solid'
-
BF_WINTAB = LIBDIR + '/wintab'
BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
Modified: branches/blender2.5/blender/extern/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/extern/CMakeLists.txt 2009-06-21 15:59:43 UTC
(rev 21058)
+++ branches/blender2.5/blender/extern/CMakeLists.txt 2009-06-21 16:18:38 UTC
(rev 21059)
@@ -24,11 +24,6 @@
#
# ***** END GPL LICENSE BLOCK *****
-IF(WITH_GAMEENGINE)
- ADD_SUBDIRECTORY(qhull)
- ADD_SUBDIRECTORY(solid)
-ENDIF(WITH_GAMEENGINE)
-
IF(WITH_BULLET)
ADD_SUBDIRECTORY(bullet2)
ENDIF(WITH_BULLET)
Modified: branches/blender2.5/blender/extern/Makefile
===================================================================
--- branches/blender2.5/blender/extern/Makefile 2009-06-21 15:59:43 UTC (rev
21058)
+++ branches/blender2.5/blender/extern/Makefile 2009-06-21 16:18:38 UTC (rev
21059)
@@ -30,7 +30,7 @@
SOURCEDIR = extern
DIR = $(OCGDIR)/extern
-DIRS = qhull/src solid glew/src
+DIRS = glew/src
ifeq ($(WITH_FFMPEG), true)
ifeq ($(NAN_FFMPEG), $(LCGDIR)/ffmpeg)
Modified: branches/blender2.5/blender/extern/SConscript
===================================================================
--- branches/blender2.5/blender/extern/SConscript 2009-06-21 15:59:43 UTC
(rev 21058)
+++ branches/blender2.5/blender/extern/SConscript 2009-06-21 16:18:38 UTC
(rev 21059)
@@ -4,10 +4,6 @@
SConscript(['glew/SConscript'])
-if env['WITH_BF_GAMEENGINE']:
- if env['WITH_BF_SOLID']:
- SConscript(['qhull/SConscript', 'solid/SConscript'])
-
if env['WITH_BF_BULLET']:
SConscript(['bullet2/src/SConscript'])
Modified: branches/blender2.5/blender/intern/bsp/test/Makefile
===================================================================
--- branches/blender2.5/blender/intern/bsp/test/Makefile 2009-06-21
15:59:43 UTC (rev 21058)
+++ branches/blender2.5/blender/intern/bsp/test/Makefile 2009-06-21
16:18:38 UTC (rev 21059)
@@ -47,7 +47,7 @@
SLIBS += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a
SLIBS += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a
-ifeq ($(OS),$(findstring $(OS), "beos darwin linux freebsd openbsd"))
+ifeq ($(OS),$(findstring $(OS), "darwin linux freebsd openbsd"))
LLIBS = -L/usr/X11R6/lib -lglut -pthread -lXi -lXmu
endif
Modified: branches/blender2.5/blender/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/blender2.5/blender/intern/guardedalloc/intern/mallocn.c
2009-06-21 15:59:43 UTC (rev 21058)
+++ branches/blender2.5/blender/intern/guardedalloc/intern/mallocn.c
2009-06-21 16:18:38 UTC (rev 21059)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
