[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21917] branches/soundsystem: * 2. 5 merge revision 21713 to 21915
Jörg Müller
nexyon at gmail.com
Sun Jul 26 11:28:33 CEST 2009
Revision: 21917
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21917
Author: nexyon
Date: 2009-07-26 11:28:33 +0200 (Sun, 26 Jul 2009)
Log Message:
-----------
* 2.5 merge revision 21713 to 21915
* fixed a bug in the OpenAL Device resulting in a crash when exiting while sounds are playing
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21713
Modified Paths:
--------------
branches/soundsystem/CMakeLists.txt
branches/soundsystem/blenderplayer/CMakeLists.txt
branches/soundsystem/config/linux2-config.py
branches/soundsystem/config/win32-mingw-config.py
branches/soundsystem/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soundsystem/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soundsystem/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/soundsystem/projectfiles_vc9/blender/blender.sln
branches/soundsystem/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
branches/soundsystem/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/soundsystem/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soundsystem/projectfiles_vc9/blender/loader/BLO_loader.vcproj
branches/soundsystem/projectfiles_vc9/blender/makesdna/DNA_makesdna.vcproj
branches/soundsystem/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/soundsystem/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/soundsystem/projectfiles_vc9/blender/nodes/nodes.vcproj
branches/soundsystem/projectfiles_vc9/blender/render/BRE_render.vcproj
branches/soundsystem/release/datafiles/blenderbuttons
branches/soundsystem/release/datafiles/splash.jpg
branches/soundsystem/release/scripts/bpymodules/colladaImEx/translator.py
branches/soundsystem/release/scripts/bvh_import.py
branches/soundsystem/release/scripts/collada_export.py
branches/soundsystem/release/scripts/export_dxf.py
branches/soundsystem/release/scripts/export_fbx.py
branches/soundsystem/release/scripts/export_map.py
branches/soundsystem/release/scripts/export_obj.py
branches/soundsystem/release/scripts/import_dxf.py
branches/soundsystem/release/scripts/import_obj.py
branches/soundsystem/release/scripts/object_active_to_other.py
branches/soundsystem/release/scripts/vertexpaint_selfshadow_ao.py
branches/soundsystem/release/ui/buttons_data_armature.py
branches/soundsystem/release/ui/buttons_data_bone.py
branches/soundsystem/release/ui/buttons_data_camera.py
branches/soundsystem/release/ui/buttons_data_curve.py
branches/soundsystem/release/ui/buttons_data_lamp.py
branches/soundsystem/release/ui/buttons_data_lattice.py
branches/soundsystem/release/ui/buttons_data_mesh.py
branches/soundsystem/release/ui/buttons_data_text.py
branches/soundsystem/release/ui/buttons_material.py
branches/soundsystem/release/ui/buttons_particle.py
branches/soundsystem/release/ui/buttons_physics_cloth.py
branches/soundsystem/release/ui/buttons_physics_field.py
branches/soundsystem/release/ui/buttons_physics_fluid.py
branches/soundsystem/release/ui/buttons_physics_softbody.py
branches/soundsystem/release/ui/buttons_scene.py
branches/soundsystem/release/ui/buttons_texture.py
branches/soundsystem/release/ui/buttons_world.py
branches/soundsystem/release/ui/space_console.py
branches/soundsystem/release/ui/space_image.py
branches/soundsystem/release/ui/space_info.py
branches/soundsystem/release/ui/space_logic.py
branches/soundsystem/release/ui/space_view3d.py
branches/soundsystem/release/ui/space_view3d_toolbar.py
branches/soundsystem/release/windows/extra/python26.zip
branches/soundsystem/source/blender/avi/intern/avi.c
branches/soundsystem/source/blender/blenkernel/BKE_action.h
branches/soundsystem/source/blender/blenkernel/BKE_nla.h
branches/soundsystem/source/blender/blenkernel/BKE_object.h
branches/soundsystem/source/blender/blenkernel/BKE_particle.h
branches/soundsystem/source/blender/blenkernel/BKE_pointcache.h
branches/soundsystem/source/blender/blenkernel/BKE_property.h
branches/soundsystem/source/blender/blenkernel/BKE_screen.h
branches/soundsystem/source/blender/blenkernel/BKE_softbody.h
branches/soundsystem/source/blender/blenkernel/CMakeLists.txt
branches/soundsystem/source/blender/blenkernel/intern/action.c
branches/soundsystem/source/blender/blenkernel/intern/armature.c
branches/soundsystem/source/blender/blenkernel/intern/blender.c
branches/soundsystem/source/blender/blenkernel/intern/depsgraph.c
branches/soundsystem/source/blender/blenkernel/intern/effect.c
branches/soundsystem/source/blender/blenkernel/intern/exotic.c
branches/soundsystem/source/blender/blenkernel/intern/fluidsim.c
branches/soundsystem/source/blender/blenkernel/intern/image.c
branches/soundsystem/source/blender/blenkernel/intern/material.c
branches/soundsystem/source/blender/blenkernel/intern/mesh.c
branches/soundsystem/source/blender/blenkernel/intern/modifier.c
branches/soundsystem/source/blender/blenkernel/intern/nla.c
branches/soundsystem/source/blender/blenkernel/intern/object.c
branches/soundsystem/source/blender/blenkernel/intern/particle.c
branches/soundsystem/source/blender/blenkernel/intern/particle_system.c
branches/soundsystem/source/blender/blenkernel/intern/pointcache.c
branches/soundsystem/source/blender/blenkernel/intern/property.c
branches/soundsystem/source/blender/blenkernel/intern/scene.c
branches/soundsystem/source/blender/blenkernel/intern/screen.c
branches/soundsystem/source/blender/blenkernel/intern/softbody.c
branches/soundsystem/source/blender/blenkernel/intern/texture.c
branches/soundsystem/source/blender/blenkernel/intern/world.c
branches/soundsystem/source/blender/blenlib/BLI_arithb.h
branches/soundsystem/source/blender/blenlib/BLI_kdtree.h
branches/soundsystem/source/blender/blenlib/BLI_util.h
branches/soundsystem/source/blender/blenlib/SConscript
branches/soundsystem/source/blender/blenlib/intern/BLI_kdtree.c
branches/soundsystem/source/blender/blenlib/intern/DLRB_tree.c
branches/soundsystem/source/blender/blenlib/intern/arithb.c
branches/soundsystem/source/blender/blenlib/intern/util.c
branches/soundsystem/source/blender/blenloader/CMakeLists.txt
branches/soundsystem/source/blender/blenloader/SConscript
branches/soundsystem/source/blender/blenloader/intern/Makefile
branches/soundsystem/source/blender/blenloader/intern/readfile.c
branches/soundsystem/source/blender/blenloader/intern/writefile.c
branches/soundsystem/source/blender/editors/animation/anim_channels.c
branches/soundsystem/source/blender/editors/animation/anim_filter.c
branches/soundsystem/source/blender/editors/animation/anim_ops.c
branches/soundsystem/source/blender/editors/animation/keyframes_draw.c
branches/soundsystem/source/blender/editors/animation/keyframing.c
branches/soundsystem/source/blender/editors/animation/keyingsets.c
branches/soundsystem/source/blender/editors/armature/armature_intern.h
branches/soundsystem/source/blender/editors/armature/armature_ops.c
branches/soundsystem/source/blender/editors/armature/editarmature.c
branches/soundsystem/source/blender/editors/armature/poseobject.c
branches/soundsystem/source/blender/editors/curve/curve_intern.h
branches/soundsystem/source/blender/editors/curve/curve_ops.c
branches/soundsystem/source/blender/editors/curve/editcurve.c
branches/soundsystem/source/blender/editors/datafiles/blenderbuttons.c
branches/soundsystem/source/blender/editors/include/ED_anim_api.h
branches/soundsystem/source/blender/editors/include/ED_armature.h
branches/soundsystem/source/blender/editors/include/ED_keyframing.h
branches/soundsystem/source/blender/editors/include/ED_physics.h
branches/soundsystem/source/blender/editors/include/ED_previewrender.h
branches/soundsystem/source/blender/editors/include/ED_screen.h
branches/soundsystem/source/blender/editors/include/UI_icons.h
branches/soundsystem/source/blender/editors/include/UI_interface.h
branches/soundsystem/source/blender/editors/interface/interface.c
branches/soundsystem/source/blender/editors/interface/interface_draw.c
branches/soundsystem/source/blender/editors/interface/interface_handlers.c
branches/soundsystem/source/blender/editors/interface/interface_intern.h
branches/soundsystem/source/blender/editors/interface/interface_layout.c
branches/soundsystem/source/blender/editors/interface/interface_panel.c
branches/soundsystem/source/blender/editors/interface/interface_regions.c
branches/soundsystem/source/blender/editors/interface/interface_style.c
branches/soundsystem/source/blender/editors/interface/interface_templates.c
branches/soundsystem/source/blender/editors/interface/interface_utils.c
branches/soundsystem/source/blender/editors/interface/interface_widgets.c
branches/soundsystem/source/blender/editors/interface/view2d_ops.c
branches/soundsystem/source/blender/editors/mesh/editmesh_add.c
branches/soundsystem/source/blender/editors/mesh/editmesh_tools.c
branches/soundsystem/source/blender/editors/mesh/mesh_intern.h
branches/soundsystem/source/blender/editors/mesh/mesh_ops.c
branches/soundsystem/source/blender/editors/object/editconstraint.c
branches/soundsystem/source/blender/editors/object/object_edit.c
branches/soundsystem/source/blender/editors/object/object_intern.h
branches/soundsystem/source/blender/editors/object/object_ops.c
branches/soundsystem/source/blender/editors/physics/editparticle.c
branches/soundsystem/source/blender/editors/preview/previewrender.c
branches/soundsystem/source/blender/editors/screen/area.c
branches/soundsystem/source/blender/editors/screen/screen_context.c
branches/soundsystem/source/blender/editors/screen/screen_edit.c
branches/soundsystem/source/blender/editors/screen/screen_intern.h
branches/soundsystem/source/blender/editors/screen/screen_ops.c
branches/soundsystem/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soundsystem/source/blender/editors/space_action/action_draw.c
branches/soundsystem/source/blender/editors/space_action/action_header.c
branches/soundsystem/source/blender/editors/space_api/spacetypes.c
branches/soundsystem/source/blender/editors/space_buttons/buttons_context.c
branches/soundsystem/source/blender/editors/space_buttons/buttons_header.c
branches/soundsystem/source/blender/editors/space_buttons/buttons_intern.h
branches/soundsystem/source/blender/editors/space_buttons/buttons_ops.c
branches/soundsystem/source/blender/editors/space_buttons/space_buttons.c
branches/soundsystem/source/blender/editors/space_console/console_intern.h
branches/soundsystem/source/blender/editors/space_console/console_ops.c
branches/soundsystem/source/blender/editors/space_console/space_console.c
branches/soundsystem/source/blender/editors/space_graph/graph_draw.c
branches/soundsystem/source/blender/editors/space_graph/graph_header.c
branches/soundsystem/source/blender/editors/space_image/image_draw.c
branches/soundsystem/source/blender/editors/space_logic/logic_buttons.c
branches/soundsystem/source/blender/editors/space_logic/logic_window.c
branches/soundsystem/source/blender/editors/space_nla/nla_channels.c
branches/soundsystem/source/blender/editors/space_nla/nla_draw.c
branches/soundsystem/source/blender/editors/space_nla/nla_edit.c
branches/soundsystem/source/blender/editors/space_nla/nla_header.c
branches/soundsystem/source/blender/editors/space_node/space_node.c
branches/soundsystem/source/blender/editors/space_outliner/outliner.c
branches/soundsystem/source/blender/editors/space_outliner/outliner_intern.h
branches/soundsystem/source/blender/editors/space_outliner/outliner_ops.c
branches/soundsystem/source/blender/editors/space_outliner/space_outliner.c
branches/soundsystem/source/blender/editors/space_text/text_ops.c
branches/soundsystem/source/blender/editors/space_time/space_time.c
branches/soundsystem/source/blender/editors/space_time/time_header.c
branches/soundsystem/source/blender/editors/space_view3d/drawarmature.c
branches/soundsystem/source/blender/editors/space_view3d/drawobject.c
branches/soundsystem/source/blender/editors/space_view3d/space_view3d.c
branches/soundsystem/source/blender/editors/space_view3d/view3d_draw.c
branches/soundsystem/source/blender/editors/space_view3d/view3d_edit.c
branches/soundsystem/source/blender/editors/space_view3d/view3d_header.c
branches/soundsystem/source/blender/editors/space_view3d/view3d_intern.h
branches/soundsystem/source/blender/editors/space_view3d/view3d_ops.c
branches/soundsystem/source/blender/editors/space_view3d/view3d_select.c
branches/soundsystem/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soundsystem/source/blender/editors/space_view3d/view3d_view.c
branches/soundsystem/source/blender/editors/transform/transform.c
branches/soundsystem/source/blender/editors/transform/transform.h
branches/soundsystem/source/blender/editors/transform/transform_conversions.c
branches/soundsystem/source/blender/editors/transform/transform_ops.c
branches/soundsystem/source/blender/gpu/intern/gpu_draw.c
branches/soundsystem/source/blender/imbuf/IMB_imbuf.h
branches/soundsystem/source/blender/imbuf/intern/filter.c
branches/soundsystem/source/blender/imbuf/intern/iris.c
branches/soundsystem/source/blender/imbuf/intern/util.c
branches/soundsystem/source/blender/makesdna/DNA_action_types.h
branches/soundsystem/source/blender/makesdna/DNA_anim_types.h
branches/soundsystem/source/blender/makesdna/DNA_brush_types.h
branches/soundsystem/source/blender/makesdna/DNA_camera_types.h
branches/soundsystem/source/blender/makesdna/DNA_lamp_types.h
branches/soundsystem/source/blender/makesdna/DNA_material_types.h
branches/soundsystem/source/blender/makesdna/DNA_modifier_types.h
branches/soundsystem/source/blender/makesdna/DNA_object_force.h
branches/soundsystem/source/blender/makesdna/DNA_object_types.h
branches/soundsystem/source/blender/makesdna/DNA_particle_types.h
branches/soundsystem/source/blender/makesdna/DNA_property_types.h
branches/soundsystem/source/blender/makesdna/DNA_scene_types.h
branches/soundsystem/source/blender/makesdna/DNA_screen_types.h
branches/soundsystem/source/blender/makesdna/DNA_space_types.h
branches/soundsystem/source/blender/makesdna/DNA_texture_types.h
branches/soundsystem/source/blender/makesdna/DNA_userdef_types.h
branches/soundsystem/source/blender/makesdna/DNA_windowmanager_types.h
branches/soundsystem/source/blender/makesdna/DNA_world_types.h
branches/soundsystem/source/blender/makesdna/intern/makesdna.c
branches/soundsystem/source/blender/makesrna/RNA_access.h
branches/soundsystem/source/blender/makesrna/RNA_define.h
branches/soundsystem/source/blender/makesrna/RNA_enum_types.h
branches/soundsystem/source/blender/makesrna/RNA_types.h
branches/soundsystem/source/blender/makesrna/SConscript
branches/soundsystem/source/blender/makesrna/intern/CMakeLists.txt
branches/soundsystem/source/blender/makesrna/intern/Makefile
branches/soundsystem/source/blender/makesrna/intern/SConscript
branches/soundsystem/source/blender/makesrna/intern/makesrna.c
branches/soundsystem/source/blender/makesrna/intern/rna_ID.c
branches/soundsystem/source/blender/makesrna/intern/rna_access.c
branches/soundsystem/source/blender/makesrna/intern/rna_armature.c
branches/soundsystem/source/blender/makesrna/intern/rna_brush.c
branches/soundsystem/source/blender/makesrna/intern/rna_cloth.c
branches/soundsystem/source/blender/makesrna/intern/rna_define.c
branches/soundsystem/source/blender/makesrna/intern/rna_fcurve.c
branches/soundsystem/source/blender/makesrna/intern/rna_fluidsim.c
branches/soundsystem/source/blender/makesrna/intern/rna_internal.h
branches/soundsystem/source/blender/makesrna/intern/rna_lamp.c
branches/soundsystem/source/blender/makesrna/intern/rna_material.c
branches/soundsystem/source/blender/makesrna/intern/rna_nodetree.c
branches/soundsystem/source/blender/makesrna/intern/rna_object.c
branches/soundsystem/source/blender/makesrna/intern/rna_object_force.c
branches/soundsystem/source/blender/makesrna/intern/rna_particle.c
branches/soundsystem/source/blender/makesrna/intern/rna_pose.c
branches/soundsystem/source/blender/makesrna/intern/rna_property.c
branches/soundsystem/source/blender/makesrna/intern/rna_scene.c
branches/soundsystem/source/blender/makesrna/intern/rna_space.c
branches/soundsystem/source/blender/makesrna/intern/rna_texture.c
branches/soundsystem/source/blender/makesrna/intern/rna_ui.c
branches/soundsystem/source/blender/makesrna/intern/rna_ui_api.c
branches/soundsystem/source/blender/makesrna/intern/rna_userdef.c
branches/soundsystem/source/blender/makesrna/intern/rna_world.c
branches/soundsystem/source/blender/nodes/CMakeLists.txt
branches/soundsystem/source/blender/nodes/SConscript
branches/soundsystem/source/blender/nodes/intern/CMP_nodes/CMP_mapUV.c
branches/soundsystem/source/blender/nodes/intern/CMP_nodes/Makefile
branches/soundsystem/source/blender/nodes/intern/Makefile
branches/soundsystem/source/blender/nodes/intern/SHD_nodes/Makefile
branches/soundsystem/source/blender/nodes/intern/TEX_nodes/Makefile
branches/soundsystem/source/blender/python/BPY_extern.h
branches/soundsystem/source/blender/python/generic/bpy_internal_import.c
branches/soundsystem/source/blender/python/intern/bpy_interface.c
branches/soundsystem/source/blender/python/intern/bpy_rna.c
branches/soundsystem/source/blender/python/intern/bpy_rna.h
branches/soundsystem/source/blender/python/intern/bpy_ui.c
branches/soundsystem/source/blender/python/intern/stubs.c
branches/soundsystem/source/blender/render/CMakeLists.txt
branches/soundsystem/source/blender/render/SConscript
branches/soundsystem/source/blender/render/extern/include/RE_pipeline.h
branches/soundsystem/source/blender/render/intern/source/Makefile
branches/soundsystem/source/blender/render/intern/source/convertblender.c
branches/soundsystem/source/blender/render/intern/source/imagetexture.c
branches/soundsystem/source/blender/render/intern/source/occlusion.c
branches/soundsystem/source/blender/render/intern/source/pipeline.c
branches/soundsystem/source/blender/render/intern/source/rayshade.c
branches/soundsystem/source/blender/render/intern/source/shadbuf.c
branches/soundsystem/source/blender/render/intern/source/shadeinput.c
branches/soundsystem/source/blender/render/intern/source/shadeoutput.c
branches/soundsystem/source/blender/render/intern/source/texture.c
branches/soundsystem/source/blender/render/intern/source/zbuf.c
branches/soundsystem/source/blender/windowmanager/WM_api.h
branches/soundsystem/source/blender/windowmanager/intern/wm_event_system.c
branches/soundsystem/source/blender/windowmanager/intern/wm_files.c
branches/soundsystem/source/blender/windowmanager/intern/wm_init_exit.c
branches/soundsystem/source/blender/windowmanager/intern/wm_jobs.c
branches/soundsystem/source/blender/windowmanager/intern/wm_keymap.c
branches/soundsystem/source/blender/windowmanager/intern/wm_operators.c
branches/soundsystem/source/blender/windowmanager/intern/wm_window.c
branches/soundsystem/source/blender/windowmanager/wm.h
branches/soundsystem/source/blender/windowmanager/wm_event_types.h
branches/soundsystem/source/blender/windowmanager/wm_window.h
branches/soundsystem/source/creator/CMakeLists.txt
branches/soundsystem/source/creator/creator.c
branches/soundsystem/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soundsystem/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/soundsystem/source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.cpp
branches/soundsystem/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soundsystem/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soundsystem/source/gameengine/Converter/BL_ActionActuator.h
branches/soundsystem/source/gameengine/Converter/BL_ArmatureObject.h
branches/soundsystem/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soundsystem/source/gameengine/Converter/BL_MeshDeformer.h
branches/soundsystem/source/gameengine/GameLogic/CMakeLists.txt
branches/soundsystem/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soundsystem/source/gameengine/Ketsji/CMakeLists.txt
branches/soundsystem/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/soundsystem/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_GameObject.h
branches/soundsystem/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soundsystem/source/gameengine/Ketsji/KX_MeshProxy.h
branches/soundsystem/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soundsystem/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soundsystem/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soundsystem/source/gameengine/PyDoc/API_intro.py
branches/soundsystem/source/gameengine/PyDoc/GameTypes.py
branches/soundsystem/source/gameengine/Rasterizer/RAS_Deformer.h
branches/soundsystem/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/soundsystem/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soundsystem/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
Added Paths:
-----------
branches/soundsystem/release/ui/buttons_game.py
branches/soundsystem/release/ui/buttons_object.py
branches/soundsystem/source/blender/blenkernel/BKE_boids.h
branches/soundsystem/source/blender/blenkernel/intern/boids.c
branches/soundsystem/source/blender/editors/physics/physics_boids.c
branches/soundsystem/source/blender/makesdna/DNA_boid_types.h
branches/soundsystem/source/blender/makesrna/intern/rna_boid.c
branches/soundsystem/source/blender/makesrna/intern/rna_render.c
branches/soundsystem/source/blender/makesrna/intern/rna_sculpt_paint.c
Removed Paths:
-------------
branches/soundsystem/ChangeLog
branches/soundsystem/release/ui/buttons_objects.py
branches/soundsystem/source/blender/makesdna/DNA_scriptlink_types.h
branches/soundsystem/source/blender/makesrna/intern/rna_scriptlink.c
branches/soundsystem/source/blender/makesrna/intern/rna_vpaint.c
branches/soundsystem/source/blender/python/intern/bpy_scriptlink.c
Modified: branches/soundsystem/CMakeLists.txt
===================================================================
--- branches/soundsystem/CMakeLists.txt 2009-07-26 08:53:23 UTC (rev 21916)
+++ branches/soundsystem/CMakeLists.txt 2009-07-26 09:28:33 UTC (rev 21917)
@@ -63,6 +63,7 @@
OPTION(WITH_DDS "Enable DDS Support" ON)
OPTION(WITH_FFMPEG "Enable FFMPeg Support(http://ffmpeg.mplayerhq.hu/)" ON)
OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
+OPTION(WITH_SDL "Enable SDL for sound and joystick support" ON)
OPTION(WITH_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
@@ -134,9 +135,11 @@
SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
- FIND_PACKAGE(SDL)
- SET(SDL_INC ${SDL_INCLUDE_DIR})
- SET(SDL_LIB ${SDL_LIBRARY})
+ IF(WITH_SDL)
+ FIND_PACKAGE(SDL)
+ SET(SDL_INC ${SDL_INCLUDE_DIR})
+ SET(SDL_LIB ${SDL_LIBRARY})
+ ENDIF(WITH_SDL)
FIND_PATH(OPENEXR_INC
ImfXdr.h
@@ -347,17 +350,29 @@
ENDIF(OPENAL_FOUND)
ENDIF(WITH_OPENAL)
- SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
- SET(PYTHON_VERSION 2.5)
- SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
- SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "")
- SET(PYTHON_LIB "")
- SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
- IF(CMAKE_SYSTEM_VERSION GREATER 10.4)
+
+ SET(PYTHON_VERSION 3.1)
+
+ IF(PYTHON_VERSION MATCHES 3.1)
+ # we use precompiled libraries for py 3.1 and up by default
+
+ SET(PYTHON ${LIBDIR}/python)
+ SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+ SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "")
+ SET(PYTHON_LIB python${PYTHON_VERSION})
+ SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
+ # SET(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
+ ELSE(PYTHON_VERSION MATCHES 3.1)
+ # otherwise, use custom system framework
+
+ SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
+ SET(PYTHON_VERSION 2.5)
+ SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
+ SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "")
+ SET(PYTHON_LIB "")
+ SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
- ELSE(CMAKE_SYSTEM_VERSION GREATER 10.4)
- SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
- ENDIF(CMAKE_SYSTEM_VERSION GREATER 10.4)
+ ENDIF(PYTHON_VERSION MATCHES 3.1)
SET(GETTEXT ${LIBDIR}/gettext)
SET(GETTEXT_INC "${GETTEXT}/include")
Deleted: branches/soundsystem/ChangeLog
===================================================================
--- branches/soundsystem/ChangeLog 2009-07-26 08:53:23 UTC (rev 21916)
+++ branches/soundsystem/ChangeLog 2009-07-26 09:28:33 UTC (rev 21917)
@@ -1,114 +0,0 @@
-
-Fri Feb 21 10:37:54 CST 2003 mein at cs.umn.edu
- Added Goofsters alt-m menu for merging verts in edit mode.
-
-Fri Feb 21 10:37:54 CST 2003 mein at cs.umn.edu
- Added MacOSX plugin stuff
-
-Thu Apr 24 00:48:43 CST 2003 cwant at ualberta.ca
- Added auto-skinning support. When parenting a mesh to an
- armature the user is confronted with a menu about creating
- weight groups. They can either create empty groups,
- create groups that are populated based on a closest bone
- algorithm, or create no groups.
-
-Mon Apr 28 04:04:44 CET 2003 phaseIV at zonnet.nl
- Added Quicktime image and movie import for textures.
- Added Quicktime movie export for rendering.
- Note: the selected export codec isn't saved in the blendfile.
- Enable with the WITH_QUICKTIME compile flag.
-
-Mon Apr 28 12:32:12 CET 2003 phaseIV at zonnet.nl
- Added (Win32) text clipboard support and a rightmouse menu to
- the text editor. Added the possibility to export text from
- the editor to a 3D Font object with alt-m. (up to 1000 chars)
- Added rename/delete popups to the file and imageselectors.
- Redesigned the userpreference window layout. (unfinished atm.)
-
-Mon Apr 28 23:17:04 CET 2003 phaseIV at zonnet.nl
- Added a 3D font loader that uses the Freetype2 library to
- parse the vector data. Freetype2 supports many font formats
- including Type1, TrueType and OpenType fonts.
- Enable with the WITH_FREETYPE2 compile flag.
-
-Initial Change Log for Blender 2.26 Sun Feb 9 10:53:10 UTC 2003
-
-New features of Blender 2.26:
------------------------------
-
-- Mousewheel support for all windows. Two user settings are added in the
- top window for mousewheel usage. The zoom direction [WZoom] and the
- number of lines that get scrolled [WLines] can be set here.
- The mousewheel also works to increase/decrease the size of the circle
- while selecting or doing proportional scaling.
-
-- A "fake user" button next to the material popup has been added, to keep
- the data when it has been unlinked from an object. (Basically a shortcut
- for pressing Shift+F4 and F)
-
-- Added support for manipulating Ipo bezier handles through the action
- window. Selecting action keys and pressing VKEY, HKEY, or shift-HKEY
- modifies the handles of the keys in the same way it does in the IPO
- window.
-
-- CKEY in the action window scrolls the window so that the current frame
- is in the center.
-
-- Extra selection support for the action window, including:
- - border select initiated in the channel names border selects the
- channels and constraint channels.
- - right click or border select initiated in the horizontal scroll
- causes blender to select all keys for the selected frames.
- - right click or border select in the vertical scroll causes blender
- to select all keys for the channel or constraint channels that are
- to the left of the selection.
-
-- X-ray bones support for showing armature bones in shaded mode (disabled
- depth test). The new x-ray button is added in the edit buttons when the
- armature is selected.
-
-- TKEY in the action window changes the Ipo type (constant/linear/bezier)
- for the Ipo curves owned by the selected channels
-
-- Simple shaded+wire and solid+wire drawmodes. It basically draws the
- wireframe after drawing the model in solid/shaded/textured mode.
- The user can set this per object using the "Wire" button in the edit
- buttons window.
-
-- A headerbutton for drawing linenumbers in the texteditor.
-
-- Ctrl keystrokes for cut/copy/paste/undo/redo in the texteditor.
-
-- NTSC render preset (Image size - 720x480, Aspect ratio - 10x11, 30 fps)
-
-
-Bugfixes:
----------
-
-- Make switching to bottom, back, and left view (shift+pad7, shift+pad1
- and shift+pad1) work when in camera view.
-
-- Full screen by default under Unix.
-
-- Ignore WM_DELETE_WINDOW on IRIX.
-
-- Icons in the imageselect window get drawn properly.
-
-
-Workarounds:
-------------
-
-- A small modification is made that prevents closing the renderwindow on
- Mac OSX, so the GUI won't becoming irresponsive.
-
-
-Still Not working:
------------------
-
-Plugins in MacOSX
-
-Older Python API
-
-New build system using configure (this is partially working but
- needs some work)
-
Modified: branches/soundsystem/blenderplayer/CMakeLists.txt
===================================================================
--- branches/soundsystem/blenderplayer/CMakeLists.txt 2009-07-26 08:53:23 UTC (rev 21916)
+++ branches/soundsystem/blenderplayer/CMakeLists.txt 2009-07-26 09:28:33 UTC (rev 21917)
@@ -69,7 +69,6 @@
bf_blenkernel
verse
bf_blenkernel
- bf_decimation
bf_blenloader
bf_blenpluginapi
bf_blroutines
Modified: branches/soundsystem/config/linux2-config.py
===================================================================
--- branches/soundsystem/config/linux2-config.py 2009-07-26 08:53:23 UTC (rev 21916)
+++ branches/soundsystem/config/linux2-config.py 2009-07-26 09:28:33 UTC (rev 21917)
@@ -1,17 +1,9 @@
LCGDIR = '../lib/linux2'
LIBDIR = "${LCGDIR}"
-def py_version_string():
- '''
- returns py version - "2.5", "2.6" etc
- '''
- import platform
- ver = platform.python_version_tuple()
- return '%d.%d' % (int(ver[0]), int(ver[1])) # py2.5 uses strings, 2.6 ints
-
BF_PYTHON = '/usr'
BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
-BF_PYTHON_VERSION = py_version_string()
+BF_PYTHON_VERSION = '3.1'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
Modified: branches/soundsystem/config/win32-mingw-config.py
===================================================================
--- branches/soundsystem/config/win32-mingw-config.py 2009-07-26 08:53:23 UTC (rev 21916)
+++ branches/soundsystem/config/win32-mingw-config.py 2009-07-26 09:28:33 UTC (rev 21917)
@@ -4,6 +4,7 @@
BF_PYTHON = LIBDIR + '/python'
BF_PYTHON_VERSION = '3.1'
#BF_PYTHON_VERSION = '2.6'
+#BF_PYTHON_VERSION = '2.6'
WITH_BF_STATICPYTHON = False
BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
BF_PYTHON_BINARY = 'python'
Modified: branches/soundsystem/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- branches/soundsystem/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp 2009-07-26 08:53:23 UTC (rev 21916)
+++ branches/soundsystem/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp 2009-07-26 09:28:33 UTC (rev 21917)
@@ -358,14 +358,14 @@
alcProcessContext(m_context);
unlock();
+ // wait for the thread to stop
+ if(m_thread != 0)
+ pthread_join(m_thread, NULL);
+
delete m_playingSounds; AUD_DELETE("list")
delete m_pausedSounds; AUD_DELETE("list")
delete m_bufferedFactories; AUD_DELETE("list")
- // wait for the thread to stop
- if(m_thread != 0)
- pthread_join(m_thread, NULL);
-
// quit OpenAL
alcMakeContextCurrent(NULL);
alcDestroyContext(m_context);
Modified: branches/soundsystem/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list