Revision: 22369 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22369 Author: jaguarandi Date: 2009-08-11 14:55:50 +0200 (Tue, 11 Aug 2009)
Log Message: ----------- svn merge -r 22138:22364 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender Modified Paths: -------------- branches/soc-2009-jaguarandi/CMake/macros.cmake branches/soc-2009-jaguarandi/CMakeLists.txt branches/soc-2009-jaguarandi/SConstruct branches/soc-2009-jaguarandi/blenderplayer/CMakeLists.txt branches/soc-2009-jaguarandi/config/darwin-config.py branches/soc-2009-jaguarandi/config/irix6-config.py branches/soc-2009-jaguarandi/config/linux2-config.py branches/soc-2009-jaguarandi/config/linuxcross-config.py branches/soc-2009-jaguarandi/config/openbsd3-config.py branches/soc-2009-jaguarandi/config/sunos5-config.py branches/soc-2009-jaguarandi/config/win32-mingw-config.py branches/soc-2009-jaguarandi/config/win32-vc-config.py branches/soc-2009-jaguarandi/config/win64-vc-config.py branches/soc-2009-jaguarandi/extern/ffmpeg/SConscript branches/soc-2009-jaguarandi/intern/CMakeLists.txt branches/soc-2009-jaguarandi/intern/Makefile branches/soc-2009-jaguarandi/intern/SConscript branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_EventManager.cpp branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemX11.cpp branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_SystemX11.h branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowManager.cpp branches/soc-2009-jaguarandi/intern/ghost/intern/GHOST_WindowX11.cpp branches/soc-2009-jaguarandi/intern/smoke/CMakeLists.txt branches/soc-2009-jaguarandi/intern/smoke/SConscript branches/soc-2009-jaguarandi/intern/smoke/extern/smoke_API.h branches/soc-2009-jaguarandi/intern/smoke/intern/FFT_NOISE.h branches/soc-2009-jaguarandi/intern/smoke/intern/FLUID_3D.cpp branches/soc-2009-jaguarandi/intern/smoke/intern/FLUID_3D.h branches/soc-2009-jaguarandi/intern/smoke/intern/FLUID_3D_SOLVERS.cpp branches/soc-2009-jaguarandi/intern/smoke/intern/FLUID_3D_STATIC.cpp branches/soc-2009-jaguarandi/intern/smoke/intern/WAVELET_NOISE.h branches/soc-2009-jaguarandi/intern/smoke/intern/WTURBULENCE.cpp branches/soc-2009-jaguarandi/intern/smoke/intern/WTURBULENCE.h branches/soc-2009-jaguarandi/intern/smoke/intern/smoke_API.cpp branches/soc-2009-jaguarandi/make/example_scripts/linux_nanmakefiles.sh branches/soc-2009-jaguarandi/make/example_scripts/sunos_nanmakefiles.sh branches/soc-2009-jaguarandi/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/blender/blender.sln branches/soc-2009-jaguarandi/projectfiles_vc9/blender/blender.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/blender/editors/ED_editors.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/blender/loader/BLO_loader.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/blender/nodes/nodes.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/gameengine/blenderhook/KX_blenderhook.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/gameengine/converter/KX_converter.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/gameengine/expression/EXP_expressions.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/gameengine/gamelogic/SCA_GameLogic.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/gameengine/gameplayer/axctl/GP_axctl.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/gameengine/gameplayer/common/GP_common.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/gameengine/gameplayer/ghost/GP_ghost.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/gameengine/ketsji/KX_ketsji.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/gameengine/ketsji/network/KX_network.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/gameengine/rasterizer/RAS_rasterizer.vcproj branches/soc-2009-jaguarandi/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj branches/soc-2009-jaguarandi/release/Makefile branches/soc-2009-jaguarandi/release/io/engine_render_pov.py branches/soc-2009-jaguarandi/release/scripts/export_map.py branches/soc-2009-jaguarandi/release/scripts/md2_export.py branches/soc-2009-jaguarandi/release/scripts/textplugin_convert_ge.py branches/soc-2009-jaguarandi/release/ui/bpy_ops.py branches/soc-2009-jaguarandi/release/ui/buttons_data_camera.py branches/soc-2009-jaguarandi/release/ui/buttons_data_mesh.py branches/soc-2009-jaguarandi/release/ui/buttons_data_metaball.py branches/soc-2009-jaguarandi/release/ui/buttons_data_modifier.py branches/soc-2009-jaguarandi/release/ui/buttons_game.py branches/soc-2009-jaguarandi/release/ui/buttons_material.py branches/soc-2009-jaguarandi/release/ui/buttons_object_constraint.py branches/soc-2009-jaguarandi/release/ui/buttons_physics_cloth.py branches/soc-2009-jaguarandi/release/ui/buttons_physics_fluid.py branches/soc-2009-jaguarandi/release/ui/buttons_physics_softbody.py branches/soc-2009-jaguarandi/release/ui/buttons_scene.py branches/soc-2009-jaguarandi/release/ui/buttons_texture.py branches/soc-2009-jaguarandi/release/ui/buttons_world.py branches/soc-2009-jaguarandi/release/ui/space_console.py branches/soc-2009-jaguarandi/release/ui/space_image.py branches/soc-2009-jaguarandi/release/ui/space_info.py branches/soc-2009-jaguarandi/release/ui/space_text.py branches/soc-2009-jaguarandi/release/ui/space_view3d.py branches/soc-2009-jaguarandi/release/ui/space_view3d_toolbar.py branches/soc-2009-jaguarandi/source/Makefile branches/soc-2009-jaguarandi/source/blender/blenfont/BLF_api.h branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf.c branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf_font.c branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf_glyph.c branches/soc-2009-jaguarandi/source/blender/blenfont/intern/blf_internal_types.h branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_global.h branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_library.h branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_mball.h branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_nla.h branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_packedFile.h branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_sculpt.h branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_sequence.h branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_smoke.h branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_softbody.h branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_sound.h branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_writeavi.h branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_writeffmpeg.h branches/soc-2009-jaguarandi/source/blender/blenkernel/BKE_writeframeserver.h branches/soc-2009-jaguarandi/source/blender/blenkernel/CMakeLists.txt branches/soc-2009-jaguarandi/source/blender/blenkernel/SConscript branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/Makefile branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/anim_sys.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/blender.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/colortools.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/displist.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/library.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/mball.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/modifier.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/nla.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/object.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/packedFile.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/pointcache.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/sca.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/scene.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/sequence.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/smoke.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/softbody.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/sound.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/writeavi.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/writeffmpeg.c branches/soc-2009-jaguarandi/source/blender/blenkernel/intern/writeframeserver.c branches/soc-2009-jaguarandi/source/blender/blenlib/intern/bpath.c branches/soc-2009-jaguarandi/source/blender/blenloader/intern/readfile.c branches/soc-2009-jaguarandi/source/blender/blenloader/intern/writefile.c branches/soc-2009-jaguarandi/source/blender/editors/CMakeLists.txt branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_channels.c branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_filter.c branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_ipo_utils.c branches/soc-2009-jaguarandi/source/blender/editors/animation/anim_ops.c branches/soc-2009-jaguarandi/source/blender/editors/animation/keyingsets.c branches/soc-2009-jaguarandi/source/blender/editors/armature/editarmature_sketch.c branches/soc-2009-jaguarandi/source/blender/editors/include/ED_anim_api.h branches/soc-2009-jaguarandi/source/blender/editors/include/UI_interface.h branches/soc-2009-jaguarandi/source/blender/editors/interface/Makefile branches/soc-2009-jaguarandi/source/blender/editors/interface/SConscript branches/soc-2009-jaguarandi/source/blender/editors/interface/interface.c branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_handlers.c branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_layout.c branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_style.c branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_templates.c branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_utils.c branches/soc-2009-jaguarandi/source/blender/editors/interface/interface_widgets.c branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh.c branches/soc-2009-jaguarandi/source/blender/editors/mesh/editmesh_mods.c branches/soc-2009-jaguarandi/source/blender/editors/object/object_edit.c branches/soc-2009-jaguarandi/source/blender/editors/physics/ed_pointcache.c branches/soc-2009-jaguarandi/source/blender/editors/screen/CMakeLists.txt branches/soc-2009-jaguarandi/source/blender/editors/screen/screen_edit.c branches/soc-2009-jaguarandi/source/blender/editors/screen/screen_ops.c branches/soc-2009-jaguarandi/source/blender/editors/screen/screendump.c branches/soc-2009-jaguarandi/source/blender/editors/sculpt_paint/sculpt.c branches/soc-2009-jaguarandi/source/blender/editors/space_action/action_draw.c branches/soc-2009-jaguarandi/source/blender/editors/space_action/action_header.c branches/soc-2009-jaguarandi/source/blender/editors/space_buttons/buttons_context.c branches/soc-2009-jaguarandi/source/blender/editors/space_file/filelist.c branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_draw.c branches/soc-2009-jaguarandi/source/blender/editors/space_graph/graph_header.c branches/soc-2009-jaguarandi/source/blender/editors/space_logic/logic_window.c branches/soc-2009-jaguarandi/source/blender/editors/space_nla/nla_buttons.c branches/soc-2009-jaguarandi/source/blender/editors/space_nla/nla_channels.c branches/soc-2009-jaguarandi/source/blender/editors/space_nla/nla_draw.c branches/soc-2009-jaguarandi/source/blender/editors/space_nla/nla_header.c branches/soc-2009-jaguarandi/source/blender/editors/space_outliner/outliner.c branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/Makefile branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/SConscript branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/sequencer_add.c branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/sequencer_draw.c branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/sequencer_edit.c branches/soc-2009-jaguarandi/source/blender/editors/space_sequencer/sequencer_select.c branches/soc-2009-jaguarandi/source/blender/editors/space_time/time_header.c branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/drawobject.c branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/space_view3d.c branches/soc-2009-jaguarandi/source/blender/editors/space_view3d/view3d_buttons.c branches/soc-2009-jaguarandi/source/blender/editors/util/undo.c branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_action_types.h branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_actuator_types.h branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_anim_types.h branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_brush_types.h branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_material_types.h branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_mesh_types.h branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_meta_types.h branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_scene_types.h branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_sequence_types.h branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_smoke_types.h branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_sound_types.h branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_texture_types.h branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_userdef_types.h branches/soc-2009-jaguarandi/source/blender/makesdna/DNA_world_types.h branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_access.h branches/soc-2009-jaguarandi/source/blender/makesrna/RNA_types.h branches/soc-2009-jaguarandi/source/blender/makesrna/SConscript branches/soc-2009-jaguarandi/source/blender/makesrna/intern/CMakeLists.txt branches/soc-2009-jaguarandi/source/blender/makesrna/intern/SConscript branches/soc-2009-jaguarandi/source/blender/makesrna/intern/makesrna.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_access.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_actuator.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_animation.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_armature.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_brush.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_cloth.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_color.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_constraint.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_curve.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_define.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_fcurve.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_fluidsim.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_group.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_image.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_internal.h branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_key.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_lamp.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_lattice.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_material.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_mesh.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_meta.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_modifier.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_nla.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_nodetree.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_object.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_object_force.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_particle.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_pose.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_rna.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_scene.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_sequence.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_smoke.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_sound.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_texture.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_timeline.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_ui_api.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_userdef.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_wm.c branches/soc-2009-jaguarandi/source/blender/makesrna/intern/rna_world.c branches/soc-2009-jaguarandi/source/blender/nodes/intern/SHD_nodes/SHD_dynamic.c branches/soc-2009-jaguarandi/source/blender/python/BPY_extern.h branches/soc-2009-jaguarandi/source/blender/python/generic/BGL.c branches/soc-2009-jaguarandi/source/blender/python/generic/BGL.h branches/soc-2009-jaguarandi/source/blender/python/generic/Geometry.c branches/soc-2009-jaguarandi/source/blender/python/generic/Geometry.h branches/soc-2009-jaguarandi/source/blender/python/generic/Makefile branches/soc-2009-jaguarandi/source/blender/python/generic/Mathutils.c branches/soc-2009-jaguarandi/source/blender/python/generic/Mathutils.h branches/soc-2009-jaguarandi/source/blender/python/generic/bpy_internal_import.c branches/soc-2009-jaguarandi/source/blender/python/generic/bpy_internal_import.h branches/soc-2009-jaguarandi/source/blender/python/generic/euler.c branches/soc-2009-jaguarandi/source/blender/python/generic/euler.h branches/soc-2009-jaguarandi/source/blender/python/generic/matrix.c branches/soc-2009-jaguarandi/source/blender/python/generic/quat.c branches/soc-2009-jaguarandi/source/blender/python/generic/quat.h branches/soc-2009-jaguarandi/source/blender/python/generic/vector.c branches/soc-2009-jaguarandi/source/blender/python/generic/vector.h branches/soc-2009-jaguarandi/source/blender/python/intern/Makefile branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_interface.c branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_operator.c branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_operator_wrap.c branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_rna.c branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_ui.c branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_util.c branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_util.h branches/soc-2009-jaguarandi/source/blender/render/intern/source/pipeline.c branches/soc-2009-jaguarandi/source/blender/windowmanager/CMakeLists.txt branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/Makefile branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_init_exit.c branches/soc-2009-jaguarandi/source/blender/windowmanager/intern/wm_window.c branches/soc-2009-jaguarandi/source/blender/windowmanager/wm_window.h branches/soc-2009-jaguarandi/source/creator/CMakeLists.txt branches/soc-2009-jaguarandi/source/creator/creator.c branches/soc-2009-jaguarandi/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp branches/soc-2009-jaguarandi/source/gameengine/BlenderRoutines/CMakeLists.txt branches/soc-2009-jaguarandi/source/gameengine/BlenderRoutines/Makefile branches/soc-2009-jaguarandi/source/gameengine/BlenderRoutines/SConscript branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_ActionActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_BlenderDataConversion.cpp branches/soc-2009-jaguarandi/source/gameengine/Converter/BL_ShapeActionActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Converter/CMakeLists.txt branches/soc-2009-jaguarandi/source/gameengine/Converter/KX_BlenderSceneConverter.cpp branches/soc-2009-jaguarandi/source/gameengine/Converter/KX_BlenderSceneConverter.h branches/soc-2009-jaguarandi/source/gameengine/Converter/KX_ConvertActuators.cpp branches/soc-2009-jaguarandi/source/gameengine/Converter/Makefile branches/soc-2009-jaguarandi/source/gameengine/Converter/SConscript branches/soc-2009-jaguarandi/source/gameengine/Expressions/ListValue.cpp branches/soc-2009-jaguarandi/source/gameengine/Expressions/PyObjectPlus.cpp branches/soc-2009-jaguarandi/source/gameengine/Expressions/PyObjectPlus.h branches/soc-2009-jaguarandi/source/gameengine/Expressions/Value.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_ANDController.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_DelaySensor.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_IController.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_ILogicBrick.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_IObject.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_ISensor.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_JoystickSensor.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_MouseSensor.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_NANDController.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_NORController.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_ORController.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_PropertyActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_PropertySensor.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_PythonController.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_RandomActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_RandomSensor.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_XNORController.cpp branches/soc-2009-jaguarandi/source/gameengine/GameLogic/SCA_XORController.cpp branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/common/CMakeLists.txt branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/common/Makefile branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/common/SConscript branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/common/unix/Makefile branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/common/windows/Makefile branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/ghost/CMakeLists.txt branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/ghost/Makefile branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/ghost/SConscript branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile branches/soc-2009-jaguarandi/source/gameengine/GamePlayer/netscape/src/xpcom/_Blender3DPlugin_implementation_.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/BL_Shader.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/CMakeLists.txt branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_BlenderMaterial.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_Camera.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_CameraActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_ConstraintActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_GameActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_GameObject.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_GameObject.h branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_IpoActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_KetsjiEngine.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_KetsjiEngine.h branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_Light.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_MeshProxy.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_NearSensor.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_ObjectActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_ParentActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PolyProxy.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PolygonMaterial.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PythonInit.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PythonInitTypes.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_PythonSeq.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_RadarSensor.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_RaySensor.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SCA_EndObjectActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_Scene.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_Scene.h branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SceneActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SoundActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_SoundActuator.h branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_StateActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_TouchSensor.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_TrackToActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_VehicleWrapper.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_VertexProxy.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_VisibilityActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/Makefile branches/soc-2009-jaguarandi/source/gameengine/Ketsji/SConscript branches/soc-2009-jaguarandi/source/gameengine/Physics/Bullet/CMakeLists.txt branches/soc-2009-jaguarandi/source/gameengine/Physics/Bullet/Makefile branches/soc-2009-jaguarandi/source/gameengine/Physics/Bullet/SConscript branches/soc-2009-jaguarandi/source/gameengine/Physics/Dummy/Makefile branches/soc-2009-jaguarandi/source/gameengine/Physics/common/Makefile branches/soc-2009-jaguarandi/source/gameengine/PyDoc/GameLogic.py branches/soc-2009-jaguarandi/source/gameengine/PyDoc/GameTypes.py branches/soc-2009-jaguarandi/source/gameengine/Rasterizer/RAS_BucketManager.cpp branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/CMakeLists.txt branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/FilterBlueScreen.cpp branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/FilterColor.cpp branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/FilterNormal.cpp branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/FilterSource.cpp branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/ImageBuff.cpp branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/ImageMix.cpp branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/ImageRender.cpp branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/ImageViewport.cpp branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/Makefile branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/SConscript branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/Texture.cpp branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/VideoFFmpeg.cpp branches/soc-2009-jaguarandi/source/gameengine/VideoTexture/blendVideoTex.cpp branches/soc-2009-jaguarandi/source/kernel/gen_system/SYS_SingletonSystem.cpp branches/soc-2009-jaguarandi/source/kernel/gen_system/SYS_SingletonSystem.h branches/soc-2009-jaguarandi/source/nan_compile.mk branches/soc-2009-jaguarandi/source/nan_definitions.mk branches/soc-2009-jaguarandi/source/nan_link.mk branches/soc-2009-jaguarandi/tools/Blender.py branches/soc-2009-jaguarandi/tools/btools.py Added Paths: ----------- branches/soc-2009-jaguarandi/intern/audaspace/ branches/soc-2009-jaguarandi/intern/audaspace/CMakeLists.txt branches/soc-2009-jaguarandi/intern/audaspace/COPYING branches/soc-2009-jaguarandi/intern/audaspace/COPYING.LESSER branches/soc-2009-jaguarandi/intern/audaspace/FX/ branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_DelayFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_DelayFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_DelayReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_DelayReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_DoubleReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_DoubleReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_EffectFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_EffectFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_EffectReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_EffectReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_FaderFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_FaderFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_FaderReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_FaderReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LimiterFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LimiterFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LimiterReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LimiterReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LoopFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LoopFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LoopReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LoopReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_PingPongFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_PingPongFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_PitchFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_PitchFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_PitchReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_PitchReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_ReverseFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_ReverseFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_ReverseReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_ReverseReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_VolumeFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_VolumeFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_VolumeReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_VolumeReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/Makefile branches/soc-2009-jaguarandi/intern/audaspace/Makefile branches/soc-2009-jaguarandi/intern/audaspace/OpenAL/ branches/soc-2009-jaguarandi/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp branches/soc-2009-jaguarandi/intern/audaspace/OpenAL/AUD_OpenALDevice.h branches/soc-2009-jaguarandi/intern/audaspace/SConscript branches/soc-2009-jaguarandi/intern/audaspace/SDL/ branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLDevice.cpp branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLDevice.h branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLMixer.cpp branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLMixer.h branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLMixerFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLMixerFactory.h branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLMixerReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLMixerReader.h branches/soc-2009-jaguarandi/intern/audaspace/SDL/Makefile branches/soc-2009-jaguarandi/intern/audaspace/SRC/ branches/soc-2009-jaguarandi/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/SRC/AUD_SRCResampleFactory.h branches/soc-2009-jaguarandi/intern/audaspace/SRC/AUD_SRCResampleReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/SRC/AUD_SRCResampleReader.h branches/soc-2009-jaguarandi/intern/audaspace/SRC/Makefile branches/soc-2009-jaguarandi/intern/audaspace/ffmpeg/ branches/soc-2009-jaguarandi/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h branches/soc-2009-jaguarandi/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h branches/soc-2009-jaguarandi/intern/audaspace/ffmpeg/Makefile branches/soc-2009-jaguarandi/intern/audaspace/intern/ branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_Buffer.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_Buffer.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_BufferReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_BufferReader.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_C-API.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_C-API.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ChannelMapperFactory.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ChannelMapperReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ChannelMapperReader.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ConverterFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ConverterFactory.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ConverterFunctions.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ConverterFunctions.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ConverterReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ConverterReader.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_FloatMixer.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_FloatMixer.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_I3DDevice.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_IDevice.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_IFactory.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_IMixer.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_IReader.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_MixerFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_MixerFactory.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_NULLDevice.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_NULLDevice.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ReadDevice.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ReadDevice.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_Reference.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ResampleFactory.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_SinusFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_SinusFactory.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_SinusReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_SinusReader.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_SoftwareDevice.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_SoftwareDevice.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_SourceCaps.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_Space.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_StreamBufferFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_StreamBufferFactory.h branches/soc-2009-jaguarandi/intern/audaspace/intern/Makefile branches/soc-2009-jaguarandi/intern/audaspace/make/ branches/soc-2009-jaguarandi/intern/audaspace/make/msvc_9_0/ branches/soc-2009-jaguarandi/intern/audaspace/make/msvc_9_0/audaspace.vcproj branches/soc-2009-jaguarandi/release/ui/buttons_physics_smoke.py Removed Paths: ------------- branches/soc-2009-jaguarandi/extern/fftw/ branches/soc-2009-jaguarandi/intern/SoundSystem/ branches/soc-2009-jaguarandi/intern/audaspace/CMakeLists.txt branches/soc-2009-jaguarandi/intern/audaspace/COPYING branches/soc-2009-jaguarandi/intern/audaspace/COPYING.LESSER branches/soc-2009-jaguarandi/intern/audaspace/FX/ branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_DelayFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_DelayFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_DelayReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_DelayReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_DoubleReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_DoubleReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_EffectFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_EffectFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_EffectReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_EffectReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_FaderFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_FaderFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_FaderReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_FaderReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LimiterFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LimiterFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LimiterReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LimiterReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LoopFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LoopFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LoopReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_LoopReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_PingPongFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_PingPongFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_PitchFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_PitchFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_PitchReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_PitchReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_ReverseFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_ReverseFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_ReverseReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_ReverseReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_VolumeFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_VolumeFactory.h branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_VolumeReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/FX/AUD_VolumeReader.h branches/soc-2009-jaguarandi/intern/audaspace/FX/Makefile branches/soc-2009-jaguarandi/intern/audaspace/Makefile branches/soc-2009-jaguarandi/intern/audaspace/OpenAL/ branches/soc-2009-jaguarandi/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp branches/soc-2009-jaguarandi/intern/audaspace/OpenAL/AUD_OpenALDevice.h branches/soc-2009-jaguarandi/intern/audaspace/SConscript branches/soc-2009-jaguarandi/intern/audaspace/SDL/ branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLDevice.cpp branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLDevice.h branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLMixer.cpp branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLMixer.h branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLMixerFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLMixerFactory.h branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLMixerReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/SDL/AUD_SDLMixerReader.h branches/soc-2009-jaguarandi/intern/audaspace/SDL/Makefile branches/soc-2009-jaguarandi/intern/audaspace/SRC/ branches/soc-2009-jaguarandi/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/SRC/AUD_SRCResampleFactory.h branches/soc-2009-jaguarandi/intern/audaspace/SRC/AUD_SRCResampleReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/SRC/AUD_SRCResampleReader.h branches/soc-2009-jaguarandi/intern/audaspace/SRC/Makefile branches/soc-2009-jaguarandi/intern/audaspace/ffmpeg/ branches/soc-2009-jaguarandi/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h branches/soc-2009-jaguarandi/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h branches/soc-2009-jaguarandi/intern/audaspace/ffmpeg/Makefile branches/soc-2009-jaguarandi/intern/audaspace/intern/ branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_Buffer.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_Buffer.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_BufferReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_BufferReader.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_C-API.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_C-API.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ChannelMapperFactory.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ChannelMapperReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ChannelMapperReader.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ConverterFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ConverterFactory.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ConverterFunctions.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ConverterFunctions.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ConverterReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ConverterReader.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_FloatMixer.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_FloatMixer.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_I3DDevice.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_IDevice.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_IFactory.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_IMixer.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_IReader.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_MixerFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_MixerFactory.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_NULLDevice.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_NULLDevice.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ReadDevice.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ReadDevice.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_Reference.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_ResampleFactory.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_SinusFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_SinusFactory.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_SinusReader.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_SinusReader.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_SoftwareDevice.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_SoftwareDevice.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_SourceCaps.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_Space.h branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_StreamBufferFactory.cpp branches/soc-2009-jaguarandi/intern/audaspace/intern/AUD_StreamBufferFactory.h branches/soc-2009-jaguarandi/intern/audaspace/intern/Makefile branches/soc-2009-jaguarandi/intern/audaspace/make/ branches/soc-2009-jaguarandi/intern/audaspace/make/msvc_9_0/ branches/soc-2009-jaguarandi/intern/audaspace/make/msvc_9_0/audaspace.vcproj branches/soc-2009-jaguarandi/release/windows/extra/Python24.zip branches/soc-2009-jaguarandi/release/windows/extra/python25.zip branches/soc-2009-jaguarandi/release/windows/extra/python26.zip branches/soc-2009-jaguarandi/release/windows/extra/python30.zip branches/soc-2009-jaguarandi/release/windows/extra/python31.zip branches/soc-2009-jaguarandi/release/windows/extra/zlib.pyd branches/soc-2009-jaguarandi/source/blender/python/intern/bpy_compat.h branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_CDActuator.cpp branches/soc-2009-jaguarandi/source/gameengine/Ketsji/KX_CDActuator.h Modified: branches/soc-2009-jaguarandi/CMake/macros.cmake =================================================================== --- branches/soc-2009-jaguarandi/CMake/macros.cmake 2009-08-11 12:01:36 UTC (rev 22368) +++ branches/soc-2009-jaguarandi/CMake/macros.cmake 2009-08-11 12:55:50 UTC (rev 22369) @@ -43,13 +43,16 @@ CMAKE_POLICY(SET CMP0003 NEW) endif(COMMAND cmake_policy) LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH}) - LINK_DIRECTORIES(${FREETYPE_LIBPATH}) + LINK_DIRECTORIES(${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH}) IF(WITH_INTERNATIONAL) LINK_DIRECTORIES(${GETTEXT_LIBPATH}) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENAL) LINK_DIRECTORIES(${OPENAL_LIBPATH}) ENDIF(WITH_OPENAL) + IF(WITH_FFTW3) + LINK_DIRECTORIES(${FFTW3_LIBPATH}) + ENDIF(WITH_FFTW3) IF(WIN32) LINK_DIRECTORIES(${PTHREADS_LIBPATH}) @@ -61,7 +64,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINKFLAGS} ") #TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS}) - TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIB} ${LLIBS}) + TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${FFTW3_LIB} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${SDL_LIB} ${LLIBS}) # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions @@ -79,7 +82,7 @@ TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS}) - TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB}) + TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB} ${LIBSAMPLERATE_LIB}) # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions Modified: branches/soc-2009-jaguarandi/CMakeLists.txt =================================================================== --- branches/soc-2009-jaguarandi/CMakeLists.txt 2009-08-11 12:01:36 UTC (rev 22368) +++ branches/soc-2009-jaguarandi/CMakeLists.txt 2009-08-11 12:55:50 UTC (rev 22369) @@ -68,6 +68,7 @@ OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON) OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF) OPTION(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF) +OPTION(WITH_FFTW3 "Enable FFTW3 support" OFF) IF(NOT WITH_GAMEENGINE AND WITH_PLAYER) MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE") @@ -156,7 +157,19 @@ SET(FFMPEG_INC ${FFMPEG}/include) SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale) SET(FFMPEG_LIBPATH ${FFMPEG}/lib) + + IF(WITH_FFTW3) + SET(FFTW3 /usr) + SET(FFTW3_INC ${FFTW3}/include) + SET(FFTW3_LIB fftw3) + SET(FFTW3_LIBPATH ${FFTW3}/lib) + ENDIF(WITH_FFTW3) + SET(LIBSAMPLERATE /usr) + SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include) + SET(LIBSAMPLERATE_LIB samplerate) + SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib) + FIND_PACKAGE(JPEG REQUIRED) FIND_PACKAGE(PNG REQUIRED) @@ -196,20 +209,20 @@ ENDIF(CMAKE_CL_64) SET(PYTHON ${LIBDIR}/python) - SET(PYTHON_VERSION 2.6) + SET(PYTHON_VERSION 3.1) SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}") SET(PYTHON_BINARY python) - SET(PYTHON_LIB python26) + SET(PYTHON_LIB python31) SET(PYTHON_LIBPATH ${PYTHON}/lib) IF(CMAKE_CL_64) SET(WITH_OPENAL OFF) ELSE(CMAKE_CL_64) - #SET(WITH_OPENAL ON) - SET(OPENAL ${LIBDIR}/openal) - SET(OPENAL_INC ${OPENAL}/include ${OPENAL}/include/AL) - SET(OPENAL_LIB openal_static) - SET(OPENAL_LIBPATH ${OPENAL}/lib) + #SET(WITH_OPENAL ON) + SET(OPENAL ${LIBDIR}/openal) + SET(OPENAL_INC ${OPENAL}/include) + SET(OPENAL_LIB wrap_oal) + SET(OPENAL_LIBPATH ${OPENAL}/lib) ENDIF(CMAKE_CL_64) IF(CMAKE_CL_64) @@ -234,6 +247,13 @@ SET(ICONV_LIB iconv) SET(ICONV_LIBPATH ${ICONV}/lib) + IF(WITH_FFTW3) + SET(FFTW3 ${LIBDIR}/fftw3) + SET(FFTW3_INC ${FFTW3}/include) + SET(FFTW3_LIB libfftw) + SET(FFTW3_LIBPATH ${FFTW3}/lib) + ENDIF(WITH_FFTW3) + SET(GETTEXT ${LIBDIR}/gettext) SET(GETTEXT_INC ${GETTEXT}/include) IF(CMAKE_CL_64) @@ -271,15 +291,16 @@ SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0) SET(FFMPEG_LIBPATH ${FFMPEG}/lib) + SET(LIBSAMPLERATE ${LIBDIR}/samplerate) + SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include) + SET(LIBSAMPLERATE_LIB libsamplerate) + SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib) + IF(CMAKE_CL_64) SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 ) ELSE(CMAKE_CL_64) SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm) ENDIF(CMAKE_CL_64) - - IF(WITH_OPENAL) - SET(LLIBS ${LLIBS} dxguid) - ENDIF(WITH_OPENAL) SET(CMAKE_CXX_FLAGS_DEBUG "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE) SET(CMAKE_CXX_FLAGS_RELEASE "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305 /O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE) @@ -367,6 +388,13 @@ SET(GETTEXT_INC "${GETTEXT}/include") SET(GETTEXT_LIB intl iconv) SET(GETTEXT_LIBPATH ${GETTEXT}/lib) + + IF(WITH_FFTW3) + SET(FFTW3 ${LIBDIR}/fftw3) + SET(FFTW3_INC ${FFTW3}/include) + SET(FFTW3_LIB libfftw) + SET(FFTW3_LIBPATH ${FFTW3}/lib) + ENDIF(WITH_FFTW3) SET(PNG_LIBRARIES png) SET(JPEG_LIBRARY jpeg) @@ -385,6 +413,16 @@ SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread) SET(OPENEXR_LIBPATH ${OPENEXR}/lib) + SET(FFMPEG ${LIBDIR}/ffmpeg) + SET(FFMPEG_INC ${CMAKE_SOURCE_DIR}/extern/ffmpeg) + SET(FFMPEG_LIB avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore) + SET(FFMPEG_LIBPATH ${FFMPEG}/lib) + + SET(LIBSAMPLERATE ${LIBDIR}/samplerate) + SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include) + SET(LIBSAMPLERATE_LIB libsamplerate) + SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib) + SET(LLIBS stdc++ SystemStubs) SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing") Modified: branches/soc-2009-jaguarandi/SConstruct =================================================================== --- branches/soc-2009-jaguarandi/SConstruct 2009-08-11 12:01:36 UTC (rev 22368) +++ branches/soc-2009-jaguarandi/SConstruct 2009-08-11 12:55:50 UTC (rev 22369) @@ -31,6 +31,7 @@ import platform as pltfrm +# Need a better way to do this. Automagical maybe is not the best thing, maybe it is. if pltfrm.architecture()[0] == '64bit': bitness = 64 else: @@ -573,8 +574,8 @@ if env['WITH_BF_PYTHON']: ver = env["BF_PYTHON_VERSION"].replace(".", "") - dllsources.append('#release/windows/extra/python' + ver + '.zip') - dllsources.append('#release/windows/extra/zlib.pyd') + dllsources.append('${LCGDIR}/release/python' + ver + '.zip') + dllsources.append('${LCGDIR}/release/zlib.pyd') if env['BF_DEBUG']: dllsources.append('${BF_PYTHON_LIBPATH}/${BF_PYTHON_LIB}_d.dll') else: @@ -584,6 +585,9 @@ pass # we link statically to iconv on win64 else: dllsources += ['${BF_ICONV_LIBPATH}/iconv.dll'] + if env['WITH_BF_OPENAL']: + dllsources.append('${LCGDIR}/openal/lib/OpenAL32.dll') + dllsources.append('${LCGDIR}/openal/lib/wrap_oal.dll') if env['WITH_BF_FFMPEG']: dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-52.dll', '${LCGDIR}/ffmpeg/lib/avformat-52.dll', Modified: branches/soc-2009-jaguarandi/blenderplayer/CMakeLists.txt =================================================================== --- branches/soc-2009-jaguarandi/blenderplayer/CMakeLists.txt 2009-08-11 12:01:36 UTC (rev 22368) +++ branches/soc-2009-jaguarandi/blenderplayer/CMakeLists.txt 2009-08-11 12:55:50 UTC (rev 22369) @@ -87,7 +87,6 @@ bf_scenegraph bf_IK bf_moto - bf_soundsystem bf_kernel bf_nodes bf_gpu Modified: branches/soc-2009-jaguarandi/config/darwin-config.py =================================================================== --- branches/soc-2009-jaguarandi/config/darwin-config.py 2009-08-11 12:01:36 UTC (rev 22368) +++ branches/soc-2009-jaguarandi/config/darwin-config.py 2009-08-11 12:55:50 UTC (rev 22369) @@ -27,28 +27,34 @@ LCGDIR = '#../lib/darwin-8.x.i386' LIBDIR = '${LCGDIR}' +BF_PYTHON_VERSION = '3.1' + if MAC_PROC== 'powerpc' and BF_PYTHON_VERSION == '2.3': MAC_MIN_VERS = '10.3' MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk' -elif MAC_CUR_VER=='10.4': +else: 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 WITH_BF_FFMPEG = True # -DWITH_FFMPEG -BF_FFMPEG = "#extern/ffmpeg" -BF_FFMPEG_INC = '${BF_FFMPEG}' -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' +FFMPEG_PRECOMPILED = False +if FFMPEG_PRECOMPILED: + # use precompiled ffmpeg in /lib + BF_FFMPEG = LIBDIR + '/ffmpeg' + BF_FFMPEG_INC = "#extern/ffmpeg" + BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib' + BF_FFMPEG_LIB = 'avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore' +else: + # use ffmpeg in extern + BF_FFMPEG = "#extern/ffmpeg" + BF_FFMPEG_INC = '${BF_FFMPEG}' + if USE_SDK==True: + BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS + BF_XVIDCORE_CONFIG = '--disable-assembly' # currently causes errors, even with yasm installed + BF_X264_CONFIG = '--disable-pthread' -BF_PYTHON_VERSION = '3.1' - if BF_PYTHON_VERSION=='3.1': # python 3.1 uses precompiled libraries in bf svn /lib by default @@ -80,11 +86,6 @@ BF_QUIET = '1' WITH_BF_OPENMP = '0' -# Note : should be true, but openal simply dont work on intel -if MAC_PROC == 'i386': - WITH_BF_OPENAL = False -else: - WITH_BF_OPENAL = True #different lib must be used following version of gcc # for gcc 3.3 #BF_OPENAL = LIBDIR + '/openal' @@ -106,6 +107,11 @@ WITH_BF_STATICCXX = False @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs