[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17202] branches/sim_physics: svn merge -r 17042:17201 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Daniel Genrich
daniel.genrich at gmx.net
Mon Oct 27 21:14:45 CET 2008
Revision: 17202
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17202
Author: genscher
Date: 2008-10-27 21:14:45 +0100 (Mon, 27 Oct 2008)
Log Message:
-----------
svn merge -r 17042:17201 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/sim_physics/SConstruct
branches/sim_physics/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/de/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/el/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/es/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/it/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
branches/sim_physics/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
branches/sim_physics/config/darwin-config.py
branches/sim_physics/config/linux2-config.py
branches/sim_physics/config/linuxcross-config.py
branches/sim_physics/config/openbsd3-config.py
branches/sim_physics/config/sunos5-config.py
branches/sim_physics/config/win32-mingw-config.py
branches/sim_physics/config/win32-vc-config.py
branches/sim_physics/extern/bFTGL/SConscript
branches/sim_physics/extern/bullet2/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.cpp
branches/sim_physics/extern/bullet2/src/BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.cpp
branches/sim_physics/intern/SConscript
branches/sim_physics/intern/elbeem/SConscript
branches/sim_physics/intern/ghost/SConscript
branches/sim_physics/release/VERSION
branches/sim_physics/release/datafiles/splash.jpg
branches/sim_physics/release/scripts/DirectX8Exporter.py
branches/sim_physics/release/scripts/export_fbx.py
branches/sim_physics/release/scripts/export_obj.py
branches/sim_physics/release/scripts/hotkeys.py
branches/sim_physics/release/scripts/import_obj.py
branches/sim_physics/release/scripts/lightwave_import.py
branches/sim_physics/release/scripts/object_drop.py
branches/sim_physics/release/scripts/ply_export.py
branches/sim_physics/release/scripts/ply_import.py
branches/sim_physics/release/scripts/render_save_layers.py
branches/sim_physics/release/scripts/scripttemplate_gamelogic_basic.py
branches/sim_physics/release/scripts/uvcalc_lightmap.py
branches/sim_physics/release/scripts/vrml97_export.py
branches/sim_physics/release/scripts/wizard_curve2tree.py
branches/sim_physics/release/text/BlenderQuickStart.pdf
branches/sim_physics/release/windows/installer/00.sconsblender.nsi
branches/sim_physics/source/SConscript
branches/sim_physics/source/blender/SConscript
branches/sim_physics/source/blender/blenkernel/BKE_blender.h
branches/sim_physics/source/blender/blenkernel/SConscript
branches/sim_physics/source/blender/blenkernel/intern/collision.c
branches/sim_physics/source/blender/blenkernel/intern/constraint.c
branches/sim_physics/source/blender/blenkernel/intern/ipo.c
branches/sim_physics/source/blender/blenkernel/intern/shrinkwrap.c
branches/sim_physics/source/blender/blenlib/SConscript
branches/sim_physics/source/blender/blenlib/intern/fileops.c
branches/sim_physics/source/blender/blenloader/intern/readfile.c
branches/sim_physics/source/blender/blenpluginapi/SConscript
branches/sim_physics/source/blender/gpu/GPU_extensions.h
branches/sim_physics/source/blender/gpu/intern/gpu_extensions.c
branches/sim_physics/source/blender/gpu/intern/gpu_material.c
branches/sim_physics/source/blender/imbuf/SConscript
branches/sim_physics/source/blender/include/BIF_editdeform.h
branches/sim_physics/source/blender/makesdna/DNA_view3d_types.h
branches/sim_physics/source/blender/nodes/SConscript
branches/sim_physics/source/blender/python/BPY_interface.c
branches/sim_physics/source/blender/python/SConscript
branches/sim_physics/source/blender/python/api2_2x/Armature.c
branches/sim_physics/source/blender/python/api2_2x/BezTriple.c
branches/sim_physics/source/blender/python/api2_2x/CurNurb.c
branches/sim_physics/source/blender/python/api2_2x/Curve.c
branches/sim_physics/source/blender/python/api2_2x/Draw.c
branches/sim_physics/source/blender/python/api2_2x/Material.c
branches/sim_physics/source/blender/python/api2_2x/Mesh.c
branches/sim_physics/source/blender/python/api2_2x/Object.c
branches/sim_physics/source/blender/python/api2_2x/Types.c
branches/sim_physics/source/blender/python/api2_2x/doc/BGL.py
branches/sim_physics/source/blender/python/api2_2x/doc/Blender.py
branches/sim_physics/source/blender/python/api2_2x/doc/Draw.py
branches/sim_physics/source/blender/python/api2_2x/doc/Ipo.py
branches/sim_physics/source/blender/python/api2_2x/doc/IpoCurve.py
branches/sim_physics/source/blender/python/api2_2x/doc/Material.py
branches/sim_physics/source/blender/python/api2_2x/doc/Mesh.py
branches/sim_physics/source/blender/python/api2_2x/doc/Noise.py
branches/sim_physics/source/blender/python/api2_2x/doc/Particle.py
branches/sim_physics/source/blender/python/api2_2x/doc/Render.py
branches/sim_physics/source/blender/python/api2_2x/doc/Text.py
branches/sim_physics/source/blender/python/api2_2x/doc/Texture.py
branches/sim_physics/source/blender/python/api2_2x/doc/Types.py
branches/sim_physics/source/blender/python/api2_2x/doc/epy_docgen.sh
branches/sim_physics/source/blender/python/api2_2x/sceneRender.c
branches/sim_physics/source/blender/render/SConscript
branches/sim_physics/source/blender/render/intern/include/sss.h
branches/sim_physics/source/blender/render/intern/include/zbuf.h
branches/sim_physics/source/blender/render/intern/source/convertblender.c
branches/sim_physics/source/blender/render/intern/source/envmap.c
branches/sim_physics/source/blender/render/intern/source/shadeoutput.c
branches/sim_physics/source/blender/render/intern/source/sss.c
branches/sim_physics/source/blender/render/intern/source/zbuf.c
branches/sim_physics/source/blender/src/SConscript
branches/sim_physics/source/blender/src/buttons_editing.c
branches/sim_physics/source/blender/src/buttons_object.c
branches/sim_physics/source/blender/src/buttons_shading.c
branches/sim_physics/source/blender/src/drawaction.c
branches/sim_physics/source/blender/src/drawgpencil.c
branches/sim_physics/source/blender/src/drawimage.c
branches/sim_physics/source/blender/src/drawobject.c
branches/sim_physics/source/blender/src/editaction.c
branches/sim_physics/source/blender/src/editaction_gpencil.c
branches/sim_physics/source/blender/src/editarmature.c
branches/sim_physics/source/blender/src/editconstraint.c
branches/sim_physics/source/blender/src/editdeform.c
branches/sim_physics/source/blender/src/editipo.c
branches/sim_physics/source/blender/src/editmesh.c
branches/sim_physics/source/blender/src/editnla.c
branches/sim_physics/source/blender/src/gpencil.c
branches/sim_physics/source/blender/src/hddaudio.c
branches/sim_physics/source/blender/src/header_info.c
branches/sim_physics/source/blender/src/header_time.c
branches/sim_physics/source/blender/src/header_view3d.c
branches/sim_physics/source/blender/src/imagepaint.c
branches/sim_physics/source/blender/src/keyframing.c
branches/sim_physics/source/blender/src/outliner.c
branches/sim_physics/source/blender/src/poselib.c
branches/sim_physics/source/blender/src/poseobject.c
branches/sim_physics/source/blender/src/space.c
branches/sim_physics/source/blender/src/splash.jpg.c
branches/sim_physics/source/blender/src/toets.c
branches/sim_physics/source/blender/src/transform.c
branches/sim_physics/source/blender/src/transform_conversions.c
branches/sim_physics/source/blender/src/view.c
branches/sim_physics/source/creator/SConscript
branches/sim_physics/source/creator/creator.c
branches/sim_physics/source/gameengine/GameLogic/SCA_ISensor.h
branches/sim_physics/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/sim_physics/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_GameObject.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_GameObject.h
branches/sim_physics/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_Scene.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/sim_physics/source/gameengine/Ketsji/KX_TouchSensor.h
branches/sim_physics/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/sim_physics/source/gameengine/PyDoc/GameLogic.py
branches/sim_physics/source/gameengine/PyDoc/KX_ActuatorSensor.py
branches/sim_physics/source/gameengine/PyDoc/KX_ConstraintActuator.py
branches/sim_physics/source/gameengine/PyDoc/KX_GameObject.py
branches/sim_physics/source/gameengine/PyDoc/KX_IpoActuator.py
branches/sim_physics/source/gameengine/PyDoc/Rasterizer.py
branches/sim_physics/source/gameengine/PyDoc/epy_docgen.sh
branches/sim_physics/tools/Blender.py
branches/sim_physics/tools/btools.py
Added Paths:
-----------
branches/sim_physics/release/scripts/import_web3d.py
branches/sim_physics/release/text/release_248.txt
branches/sim_physics/source/blender/python/api2_2x/doc/Renderlayer.py
branches/sim_physics/source/blender/python/api2_2x/doc/SConscript
branches/sim_physics/source/gameengine/PyDoc/SCA_JoystickSensor.py
branches/sim_physics/source/gameengine/PyDoc/SConscript
Modified: branches/sim_physics/SConstruct
===================================================================
--- branches/sim_physics/SConstruct 2008-10-27 15:47:58 UTC (rev 17201)
+++ branches/sim_physics/SConstruct 2008-10-27 20:14:45 UTC (rev 17202)
@@ -277,15 +277,15 @@
env['WITH_BF_BINRELOC'] = False
env['BF_BUILDINFO'] = False
env['BF_NO_ELBEEM'] = True
-
-
# lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
#B.root_build_dir = B.arguments.get('BF_BUILDDIR', '..'+os.sep+'build'+os.sep+platform+os.sep)
B.root_build_dir = env['BF_BUILDDIR']
-env['BUILDDIR'] = B.root_build_dir
+B.doc_build_dir = env['BF_DOCDIR']
if not B.root_build_dir[-1]==os.sep:
B.root_build_dir += os.sep
+if not B.doc_build_dir[-1]==os.sep:
+ B.doc_build_dir += os.sep
# We do a shortcut for clean when no quicklist is given: just delete
# builddir without reading in SConscripts
@@ -294,8 +294,18 @@
do_clean = True
if not quickie and do_clean:
+ if os.path.exists(B.doc_build_dir):
+ print B.bc.HEADER+'Cleaning doc dir...'+B.bc.ENDC
+ dirs = os.listdir(B.doc_build_dir)
+ for entry in dirs:
+ if os.path.isdir(B.doc_build_dir + entry) == 1:
+ print "clean dir %s"%(B.doc_build_dir+entry)
+ shutil.rmtree(B.doc_build_dir+entry)
+ else: # remove file
+ print "remove file %s"%(B.doc_build_dir+entry)
+ os.remove(B.root_build_dir+entry)
if os.path.exists(B.root_build_dir):
- print B.bc.HEADER+'Cleaning...'+B.bc.ENDC
+ print B.bc.HEADER+'Cleaning build dir...'+B.bc.ENDC
dirs = os.listdir(B.root_build_dir)
for entry in dirs:
if os.path.isdir(B.root_build_dir + entry) == 1:
@@ -321,6 +331,8 @@
os.makedirs ( B.root_build_dir + 'extern' )
os.makedirs ( B.root_build_dir + 'lib' )
os.makedirs ( B.root_build_dir + 'bin' )
+if not os.path.isdir(B.doc_build_dir):
+ os.makedirs ( B.doc_build_dir )
Help(opts.GenerateHelpText(env))
@@ -363,7 +375,8 @@
thestatlibs, thelibincs = B.setup_staticlibs(env)
thesyslibs = B.setup_syslibs(env)
-env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
+if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
+ env.BlenderProg(B.root_build_dir, "blender", dobj + mainlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
if env['WITH_BF_PLAYER']:
playerlist = B.create_blender_liblist(env, 'player')
env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist + thestatlibs, [], thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
@@ -534,6 +547,10 @@
nsiscmd = env.Command('nsisinstaller', None, nsisaction)
nsisalias = env.Alias('nsis', nsiscmd)
+if 'blender' in B.targets:
+ blenderexe= env.Alias('blender', B.program_list)
+ Depends(blenderexe,installtarget)
+
if env['WITH_BF_PLAYER']:
blenderplayer = env.Alias('blenderplayer', B.program_list)
Depends(blenderplayer,installtarget)
@@ -560,5 +577,7 @@
# TODO: build stubs and link into blenderplayer
#------------ EPYDOC
-# TODO: run epydoc
+if env['WITH_BF_DOCS']:
+ SConscript('source/blender/python/api2_2x/doc/SConscript')
+ SConscript('source/gameengine/PyDoc/SConscript')
Modified: branches/sim_physics/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/de/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/el/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/es/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/it/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Modified: branches/sim_physics/config/darwin-config.py
===================================================================
--- branches/sim_physics/config/darwin-config.py 2008-10-27 15:47:58 UTC (rev 17201)
+++ branches/sim_physics/config/darwin-config.py 2008-10-27 20:14:45 UTC (rev 17202)
@@ -8,7 +8,7 @@
import commands
# IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs
-USE_SDK='true'
+USE_SDK=True
BF_PYTHON_VERSION = '2.3'
@@ -38,15 +38,15 @@
# enable ffmpeg support
-WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG
+WITH_BF_FFMPEG = True # -DWITH_FFMPEG
BF_FFMPEG = "#extern/ffmpeg"
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-if USE_SDK=='true':
+if USE_SDK==True:
BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS
#BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
#BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
-WITH_BF_VERSE = 'false'
+WITH_BF_VERSE = False
BF_VERSE = "#extern/verse/dist"
BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
BF_VERSE_INCLUDE = BF_VERSE
@@ -76,9 +76,9 @@
# Note : should be true, but openal simply dont work on intel
if MAC_PROC == 'i386':
- WITH_BF_OPENAL = 'false'
+ WITH_BF_OPENAL = False
else:
- WITH_BF_OPENAL = 'true'
+ WITH_BF_OPENAL = True
#different lib must be used following version of gcc
# for gcc 3.3
#BF_OPENAL = LIBDIR + '/openal'
@@ -88,7 +88,7 @@
else :
BF_OPENAL = LIBDIR + '/openal'
-WITH_BF_STATICOPENAL = 'false'
+WITH_BF_STATICOPENAL = False
BF_OPENAL_INC = '${BF_OPENAL}/include'
BF_OPENAL_LIB = 'openal'
BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
@@ -97,20 +97,20 @@
# Warning, this static lib configuration is untested! users of this OS please confirm.
BF_CXX = '/usr'
-WITH_BF_STATICCXX = 'false'
+WITH_BF_STATICCXX = False
BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
-WITH_BF_SDL = 'true'
+WITH_BF_SDL = True
BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
BF_SDL_LIBPATH = '${BF_SDL}/lib'
-WITH_BF_FMOD = 'false'
+WITH_BF_FMOD = False
BF_FMOD = LIBDIR + '/fmod'
-WITH_BF_OPENEXR = 'true'
-WITH_BF_STATICOPENEXR = 'false'
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
BF_OPENEXR = '${LCGDIR}/openexr'
BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread'
@@ -118,15 +118,15 @@
# Warning, this static lib configuration is untested! users of this OS please confirm.
BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
-WITH_BF_DDS = 'true'
+WITH_BF_DDS = True
-WITH_BF_JPEG = 'true'
+WITH_BF_JPEG = True
BF_JPEG = LIBDIR + '/jpeg'
BF_JPEG_INC = '${BF_JPEG}/include'
BF_JPEG_LIB = 'jpeg'
BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
-WITH_BF_PNG = 'true'
+WITH_BF_PNG = True
BF_PNG = LIBDIR + '/png'
BF_PNG_INC = '${BF_PNG}/include'
BF_PNG_LIB = 'png'
@@ -135,32 +135,32 @@
BF_TIFF = LIBDIR + '/tiff'
BF_TIFF_INC = '${BF_TIFF}/include'
-WITH_BF_ZLIB = 'true'
+WITH_BF_ZLIB = True
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list