[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22084] branches/soundsystem: * Merge with 2.5 branch revision 21915 to 22079

Jörg Müller nexyon at gmail.com
Fri Jul 31 14:29:29 CEST 2009


Revision: 22084
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22084
Author:   nexyon
Date:     2009-07-31 14:29:28 +0200 (Fri, 31 Jul 2009)

Log Message:
-----------
* Merge with 2.5 branch revision 21915 to 22079
* SoundActuator update

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21915

Modified Paths:
--------------
    branches/soundsystem/config/darwin-config.py
    branches/soundsystem/config/irix6-config.py
    branches/soundsystem/config/linuxcross-config.py
    branches/soundsystem/config/openbsd3-config.py
    branches/soundsystem/config/sunos5-config.py
    branches/soundsystem/intern/CMakeLists.txt
    branches/soundsystem/intern/Makefile
    branches/soundsystem/intern/SConscript
    branches/soundsystem/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/soundsystem/intern/elbeem/intern/solver_init.cpp
    branches/soundsystem/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soundsystem/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/soundsystem/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/soundsystem/release/datafiles/blenderbuttons
    branches/soundsystem/release/io/export_ply.py
    branches/soundsystem/release/ui/bpy_ops.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_empty.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_modifier.py
    branches/soundsystem/release/ui/buttons_data_text.py
    branches/soundsystem/release/ui/buttons_game.py
    branches/soundsystem/release/ui/buttons_material.py
    branches/soundsystem/release/ui/buttons_object.py
    branches/soundsystem/release/ui/buttons_object_constraint.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_buttons.py
    branches/soundsystem/release/ui/space_console.py
    branches/soundsystem/release/ui/space_filebrowser.py
    branches/soundsystem/release/ui/space_image.py
    branches/soundsystem/release/ui/space_info.py
    branches/soundsystem/release/ui/space_outliner.py
    branches/soundsystem/release/ui/space_sequencer.py
    branches/soundsystem/release/ui/space_text.py
    branches/soundsystem/release/ui/space_view3d.py
    branches/soundsystem/release/ui/space_view3d_toolbar.py
    branches/soundsystem/source/Makefile
    branches/soundsystem/source/blender/blenfont/BLF_api.h
    branches/soundsystem/source/blender/blenfont/intern/blf.c
    branches/soundsystem/source/blender/blenfont/intern/blf_glyph.c
    branches/soundsystem/source/blender/blenkernel/BKE_blender.h
    branches/soundsystem/source/blender/blenkernel/BKE_cloth.h
    branches/soundsystem/source/blender/blenkernel/BKE_context.h
    branches/soundsystem/source/blender/blenkernel/BKE_modifier.h
    branches/soundsystem/source/blender/blenkernel/CMakeLists.txt
    branches/soundsystem/source/blender/blenkernel/SConscript
    branches/soundsystem/source/blender/blenkernel/intern/Makefile
    branches/soundsystem/source/blender/blenkernel/intern/armature.c
    branches/soundsystem/source/blender/blenkernel/intern/blender.c
    branches/soundsystem/source/blender/blenkernel/intern/context.c
    branches/soundsystem/source/blender/blenkernel/intern/exotic.c
    branches/soundsystem/source/blender/blenkernel/intern/modifier.c
    branches/soundsystem/source/blender/blenkernel/intern/sca.c
    branches/soundsystem/source/blender/blenkernel/intern/screen.c
    branches/soundsystem/source/blender/blenkernel/intern/sequence.c
    branches/soundsystem/source/blender/blenlib/BLI_kdopbvh.h
    branches/soundsystem/source/blender/blenlib/BLI_storage_types.h
    branches/soundsystem/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soundsystem/source/blender/blenlib/intern/fileops.c
    branches/soundsystem/source/blender/blenlib/intern/storage.c
    branches/soundsystem/source/blender/blenloader/intern/readfile.c
    branches/soundsystem/source/blender/blenloader/intern/writefile.c
    branches/soundsystem/source/blender/editors/CMakeLists.txt
    branches/soundsystem/source/blender/editors/Makefile
    branches/soundsystem/source/blender/editors/SConscript
    branches/soundsystem/source/blender/editors/animation/anim_channels.c
    branches/soundsystem/source/blender/editors/animation/anim_draw.c
    branches/soundsystem/source/blender/editors/animation/anim_filter.c
    branches/soundsystem/source/blender/editors/animation/anim_markers.c
    branches/soundsystem/source/blender/editors/animation/anim_ops.c
    branches/soundsystem/source/blender/editors/animation/keyframing.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/editarmature_retarget.c
    branches/soundsystem/source/blender/editors/armature/editarmature_sketch.c
    branches/soundsystem/source/blender/editors/armature/meshlaplacian.c
    branches/soundsystem/source/blender/editors/armature/poseobject.c
    branches/soundsystem/source/blender/editors/curve/editfont.c
    branches/soundsystem/source/blender/editors/datafiles/B.blend.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_fileselect.h
    branches/soundsystem/source/blender/editors/include/ED_object.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/ED_util.h
    branches/soundsystem/source/blender/editors/include/UI_icons.h
    branches/soundsystem/source/blender/editors/include/UI_interface.h
    branches/soundsystem/source/blender/editors/include/UI_view2d.h
    branches/soundsystem/source/blender/editors/interface/interface.c
    branches/soundsystem/source/blender/editors/interface/interface_anim.c
    branches/soundsystem/source/blender/editors/interface/interface_handlers.c
    branches/soundsystem/source/blender/editors/interface/interface_layout.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_widgets.c
    branches/soundsystem/source/blender/editors/interface/view2d.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_loop.c
    branches/soundsystem/source/blender/editors/mesh/editmesh_mods.c
    branches/soundsystem/source/blender/editors/mesh/editmesh_tools.c
    branches/soundsystem/source/blender/editors/mesh/mesh_ops.c
    branches/soundsystem/source/blender/editors/mesh/meshtools.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/ed_fluidsim.c
    branches/soundsystem/source/blender/editors/preview/previewrender.c
    branches/soundsystem/source/blender/editors/screen/area.c
    branches/soundsystem/source/blender/editors/screen/screen_edit.c
    branches/soundsystem/source/blender/editors/screen/screen_ops.c
    branches/soundsystem/source/blender/editors/screen/screendump.c
    branches/soundsystem/source/blender/editors/sculpt_paint/paint_image.c
    branches/soundsystem/source/blender/editors/space_action/action_header.c
    branches/soundsystem/source/blender/editors/space_action/space_action.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_draw.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_file/file_draw.c
    branches/soundsystem/source/blender/editors/space_file/file_intern.h
    branches/soundsystem/source/blender/editors/space_file/file_ops.c
    branches/soundsystem/source/blender/editors/space_file/file_panels.c
    branches/soundsystem/source/blender/editors/space_file/filelist.c
    branches/soundsystem/source/blender/editors/space_file/filesel.c
    branches/soundsystem/source/blender/editors/space_file/fsmenu.c
    branches/soundsystem/source/blender/editors/space_file/space_file.c
    branches/soundsystem/source/blender/editors/space_file/writeimage.c
    branches/soundsystem/source/blender/editors/space_graph/graph_buttons.c
    branches/soundsystem/source/blender/editors/space_graph/graph_draw.c
    branches/soundsystem/source/blender/editors/space_graph/graph_edit.c
    branches/soundsystem/source/blender/editors/space_graph/graph_header.c
    branches/soundsystem/source/blender/editors/space_graph/graph_ops.c
    branches/soundsystem/source/blender/editors/space_graph/graph_select.c
    branches/soundsystem/source/blender/editors/space_graph/space_graph.c
    branches/soundsystem/source/blender/editors/space_image/image_buttons.c
    branches/soundsystem/source/blender/editors/space_image/image_draw.c
    branches/soundsystem/source/blender/editors/space_image/image_header.c
    branches/soundsystem/source/blender/editors/space_image/image_ops.c
    branches/soundsystem/source/blender/editors/space_image/space_image.c
    branches/soundsystem/source/blender/editors/space_info/info_ops.c
    branches/soundsystem/source/blender/editors/space_info/space_info.c
    branches/soundsystem/source/blender/editors/space_logic/logic_buttons.c
    branches/soundsystem/source/blender/editors/space_logic/logic_header.c
    branches/soundsystem/source/blender/editors/space_logic/logic_window.c
    branches/soundsystem/source/blender/editors/space_logic/space_logic.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_nla/space_nla.c
    branches/soundsystem/source/blender/editors/space_node/node_draw.c
    branches/soundsystem/source/blender/editors/space_node/node_edit.c
    branches/soundsystem/source/blender/editors/space_node/node_header.c
    branches/soundsystem/source/blender/editors/space_node/node_select.c
    branches/soundsystem/source/blender/editors/space_node/node_state.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_header.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_sequencer/sequencer_add.c
    branches/soundsystem/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soundsystem/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soundsystem/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soundsystem/source/blender/editors/space_text/space_text.c
    branches/soundsystem/source/blender/editors/space_text/text_ops.c
    branches/soundsystem/source/blender/editors/space_text/text_python.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/Makefile
    branches/soundsystem/source/blender/editors/space_view3d/SConscript
    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_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/transform/transform.c
    branches/soundsystem/source/blender/editors/transform/transform_conversions.c
    branches/soundsystem/source/blender/editors/transform/transform_input.c
    branches/soundsystem/source/blender/editors/transform/transform_manipulator.c
    branches/soundsystem/source/blender/editors/util/editmode_undo.c
    branches/soundsystem/source/blender/editors/util/undo.c
    branches/soundsystem/source/blender/editors/util/util_intern.h
    branches/soundsystem/source/blender/editors/uvedit/uvedit_ops.c
    branches/soundsystem/source/blender/imbuf/intern/IMB_targa.h
    branches/soundsystem/source/blender/imbuf/intern/readimage.c
    branches/soundsystem/source/blender/imbuf/intern/targa.c
    branches/soundsystem/source/blender/makesdna/DNA_action_types.h
    branches/soundsystem/source/blender/makesdna/DNA_actuator_types.h
    branches/soundsystem/source/blender/makesdna/DNA_anim_types.h
    branches/soundsystem/source/blender/makesdna/DNA_meta_types.h
    branches/soundsystem/source/blender/makesdna/DNA_modifier_types.h
    branches/soundsystem/source/blender/makesdna/DNA_sound_types.h
    branches/soundsystem/source/blender/makesdna/DNA_space_types.h
    branches/soundsystem/source/blender/makesdna/DNA_view2d_types.h
    branches/soundsystem/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soundsystem/source/blender/makesdna/intern/makesdna.c
    branches/soundsystem/source/blender/makesrna/RNA_access.h
    branches/soundsystem/source/blender/makesrna/intern/makesrna.c
    branches/soundsystem/source/blender/makesrna/intern/rna_brush.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_mesh.c
    branches/soundsystem/source/blender/makesrna/intern/rna_meta.c
    branches/soundsystem/source/blender/makesrna/intern/rna_modifier.c
    branches/soundsystem/source/blender/makesrna/intern/rna_object.c
    branches/soundsystem/source/blender/makesrna/intern/rna_object_api.c
    branches/soundsystem/source/blender/makesrna/intern/rna_render.c
    branches/soundsystem/source/blender/makesrna/intern/rna_rna.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_ui.c
    branches/soundsystem/source/blender/makesrna/intern/rna_userdef.c
    branches/soundsystem/source/blender/makesrna/intern/rna_wm.c
    branches/soundsystem/source/blender/makesrna/intern/rna_world.c
    branches/soundsystem/source/blender/python/epy_doc_gen.py
    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_operator.c
    branches/soundsystem/source/blender/python/intern/bpy_operator_wrap.c
    branches/soundsystem/source/blender/python/intern/bpy_rna.c
    branches/soundsystem/source/blender/python/intern/bpy_rna.h
    branches/soundsystem/source/blender/render/extern/include/RE_pipeline.h
    branches/soundsystem/source/blender/render/intern/source/pipeline.c
    branches/soundsystem/source/blender/windowmanager/WM_api.h
    branches/soundsystem/source/blender/windowmanager/WM_types.h
    branches/soundsystem/source/blender/windowmanager/intern/wm.c
    branches/soundsystem/source/blender/windowmanager/intern/wm_cursors.c
    branches/soundsystem/source/blender/windowmanager/intern/wm_event_system.c
    branches/soundsystem/source/blender/windowmanager/intern/wm_keymap.c
    branches/soundsystem/source/blender/windowmanager/intern/wm_operators.c
    branches/soundsystem/source/blender/windowmanager/wm_event_types.h
    branches/soundsystem/source/creator/CMakeLists.txt
    branches/soundsystem/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soundsystem/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soundsystem/source/gameengine/Converter/BL_BlenderDataConversion.h
    branches/soundsystem/source/gameengine/Converter/BL_SkinMeshObject.cpp
    branches/soundsystem/source/gameengine/Converter/BL_SkinMeshObject.h
    branches/soundsystem/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soundsystem/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/soundsystem/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soundsystem/source/gameengine/GameLogic/SCA_IScene.h
    branches/soundsystem/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soundsystem/source/gameengine/Ketsji/KX_GameObject.h
    branches/soundsystem/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/soundsystem/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soundsystem/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/soundsystem/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/soundsystem/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soundsystem/source/gameengine/Ketsji/KX_Scene.h
    branches/soundsystem/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/soundsystem/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/soundsystem/source/gameengine/PyDoc/GameTypes.py
    branches/soundsystem/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/soundsystem/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/soundsystem/source/nan_definitions.mk
    branches/soundsystem/tools/Blender.py

Added Paths:
-----------
    branches/soundsystem/intern/smoke/
    branches/soundsystem/intern/smoke/CMakeLists.txt
    branches/soundsystem/intern/smoke/Makefile
    branches/soundsystem/intern/smoke/SConscript
    branches/soundsystem/intern/smoke/extern/
    branches/soundsystem/intern/smoke/extern/smoke_API.h
    branches/soundsystem/intern/smoke/intern/
    branches/soundsystem/intern/smoke/intern/EIGENVALUE_HELPER.h
    branches/soundsystem/intern/smoke/intern/FFT_NOISE.h
    branches/soundsystem/intern/smoke/intern/FLUID_3D.cpp
    branches/soundsystem/intern/smoke/intern/FLUID_3D.h
    branches/soundsystem/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
    branches/soundsystem/intern/smoke/intern/FLUID_3D_STATIC.cpp
    branches/soundsystem/intern/smoke/intern/IMAGE.h
    branches/soundsystem/intern/smoke/intern/INTERPOLATE.h
    branches/soundsystem/intern/smoke/intern/LICENSE.txt
    branches/soundsystem/intern/smoke/intern/LU_HELPER.h
    branches/soundsystem/intern/smoke/intern/MERSENNETWISTER.h
    branches/soundsystem/intern/smoke/intern/Makefile
    branches/soundsystem/intern/smoke/intern/Makefile.FFT
    branches/soundsystem/intern/smoke/intern/Makefile.cygwin
    branches/soundsystem/intern/smoke/intern/Makefile.linux
    branches/soundsystem/intern/smoke/intern/Makefile.mac
    branches/soundsystem/intern/smoke/intern/OBSTACLE.h
    branches/soundsystem/intern/smoke/intern/SPHERE.cpp
    branches/soundsystem/intern/smoke/intern/SPHERE.h
    branches/soundsystem/intern/smoke/intern/VEC3.h
    branches/soundsystem/intern/smoke/intern/WAVELET_NOISE.h
    branches/soundsystem/intern/smoke/intern/WTURBULENCE.cpp
    branches/soundsystem/intern/smoke/intern/WTURBULENCE.h
    branches/soundsystem/intern/smoke/intern/main.cpp.back
    branches/soundsystem/intern/smoke/intern/smoke_API.cpp
    branches/soundsystem/intern/smoke/intern/tnt/
    branches/soundsystem/intern/smoke/intern/tnt/jama_eig.h
    branches/soundsystem/intern/smoke/intern/tnt/jama_lu.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_array1d.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_array1d_utils.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_array2d.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_array2d_utils.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_array3d.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_array3d_utils.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_cmat.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_fortran_array1d.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_fortran_array1d_utils.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_fortran_array2d.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_fortran_array2d_utils.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_fortran_array3d.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_fortran_array3d_utils.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_i_refvec.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_math_utils.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_sparse_matrix_csr.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_stopwatch.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_subscript.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_vec.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_version.h
    branches/soundsystem/release/io/engine_render_pov.py
    branches/soundsystem/release/ui/buttons_data_metaball.py
    branches/soundsystem/source/blender/blenkernel/BKE_sketch.h
    branches/soundsystem/source/blender/blenkernel/BKE_smoke.h
    branches/soundsystem/source/blender/blenkernel/intern/sketch.c
    branches/soundsystem/source/blender/blenkernel/intern/smoke.c
    branches/soundsystem/source/blender/editors/include/ED_mball.h
    branches/soundsystem/source/blender/editors/metaball/
    branches/soundsystem/source/blender/editors/metaball/Makefile
    branches/soundsystem/source/blender/editors/metaball/SConscript
    branches/soundsystem/source/blender/editors/metaball/editmball.c
    branches/soundsystem/source/blender/editors/metaball/mball_intern.h
    branches/soundsystem/source/blender/editors/metaball/mball_ops.c
    branches/soundsystem/source/blender/makesdna/DNA_smoke_types.h
    branches/soundsystem/source/blender/makesrna/intern/rna_smoke.c

Removed Paths:
-------------
    branches/soundsystem/intern/smoke/CMakeLists.txt
    branches/soundsystem/intern/smoke/Makefile
    branches/soundsystem/intern/smoke/SConscript
    branches/soundsystem/intern/smoke/extern/
    branches/soundsystem/intern/smoke/extern/smoke_API.h
    branches/soundsystem/intern/smoke/intern/
    branches/soundsystem/intern/smoke/intern/EIGENVALUE_HELPER.h
    branches/soundsystem/intern/smoke/intern/FFT_NOISE.h
    branches/soundsystem/intern/smoke/intern/FLUID_3D.cpp
    branches/soundsystem/intern/smoke/intern/FLUID_3D.h
    branches/soundsystem/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
    branches/soundsystem/intern/smoke/intern/FLUID_3D_STATIC.cpp
    branches/soundsystem/intern/smoke/intern/IMAGE.h
    branches/soundsystem/intern/smoke/intern/INTERPOLATE.h
    branches/soundsystem/intern/smoke/intern/LICENSE.txt
    branches/soundsystem/intern/smoke/intern/LU_HELPER.h
    branches/soundsystem/intern/smoke/intern/MERSENNETWISTER.h
    branches/soundsystem/intern/smoke/intern/Makefile
    branches/soundsystem/intern/smoke/intern/Makefile.FFT
    branches/soundsystem/intern/smoke/intern/Makefile.cygwin
    branches/soundsystem/intern/smoke/intern/Makefile.linux
    branches/soundsystem/intern/smoke/intern/Makefile.mac
    branches/soundsystem/intern/smoke/intern/OBSTACLE.h
    branches/soundsystem/intern/smoke/intern/SPHERE.cpp
    branches/soundsystem/intern/smoke/intern/SPHERE.h
    branches/soundsystem/intern/smoke/intern/VEC3.h
    branches/soundsystem/intern/smoke/intern/WAVELET_NOISE.h
    branches/soundsystem/intern/smoke/intern/WTURBULENCE.cpp
    branches/soundsystem/intern/smoke/intern/WTURBULENCE.h
    branches/soundsystem/intern/smoke/intern/main.cpp.back
    branches/soundsystem/intern/smoke/intern/smoke_API.cpp
    branches/soundsystem/intern/smoke/intern/tnt/
    branches/soundsystem/intern/smoke/intern/tnt/jama_eig.h
    branches/soundsystem/intern/smoke/intern/tnt/jama_lu.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_array1d.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_array1d_utils.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_array2d.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_array2d_utils.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_array3d.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_array3d_utils.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_cmat.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_fortran_array1d.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_fortran_array1d_utils.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_fortran_array2d.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_fortran_array2d_utils.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_fortran_array3d.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_fortran_array3d_utils.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_i_refvec.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_math_utils.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_sparse_matrix_csr.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_stopwatch.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_subscript.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_vec.h
    branches/soundsystem/intern/smoke/intern/tnt/tnt_version.h
    branches/soundsystem/source/blender/editors/metaball/Makefile
    branches/soundsystem/source/blender/editors/metaball/SConscript
    branches/soundsystem/source/blender/editors/metaball/editmball.c
    branches/soundsystem/source/blender/editors/metaball/mball_intern.h
    branches/soundsystem/source/blender/editors/metaball/mball_ops.c

Modified: branches/soundsystem/config/darwin-config.py
===================================================================
--- branches/soundsystem/config/darwin-config.py	2009-07-31 10:21:29 UTC (rev 22083)
+++ branches/soundsystem/config/darwin-config.py	2009-07-31 12:29:28 UTC (rev 22084)
@@ -10,8 +10,6 @@
 # IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs
 USE_SDK=True
 
-BF_PYTHON_VERSION = '2.3'
-
 cmd = 'uname -p'
 MAC_PROC=commands.getoutput(cmd) 
 cmd = 'uname -r'
@@ -32,9 +30,12 @@
 if MAC_PROC== 'powerpc' and BF_PYTHON_VERSION == '2.3':
 	MAC_MIN_VERS = '10.3'
 	MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
-else:
+elif MAC_CUR_VER=='10.4':
 	MAC_MIN_VERS = '10.4'
 	MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+else:
+	MAC_MIN_VERS = '10.5'
+	MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
 
 
 # enable ffmpeg  support
@@ -46,24 +47,35 @@
 #BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
 #BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
 
-# python.org libs install in /library we want to use that for 2.5 
-#
-# if you want py2.5 on leopard without installing
-# change value to BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
-# BEWARE: in that case it will work only on leopard
+BF_PYTHON_VERSION = '3.1'
 
-if BF_PYTHON_VERSION=='2.3':
-	BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
+if BF_PYTHON_VERSION=='3.1':
+	# python 3.1 uses precompiled libraries in bf svn /lib by default
+
+	BF_PYTHON = LIBDIR + '/python'
+	BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+	# BF_PYTHON_BINARY = '${BF_PYTHON}/bin/python${BF_PYTHON_VERSION}'
+	BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
+	BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}'
+	# BF_PYTHON_LINKFLAGS = '-u _PyMac_Error -framework System'
 else:
-	BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+	# python 2.5 etc. uses built-in framework
 
-BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}'
-BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
-BF_PYTHON_LIB = ''
-BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config'
-BF_PYTHON_LINKFLAGS = '-u _PyMac_Error -framework System -framework Python'
-if MAC_CUR_VER=='10.3' or  MAC_CUR_VER=='10.4':
-	BF_PYTHON_LINKFLAGS ='-u __dummy '+BF_PYTHON_LINKFLAGS
+	# python.org libs install in /library we want to use that for 2.5 
+	#
+	# if you want py2.5 on leopard without installing
+	# change value to BF_PYTHON = '/Library/Frameworks/Python.framework/Versions/'
+	# BEWARE: in that case it will work only on leopard
+
+	BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
+
+	BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}'
+	BF_PYTHON_BINARY = '${BF_PYTHON}${BF_PYTHON_VERSION}/bin/python${BF_PYTHON_VERSION}'
+	BF_PYTHON_LIB = ''
+	BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERSION}/config'
+	BF_PYTHON_LINKFLAGS = '-u _PyMac_Error -framework System -framework Python'
+	if MAC_CUR_VER=='10.3' or  MAC_CUR_VER=='10.4':
+		BF_PYTHON_LINKFLAGS ='-u __dummy '+BF_PYTHON_LINKFLAGS
 	
 BF_QUIET = '1'
 WITH_BF_OPENMP = '0'
@@ -144,7 +156,7 @@
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
 WITH_BF_GAMEENGINE=True
-WITH_BF_PLAYER=False
+WITH_BF_PLAYER = False
 
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'

Modified: branches/soundsystem/config/irix6-config.py
===================================================================
--- branches/soundsystem/config/irix6-config.py	2009-07-31 10:21:29 UTC (rev 22083)
+++ branches/soundsystem/config/irix6-config.py	2009-07-31 12:29:28 UTC (rev 22084)
@@ -78,6 +78,7 @@
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
 WITH_BF_GAMEENGINE='false'
+WITH_BF_PLAYER = 'false'
 
 WITH_BF_BULLET = 'true'
 BF_BULLET = '#extern/bullet2/src'

Modified: branches/soundsystem/config/linuxcross-config.py
===================================================================
--- branches/soundsystem/config/linuxcross-config.py	2009-07-31 10:21:29 UTC (rev 22083)
+++ branches/soundsystem/config/linuxcross-config.py	2009-07-31 12:29:28 UTC (rev 22084)
@@ -78,6 +78,7 @@
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
 WITH_BF_GAMEENGINE = False
+WITH_BF_PLAYER = False
 
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'

Modified: branches/soundsystem/config/openbsd3-config.py
===================================================================
--- branches/soundsystem/config/openbsd3-config.py	2009-07-31 10:21:29 UTC (rev 22083)
+++ branches/soundsystem/config/openbsd3-config.py	2009-07-31 12:29:28 UTC (rev 22084)
@@ -65,6 +65,7 @@
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
 WITH_BF_GAMEENGINE=False
+WITH_BF_PLAYER = False
 
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'

Modified: branches/soundsystem/config/sunos5-config.py
===================================================================
--- branches/soundsystem/config/sunos5-config.py	2009-07-31 10:21:29 UTC (rev 22083)
+++ branches/soundsystem/config/sunos5-config.py	2009-07-31 12:29:28 UTC (rev 22084)
@@ -73,6 +73,7 @@
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
 WITH_BF_GAMEENGINE=False
+WITH_BF_PLAYER = False
 
 WITH_BF_BULLET = True
 BF_BULLET = '#extern/bullet2/src'

Modified: branches/soundsystem/intern/CMakeLists.txt
===================================================================
--- branches/soundsystem/intern/CMakeLists.txt	2009-07-31 10:21:29 UTC (rev 22083)
+++ branches/soundsystem/intern/CMakeLists.txt	2009-07-31 12:29:28 UTC (rev 22084)
@@ -36,6 +36,7 @@
 ADD_SUBDIRECTORY(iksolver)
 ADD_SUBDIRECTORY(boolop)
 ADD_SUBDIRECTORY(opennl)
+ADD_SUBDIRECTORY(smoke)
 
 IF(WITH_ELBEEM)
   ADD_SUBDIRECTORY(elbeem)

Modified: branches/soundsystem/intern/Makefile
===================================================================
--- branches/soundsystem/intern/Makefile	2009-07-31 10:21:29 UTC (rev 22083)
+++ branches/soundsystem/intern/Makefile	2009-07-31 12:29:28 UTC (rev 22084)
@@ -32,7 +32,7 @@
 # include nan_subdirs.mk
 
 ALLDIRS = string ghost guardedalloc moto container memutil
-ALLDIRS += decimation iksolver bsp SoundSystem opennl elbeem boolop audaspace
+ALLDIRS += decimation iksolver bsp SoundSystem opennl elbeem boolop smoke audaspace
 
 all::
 	@for i in $(ALLDIRS); do \

Modified: branches/soundsystem/intern/SConscript
===================================================================
--- branches/soundsystem/intern/SConscript	2009-07-31 10:21:29 UTC (rev 22083)
+++ branches/soundsystem/intern/SConscript	2009-07-31 12:29:28 UTC (rev 22084)
@@ -12,7 +12,8 @@
             'decimation/SConscript',
             'iksolver/SConscript',
             'boolop/SConscript',
-            'opennl/SConscript'])
+            'opennl/SConscript',
+            'smoke/SConscript'])
 
 # NEW_CSG was intended for intern/csg, but
 # getting it to compile is difficult

Modified: branches/soundsystem/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- branches/soundsystem/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp	2009-07-31 10:21:29 UTC (rev 22083)
+++ branches/soundsystem/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp	2009-07-31 12:29:28 UTC (rev 22084)
@@ -556,6 +556,7 @@
 			// play sound
 			m_playingSounds->push_back(sound);
 
+			alSourcei(sound->source, AL_SOURCE_RELATIVE, 1);
 			start();
 
 			alcProcessContext(m_context);
@@ -664,6 +665,7 @@
 
 	// play sound
 	m_playingSounds->push_back(sound);
+	alSourcei(sound->source, AL_SOURCE_RELATIVE, 1);
 
 	start();
 
@@ -1142,7 +1144,10 @@
 
 AUD_Handle* AUD_OpenALDevice::play3D(AUD_IFactory* factory, bool keep)
 {
-	return play(factory, keep);
+	AUD_OpenALHandle* handle = (AUD_OpenALHandle*)play(factory, keep);
+	if(handle)
+		alSourcei(handle->source, AL_SOURCE_RELATIVE, 0);
+	return handle;
 }
 
 bool AUD_OpenALDevice::updateListener(AUD_3DData &data)
@@ -1261,7 +1266,7 @@
 			result = true;
 			break;
 		case AUD_3DSS_IS_RELATIVE:
-			alSourcei(source, AL_SOURCE_RELATIVE, value > 1.0);
+			alSourcei(source, AL_SOURCE_RELATIVE, value > 0.0);
 			result = true;
 			break;
 		case AUD_3DSS_MAX_DISTANCE:

Modified: branches/soundsystem/intern/elbeem/intern/solver_init.cpp
===================================================================
--- branches/soundsystem/intern/elbeem/intern/solver_init.cpp	2009-07-31 10:21:29 UTC (rev 22083)
+++ branches/soundsystem/intern/elbeem/intern/solver_init.cpp	2009-07-31 12:29:28 UTC (rev 22084)
@@ -1464,7 +1464,7 @@
 				obj->applyTransformation(targetTime, &mMOIVertices,NULL /* no old normals needed */, 0, mMOIVertices.size(), false );
 			} else {
 				// only do transform update
-				obj->getMovingPoints(mMOIVertices,pNormals);
+				obj->getMovingPoints(mMOIVertices,pNormals); // mMOIVertices = mCachedMovPoints
 				mMOIVerticesOld = mMOIVertices;
 				// WARNING - assumes mSimulationTime is global!?
 				obj->applyTransformation(targetTime, &mMOIVertices,pNormals, 0, mMOIVertices.size(), false );

Modified: branches/soundsystem/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soundsystem/intern/ghost/intern/GHOST_SystemX11.cpp	2009-07-31 10:21:29 UTC (rev 22083)
+++ branches/soundsystem/intern/ghost/intern/GHOST_SystemX11.cpp	2009-07-31 12:29:28 UTC (rev 22084)
@@ -534,11 +534,28 @@
 					                              window, data);
 				}
 			} else if (((Atom)xcme.data.l[0]) == m_wm_take_focus) {
+				XWindowAttributes attr;
+				Window fwin;
+				int revert_to;
+
 				/* as ICCCM say, we need reply this event
 				 * with a SetInputFocus, the data[1] have
 				 * the valid timestamp (send by the wm).
+				 *
+				 * Some WM send this event before the
+				 * window is really mapped (for example
+				 * change from virtual desktop), so we need
+				 * to be sure that our windows is mapped
+				 * or this call fail and close blender.
 				 */
-				XSetInputFocus(m_display, xcme.window, RevertToParent, xcme.data.l[1]);
+				if (XGetWindowAttributes(m_display, xcme.window, &attr) == True) {
+					if (XGetInputFocus(m_display, &fwin, &revert_to) == True) {
+						if (attr.map_state == IsViewable) {
+							if (fwin != xcme.window)
+								XSetInputFocus(m_display, xcme.window, RevertToParent, xcme.data.l[1]);
+						}
+					}
+				}
 			} else {
 				/* Unknown client message, ignore */
 			}


@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list