[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21074] branches/soc-2009-aligorith: NLA SoC: Merge from 2.5

Joshua Leung aligorith at gmail.com
Mon Jun 22 06:39:35 CEST 2009


Revision: 21074
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21074
Author:   aligorith
Date:     2009-06-22 06:39:35 +0200 (Mon, 22 Jun 2009)

Log Message:
-----------
NLA SoC: Merge from 2.5

21043 to 21072 

(NOTE TO SELF: Campbell made a commit in 2.5 before this merge finished)

Modified Paths:
--------------
    branches/soc-2009-aligorith/SConstruct
    branches/soc-2009-aligorith/config/darwin-config.py
    branches/soc-2009-aligorith/config/irix6-config.py
    branches/soc-2009-aligorith/config/linux2-config.py
    branches/soc-2009-aligorith/config/linuxcross-config.py
    branches/soc-2009-aligorith/config/openbsd3-config.py
    branches/soc-2009-aligorith/config/sunos5-config.py
    branches/soc-2009-aligorith/config/win32-mingw-config.py
    branches/soc-2009-aligorith/config/win32-vc-config.py
    branches/soc-2009-aligorith/config/win64-vc-config.py
    branches/soc-2009-aligorith/extern/CMakeLists.txt
    branches/soc-2009-aligorith/extern/Makefile
    branches/soc-2009-aligorith/extern/SConscript
    branches/soc-2009-aligorith/intern/bsp/test/Makefile
    branches/soc-2009-aligorith/intern/guardedalloc/intern/mallocn.c
    branches/soc-2009-aligorith/intern/iksolver/test/Makefile
    branches/soc-2009-aligorith/release/ui/buttons_object_constraint.py
    branches/soc-2009-aligorith/release/ui/buttons_particle.py
    branches/soc-2009-aligorith/source/Makefile
    branches/soc-2009-aligorith/source/blender/CMakeLists.txt
    branches/soc-2009-aligorith/source/blender/Makefile
    branches/soc-2009-aligorith/source/blender/SConscript
    branches/soc-2009-aligorith/source/blender/blenkernel/BKE_exotic.h
    branches/soc-2009-aligorith/source/blender/blenkernel/BKE_particle.h
    branches/soc-2009-aligorith/source/blender/blenkernel/BKE_pointcache.h
    branches/soc-2009-aligorith/source/blender/blenkernel/BKE_utildefines.h
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/blender.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/exotic.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/multires.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/particle.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/scene.c
    branches/soc-2009-aligorith/source/blender/blenlib/intern/storage.c
    branches/soc-2009-aligorith/source/blender/blenlib/intern/util.c
    branches/soc-2009-aligorith/source/blender/blenloader/intern/readfile.c
    branches/soc-2009-aligorith/source/blender/blenloader/intern/writefile.c
    branches/soc-2009-aligorith/source/blender/blenpluginapi/intern/Makefile
    branches/soc-2009-aligorith/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2009-aligorith/source/blender/editors/space_api/spacetypes.c
    branches/soc-2009-aligorith/source/blender/editors/space_buttons/SConscript
    branches/soc-2009-aligorith/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2009-aligorith/source/blender/editors/space_info/SConscript
    branches/soc-2009-aligorith/source/blender/editors/space_logic/SConscript
    branches/soc-2009-aligorith/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2009-aligorith/source/blender/editors/transform/transform_conversions.c
    branches/soc-2009-aligorith/source/blender/editors/transform/transform_input.c
    branches/soc-2009-aligorith/source/blender/editors/transform/transform_ndofinput.c
    branches/soc-2009-aligorith/source/blender/editors/transform/transform_numinput.c
    branches/soc-2009-aligorith/source/blender/gpu/intern/Makefile
    branches/soc-2009-aligorith/source/blender/imbuf/intern/imbuf.h
    branches/soc-2009-aligorith/source/blender/imbuf/intern/readimage.c
    branches/soc-2009-aligorith/source/blender/makesdna/DNA_object_force.h
    branches/soc-2009-aligorith/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2009-aligorith/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2009-aligorith/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2009-aligorith/source/blender/makesdna/intern/makesdna.c
    branches/soc-2009-aligorith/source/blender/makesrna/RNA_access.h
    branches/soc-2009-aligorith/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2009-aligorith/source/blender/makesrna/intern/makesrna.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_access.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_space.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_world.c
    branches/soc-2009-aligorith/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2009-aligorith/source/blender/render/extern/include/RE_render_ext.h
    branches/soc-2009-aligorith/source/blender/render/intern/source/convertblender.c
    branches/soc-2009-aligorith/source/blender/render/intern/source/pipeline.c
    branches/soc-2009-aligorith/source/blender/render/intern/source/zbuf.c
    branches/soc-2009-aligorith/source/blender/windowmanager/WM_types.h
    branches/soc-2009-aligorith/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2009-aligorith/source/blender/windowmanager/intern/wm_keymap.c
    branches/soc-2009-aligorith/source/creator/CMakeLists.txt
    branches/soc-2009-aligorith/source/gameengine/BlenderRoutines/Makefile
    branches/soc-2009-aligorith/source/gameengine/BlenderRoutines/SConscript
    branches/soc-2009-aligorith/source/gameengine/CMakeLists.txt
    branches/soc-2009-aligorith/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2009-aligorith/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2009-aligorith/source/gameengine/Converter/Makefile
    branches/soc-2009-aligorith/source/gameengine/Converter/SConscript
    branches/soc-2009-aligorith/source/gameengine/Expressions/CMakeLists.txt
    branches/soc-2009-aligorith/source/gameengine/GamePlayer/common/Makefile
    branches/soc-2009-aligorith/source/gameengine/GamePlayer/common/SConscript
    branches/soc-2009-aligorith/source/gameengine/GamePlayer/common/unix/GPU_Engine.cpp
    branches/soc-2009-aligorith/source/gameengine/GamePlayer/common/unix/Makefile
    branches/soc-2009-aligorith/source/gameengine/GamePlayer/ghost/SConscript
    branches/soc-2009-aligorith/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_ClientObjectInfo.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/Makefile
    branches/soc-2009-aligorith/source/gameengine/Ketsji/SConscript
    branches/soc-2009-aligorith/source/gameengine/Physics/Dummy/Makefile
    branches/soc-2009-aligorith/source/gameengine/Physics/Makefile
    branches/soc-2009-aligorith/source/gameengine/Physics/common/Makefile
    branches/soc-2009-aligorith/source/gameengine/SConscript
    branches/soc-2009-aligorith/source/nan_compile.mk
    branches/soc-2009-aligorith/source/nan_definitions.mk
    branches/soc-2009-aligorith/source/nan_link.mk
    branches/soc-2009-aligorith/tools/btools.py

Added Paths:
-----------
    branches/soc-2009-aligorith/release/ui/space_buttons.py
    branches/soc-2009-aligorith/source/blender/editors/include/ED_pointcache.h
    branches/soc-2009-aligorith/source/blender/editors/physics/ed_pointcache.c

Removed Paths:
-------------
    branches/soc-2009-aligorith/extern/qhull/
    branches/soc-2009-aligorith/extern/solid/
    branches/soc-2009-aligorith/source/blender/makesdna/DNA_radio_types.h
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_radio.c
    branches/soc-2009-aligorith/source/blender/radiosity/
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_OdePhysicsController.h
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
    branches/soc-2009-aligorith/source/gameengine/Ketsji/KX_SumoPhysicsController.h
    branches/soc-2009-aligorith/source/gameengine/Physics/BlOde/
    branches/soc-2009-aligorith/source/gameengine/Physics/Sumo/

Modified: branches/soc-2009-aligorith/SConstruct
===================================================================
--- branches/soc-2009-aligorith/SConstruct	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/SConstruct	2009-06-22 04:39:35 UTC (rev 21074)
@@ -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/soc-2009-aligorith/config/darwin-config.py
===================================================================
--- branches/soc-2009-aligorith/config/darwin-config.py	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/config/darwin-config.py	2009-06-22 04:39:35 UTC (rev 21074)
@@ -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/soc-2009-aligorith/config/irix6-config.py
===================================================================
--- branches/soc-2009-aligorith/config/irix6-config.py	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/config/irix6-config.py	2009-06-22 04:39:35 UTC (rev 21074)
@@ -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/soc-2009-aligorith/config/linux2-config.py
===================================================================
--- branches/soc-2009-aligorith/config/linux2-config.py	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/config/linux2-config.py	2009-06-22 04:39:35 UTC (rev 21074)
@@ -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/soc-2009-aligorith/config/linuxcross-config.py
===================================================================
--- branches/soc-2009-aligorith/config/linuxcross-config.py	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/config/linuxcross-config.py	2009-06-22 04:39:35 UTC (rev 21074)
@@ -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/soc-2009-aligorith/config/openbsd3-config.py
===================================================================
--- branches/soc-2009-aligorith/config/openbsd3-config.py	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/config/openbsd3-config.py	2009-06-22 04:39:35 UTC (rev 21074)
@@ -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/soc-2009-aligorith/config/sunos5-config.py
===================================================================
--- branches/soc-2009-aligorith/config/sunos5-config.py	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/config/sunos5-config.py	2009-06-22 04:39:35 UTC (rev 21074)
@@ -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/soc-2009-aligorith/config/win32-mingw-config.py
===================================================================
--- branches/soc-2009-aligorith/config/win32-mingw-config.py	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/config/win32-mingw-config.py	2009-06-22 04:39:35 UTC (rev 21074)
@@ -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/soc-2009-aligorith/config/win32-vc-config.py
===================================================================
--- branches/soc-2009-aligorith/config/win32-vc-config.py	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/config/win32-vc-config.py	2009-06-22 04:39:35 UTC (rev 21074)
@@ -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/soc-2009-aligorith/config/win64-vc-config.py
===================================================================
--- branches/soc-2009-aligorith/config/win64-vc-config.py	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/config/win64-vc-config.py	2009-06-22 04:39:35 UTC (rev 21074)
@@ -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/soc-2009-aligorith/extern/CMakeLists.txt
===================================================================
--- branches/soc-2009-aligorith/extern/CMakeLists.txt	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/extern/CMakeLists.txt	2009-06-22 04:39:35 UTC (rev 21074)
@@ -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/soc-2009-aligorith/extern/Makefile
===================================================================
--- branches/soc-2009-aligorith/extern/Makefile	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/extern/Makefile	2009-06-22 04:39:35 UTC (rev 21074)
@@ -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/soc-2009-aligorith/extern/SConscript
===================================================================
--- branches/soc-2009-aligorith/extern/SConscript	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/extern/SConscript	2009-06-22 04:39:35 UTC (rev 21074)
@@ -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/soc-2009-aligorith/intern/bsp/test/Makefile
===================================================================
--- branches/soc-2009-aligorith/intern/bsp/test/Makefile	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/intern/bsp/test/Makefile	2009-06-22 04:39:35 UTC (rev 21074)
@@ -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/soc-2009-aligorith/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/soc-2009-aligorith/intern/guardedalloc/intern/mallocn.c	2009-06-22 04:26:48 UTC (rev 21073)
+++ branches/soc-2009-aligorith/intern/guardedalloc/intern/mallocn.c	2009-06-22 04:39:35 UTC (rev 21074)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list