[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22841] branches/itasc: svn merge -r 22652 :22840 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/ blender

Benoit Bolsee benoit.bolsee at online.be
Fri Aug 28 16:15:44 CEST 2009


Revision: 22841
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22841
Author:   ben2610
Date:     2009-08-28 16:15:43 +0200 (Fri, 28 Aug 2009)

Log Message:
-----------
svn merge -r 22652:22840 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender

Modified Paths:
--------------
    branches/itasc/CMake/macros.cmake
    branches/itasc/CMakeLists.txt
    branches/itasc/SConstruct
    branches/itasc/config/darwin-config.py
    branches/itasc/config/linux2-config.py
    branches/itasc/config/win32-mingw-config.py
    branches/itasc/config/win32-vc-config.py
    branches/itasc/extern/Makefile
    branches/itasc/extern/lzo/minilzo/Makefile
    branches/itasc/intern/audaspace/CMakeLists.txt
    branches/itasc/intern/audaspace/Makefile
    branches/itasc/intern/audaspace/SConscript
    branches/itasc/intern/audaspace/SDL/Makefile
    branches/itasc/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
    branches/itasc/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
    branches/itasc/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/itasc/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
    branches/itasc/intern/audaspace/ffmpeg/Makefile
    branches/itasc/intern/audaspace/intern/AUD_C-API.cpp
    branches/itasc/intern/audaspace/intern/Makefile
    branches/itasc/intern/audaspace/jack/AUD_JackDevice.cpp
    branches/itasc/intern/audaspace/jack/AUD_JackDevice.h
    branches/itasc/intern/audaspace/jack/Makefile
    branches/itasc/intern/audaspace/make/msvc_9_0/audaspace.vcproj
    branches/itasc/intern/smoke/extern/smoke_API.h
    branches/itasc/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
    branches/itasc/projectfiles_vc9/blender/blender.vcproj
    branches/itasc/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/itasc/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
    branches/itasc/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/itasc/projectfiles_vc9/blender/imbuf/BL_imbuf.vcproj
    branches/itasc/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/itasc/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/itasc/projectfiles_vc9/blender/render/BRE_render.vcproj
    branches/itasc/projectfiles_vc9/gameengine/videotexture/TEX_Video.vcproj
    branches/itasc/release/io/engine_render_pov.py
    branches/itasc/release/scripts/bpymodules/colladaImEx/collada.py
    branches/itasc/release/scripts/bpymodules/colladaImEx/cstartup.py
    branches/itasc/release/scripts/bpymodules/colladaImEx/translator.py
    branches/itasc/release/ui/buttons_data_armature.py
    branches/itasc/release/ui/buttons_data_bone.py
    branches/itasc/release/ui/buttons_data_camera.py
    branches/itasc/release/ui/buttons_data_curve.py
    branches/itasc/release/ui/buttons_data_empty.py
    branches/itasc/release/ui/buttons_data_lamp.py
    branches/itasc/release/ui/buttons_data_lattice.py
    branches/itasc/release/ui/buttons_data_mesh.py
    branches/itasc/release/ui/buttons_data_metaball.py
    branches/itasc/release/ui/buttons_data_modifier.py
    branches/itasc/release/ui/buttons_data_text.py
    branches/itasc/release/ui/buttons_game.py
    branches/itasc/release/ui/buttons_material.py
    branches/itasc/release/ui/buttons_object.py
    branches/itasc/release/ui/buttons_object_constraint.py
    branches/itasc/release/ui/buttons_particle.py
    branches/itasc/release/ui/buttons_physics_cloth.py
    branches/itasc/release/ui/buttons_physics_field.py
    branches/itasc/release/ui/buttons_physics_fluid.py
    branches/itasc/release/ui/buttons_physics_smoke.py
    branches/itasc/release/ui/buttons_physics_softbody.py
    branches/itasc/release/ui/buttons_scene.py
    branches/itasc/release/ui/buttons_texture.py
    branches/itasc/release/ui/buttons_world.py
    branches/itasc/release/ui/space_buttons.py
    branches/itasc/release/ui/space_console.py
    branches/itasc/release/ui/space_filebrowser.py
    branches/itasc/release/ui/space_image.py
    branches/itasc/release/ui/space_info.py
    branches/itasc/release/ui/space_logic.py
    branches/itasc/release/ui/space_node.py
    branches/itasc/release/ui/space_outliner.py
    branches/itasc/release/ui/space_sequencer.py
    branches/itasc/release/ui/space_text.py
    branches/itasc/release/ui/space_time.py
    branches/itasc/release/ui/space_userpref.py
    branches/itasc/release/ui/space_view3d.py
    branches/itasc/release/ui/space_view3d_toolbar.py
    branches/itasc/source/Makefile
    branches/itasc/source/blender/blenfont/intern/blf_font.c
    branches/itasc/source/blender/blenkernel/BKE_action.h
    branches/itasc/source/blender/blenkernel/BKE_brush.h
    branches/itasc/source/blender/blenkernel/BKE_modifier.h
    branches/itasc/source/blender/blenkernel/BKE_multires.h
    branches/itasc/source/blender/blenkernel/BKE_object.h
    branches/itasc/source/blender/blenkernel/BKE_paint.h
    branches/itasc/source/blender/blenkernel/BKE_smoke.h
    branches/itasc/source/blender/blenkernel/BKE_sound.h
    branches/itasc/source/blender/blenkernel/BKE_texture.h
    branches/itasc/source/blender/blenkernel/intern/Makefile
    branches/itasc/source/blender/blenkernel/intern/action.c
    branches/itasc/source/blender/blenkernel/intern/anim_sys.c
    branches/itasc/source/blender/blenkernel/intern/blender.c
    branches/itasc/source/blender/blenkernel/intern/boids.c
    branches/itasc/source/blender/blenkernel/intern/brush.c
    branches/itasc/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/itasc/source/blender/blenkernel/intern/fcurve.c
    branches/itasc/source/blender/blenkernel/intern/material.c
    branches/itasc/source/blender/blenkernel/intern/modifier.c
    branches/itasc/source/blender/blenkernel/intern/multires.c
    branches/itasc/source/blender/blenkernel/intern/nla.c
    branches/itasc/source/blender/blenkernel/intern/object.c
    branches/itasc/source/blender/blenkernel/intern/packedFile.c
    branches/itasc/source/blender/blenkernel/intern/paint.c
    branches/itasc/source/blender/blenkernel/intern/particle_system.c
    branches/itasc/source/blender/blenkernel/intern/pointcache.c
    branches/itasc/source/blender/blenkernel/intern/scene.c
    branches/itasc/source/blender/blenkernel/intern/sequence.c
    branches/itasc/source/blender/blenkernel/intern/smoke.c
    branches/itasc/source/blender/blenkernel/intern/softbody.c
    branches/itasc/source/blender/blenkernel/intern/sound.c
    branches/itasc/source/blender/blenkernel/intern/texture.c
    branches/itasc/source/blender/blenlib/BLI_arithb.h
    branches/itasc/source/blender/blenlib/BLI_kdopbvh.h
    branches/itasc/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/itasc/source/blender/blenlib/intern/arithb.c
    branches/itasc/source/blender/blenloader/intern/readblenentry.c
    branches/itasc/source/blender/blenloader/intern/readfile.c
    branches/itasc/source/blender/blenloader/intern/readfile.h
    branches/itasc/source/blender/blenloader/intern/writefile.c
    branches/itasc/source/blender/editors/SConscript
    branches/itasc/source/blender/editors/animation/anim_channels_defines.c
    branches/itasc/source/blender/editors/animation/anim_filter.c
    branches/itasc/source/blender/editors/animation/anim_ipo_utils.c
    branches/itasc/source/blender/editors/animation/anim_ops.c
    branches/itasc/source/blender/editors/animation/drivers.c
    branches/itasc/source/blender/editors/animation/fmodifier_ui.c
    branches/itasc/source/blender/editors/animation/keyframes_general.c
    branches/itasc/source/blender/editors/animation/keyframing.c
    branches/itasc/source/blender/editors/animation/keyingsets.c
    branches/itasc/source/blender/editors/curve/curve_ops.c
    branches/itasc/source/blender/editors/gpencil/drawgpencil.c
    branches/itasc/source/blender/editors/gpencil/gpencil_edit.c
    branches/itasc/source/blender/editors/gpencil/gpencil_intern.h
    branches/itasc/source/blender/editors/include/ED_fileselect.h
    branches/itasc/source/blender/editors/include/ED_gpencil.h
    branches/itasc/source/blender/editors/include/ED_keyframing.h
    branches/itasc/source/blender/editors/include/ED_screen.h
    branches/itasc/source/blender/editors/include/UI_interface.h
    branches/itasc/source/blender/editors/interface/interface.c
    branches/itasc/source/blender/editors/interface/interface_anim.c
    branches/itasc/source/blender/editors/interface/interface_handlers.c
    branches/itasc/source/blender/editors/interface/interface_intern.h
    branches/itasc/source/blender/editors/interface/interface_layout.c
    branches/itasc/source/blender/editors/interface/interface_regions.c
    branches/itasc/source/blender/editors/interface/interface_templates.c
    branches/itasc/source/blender/editors/interface/interface_utils.c
    branches/itasc/source/blender/editors/interface/interface_widgets.c
    branches/itasc/source/blender/editors/interface/resources.c
    branches/itasc/source/blender/editors/mesh/editmesh_mods.c
    branches/itasc/source/blender/editors/object/object_edit.c
    branches/itasc/source/blender/editors/object/object_intern.h
    branches/itasc/source/blender/editors/object/object_modifier.c
    branches/itasc/source/blender/editors/object/object_ops.c
    branches/itasc/source/blender/editors/object/object_vgroup.c
    branches/itasc/source/blender/editors/preview/previewrender.c
    branches/itasc/source/blender/editors/screen/area.c
    branches/itasc/source/blender/editors/screen/screen_ops.c
    branches/itasc/source/blender/editors/sculpt_paint/paint_image.c
    branches/itasc/source/blender/editors/sculpt_paint/paint_intern.h
    branches/itasc/source/blender/editors/sculpt_paint/paint_ops.c
    branches/itasc/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/itasc/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/itasc/source/blender/editors/sculpt_paint/sculpt.c
    branches/itasc/source/blender/editors/space_action/action_draw.c
    branches/itasc/source/blender/editors/space_action/action_header.c
    branches/itasc/source/blender/editors/space_action/space_action.c
    branches/itasc/source/blender/editors/space_api/spacetypes.c
    branches/itasc/source/blender/editors/space_buttons/buttons_context.c
    branches/itasc/source/blender/editors/space_console/console_ops.c
    branches/itasc/source/blender/editors/space_console/console_report.c
    branches/itasc/source/blender/editors/space_file/file_draw.c
    branches/itasc/source/blender/editors/space_file/file_panels.c
    branches/itasc/source/blender/editors/space_file/filesel.c
    branches/itasc/source/blender/editors/space_file/space_file.c
    branches/itasc/source/blender/editors/space_graph/graph_header.c
    branches/itasc/source/blender/editors/space_image/image_ops.c
    branches/itasc/source/blender/editors/space_logic/logic_window.c
    branches/itasc/source/blender/editors/space_nla/nla_buttons.c
    branches/itasc/source/blender/editors/space_nla/nla_channels.c
    branches/itasc/source/blender/editors/space_nla/nla_edit.c
    branches/itasc/source/blender/editors/space_nla/nla_header.c
    branches/itasc/source/blender/editors/space_node/drawnode.c
    branches/itasc/source/blender/editors/space_outliner/outliner.c
    branches/itasc/source/blender/editors/space_sequencer/sequencer_add.c
    branches/itasc/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/itasc/source/blender/editors/space_text/space_text.c
    branches/itasc/source/blender/editors/space_text/text_header.c
    branches/itasc/source/blender/editors/space_text/text_ops.c
    branches/itasc/source/blender/editors/space_time/space_time.c
    branches/itasc/source/blender/editors/space_view3d/drawobject.c
    branches/itasc/source/blender/editors/space_view3d/drawvolume.c
    branches/itasc/source/blender/editors/space_view3d/space_view3d.c
    branches/itasc/source/blender/editors/space_view3d/view3d_draw.c
    branches/itasc/source/blender/editors/space_view3d/view3d_edit.c
    branches/itasc/source/blender/editors/space_view3d/view3d_header.c
    branches/itasc/source/blender/editors/space_view3d/view3d_ops.c
    branches/itasc/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/itasc/source/blender/editors/space_view3d/view3d_view.c
    branches/itasc/source/blender/editors/transform/transform_conversions.c
    branches/itasc/source/blender/editors/transform/transform_generics.c
    branches/itasc/source/blender/editors/transform/transform_ops.c
    branches/itasc/source/blender/editors/util/undo.c
    branches/itasc/source/blender/gpu/intern/gpu_extensions.c
    branches/itasc/source/blender/imbuf/intern/openexr/Makefile
    branches/itasc/source/blender/imbuf/intern/openexr/SConscript
    branches/itasc/source/blender/imbuf/intern/openexr/openexr_api.cpp
    branches/itasc/source/blender/makesdna/DNA_brush_types.h
    branches/itasc/source/blender/makesdna/DNA_gpencil_types.h
    branches/itasc/source/blender/makesdna/DNA_material_types.h
    branches/itasc/source/blender/makesdna/DNA_modifier_types.h
    branches/itasc/source/blender/makesdna/DNA_object_types.h
    branches/itasc/source/blender/makesdna/DNA_scene_types.h
    branches/itasc/source/blender/makesdna/DNA_sensor_types.h
    branches/itasc/source/blender/makesdna/DNA_smoke_types.h
    branches/itasc/source/blender/makesdna/DNA_sound_types.h
    branches/itasc/source/blender/makesdna/DNA_space_types.h
    branches/itasc/source/blender/makesdna/DNA_texture_types.h
    branches/itasc/source/blender/makesdna/DNA_userdef_types.h
    branches/itasc/source/blender/makesrna/RNA_access.h
    branches/itasc/source/blender/makesrna/RNA_define.h
    branches/itasc/source/blender/makesrna/RNA_enum_types.h
    branches/itasc/source/blender/makesrna/RNA_types.h
    branches/itasc/source/blender/makesrna/intern/makesrna.c
    branches/itasc/source/blender/makesrna/intern/rna_ID.c
    branches/itasc/source/blender/makesrna/intern/rna_access.c
    branches/itasc/source/blender/makesrna/intern/rna_action.c
    branches/itasc/source/blender/makesrna/intern/rna_animation.c
    branches/itasc/source/blender/makesrna/intern/rna_brush.c
    branches/itasc/source/blender/makesrna/intern/rna_define.c
    branches/itasc/source/blender/makesrna/intern/rna_internal.h
    branches/itasc/source/blender/makesrna/intern/rna_internal_types.h
    branches/itasc/source/blender/makesrna/intern/rna_main.c
    branches/itasc/source/blender/makesrna/intern/rna_material.c
    branches/itasc/source/blender/makesrna/intern/rna_mesh.c
    branches/itasc/source/blender/makesrna/intern/rna_modifier.c
    branches/itasc/source/blender/makesrna/intern/rna_object.c
    branches/itasc/source/blender/makesrna/intern/rna_pose.c
    branches/itasc/source/blender/makesrna/intern/rna_scene.c
    branches/itasc/source/blender/makesrna/intern/rna_sequence.c
    branches/itasc/source/blender/makesrna/intern/rna_smoke.c
    branches/itasc/source/blender/makesrna/intern/rna_sound.c
    branches/itasc/source/blender/makesrna/intern/rna_space.c
    branches/itasc/source/blender/makesrna/intern/rna_texture.c
    branches/itasc/source/blender/makesrna/intern/rna_ui_api.c
    branches/itasc/source/blender/makesrna/intern/rna_userdef.c
    branches/itasc/source/blender/python/generic/bpy_internal_import.h
    branches/itasc/source/blender/python/generic/vector.c
    branches/itasc/source/blender/python/intern/bpy_interface.c
    branches/itasc/source/blender/python/intern/bpy_rna.c
    branches/itasc/source/blender/python/intern/bpy_rna.h
    branches/itasc/source/blender/render/CMakeLists.txt
    branches/itasc/source/blender/render/SConscript
    branches/itasc/source/blender/render/extern/include/RE_shader_ext.h
    branches/itasc/source/blender/render/intern/include/render_types.h
    branches/itasc/source/blender/render/intern/include/shading.h
    branches/itasc/source/blender/render/intern/include/texture.h
    branches/itasc/source/blender/render/intern/source/Makefile
    branches/itasc/source/blender/render/intern/source/convertblender.c
    branches/itasc/source/blender/render/intern/source/occlusion.c
    branches/itasc/source/blender/render/intern/source/rayshade.c
    branches/itasc/source/blender/render/intern/source/raytrace.c
    branches/itasc/source/blender/render/intern/source/shadeinput.c
    branches/itasc/source/blender/render/intern/source/shadeoutput.c
    branches/itasc/source/blender/render/intern/source/texture.c
    branches/itasc/source/blender/windowmanager/WM_types.h
    branches/itasc/source/blender/windowmanager/intern/Makefile
    branches/itasc/source/blender/windowmanager/intern/wm_operators.c
    branches/itasc/source/blender/windowmanager/intern/wm_window.c
    branches/itasc/source/creator/CMakeLists.txt
    branches/itasc/source/creator/creator.c
    branches/itasc/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/itasc/source/gameengine/Converter/BL_ActionActuator.h
    branches/itasc/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/itasc/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    branches/itasc/source/gameengine/Converter/BL_ShapeActionActuator.h
    branches/itasc/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/itasc/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/itasc/source/gameengine/Converter/KX_ConvertSensors.cpp
    branches/itasc/source/gameengine/Expressions/ListValue.cpp
    branches/itasc/source/gameengine/Expressions/ListValue.h
    branches/itasc/source/gameengine/Expressions/PyObjectPlus.cpp
    branches/itasc/source/gameengine/Expressions/PyObjectPlus.h
    branches/itasc/source/gameengine/Expressions/Value.cpp
    branches/itasc/source/gameengine/Expressions/Value.h
    branches/itasc/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_ActuatorSensor.h
    branches/itasc/source/gameengine/GameLogic/SCA_DelaySensor.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_DelaySensor.h
    branches/itasc/source/gameengine/GameLogic/SCA_IController.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_IController.h
    branches/itasc/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_ILogicBrick.h
    branches/itasc/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_ISensor.h
    branches/itasc/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_JoystickSensor.h
    branches/itasc/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_KeyboardSensor.h
    branches/itasc/source/gameengine/GameLogic/SCA_MouseSensor.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_MouseSensor.h
    branches/itasc/source/gameengine/GameLogic/SCA_PropertyActuator.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_PropertyActuator.h
    branches/itasc/source/gameengine/GameLogic/SCA_PropertyEventManager.h
    branches/itasc/source/gameengine/GameLogic/SCA_PropertySensor.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_PropertySensor.h
    branches/itasc/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_RandomActuator.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_RandomActuator.h
    branches/itasc/source/gameengine/GameLogic/SCA_RandomSensor.cpp
    branches/itasc/source/gameengine/GameLogic/SCA_RandomSensor.h
    branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.h
    branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
    branches/itasc/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.h
    branches/itasc/source/gameengine/Ketsji/KX_Camera.cpp
    branches/itasc/source/gameengine/Ketsji/KX_Camera.h
    branches/itasc/source/gameengine/Ketsji/KX_CameraActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_CameraActuator.h
    branches/itasc/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_ConstraintActuator.h
    branches/itasc/source/gameengine/Ketsji/KX_GameActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_GameActuator.h
    branches/itasc/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/itasc/source/gameengine/Ketsji/KX_GameObject.h
    branches/itasc/source/gameengine/Ketsji/KX_IpoActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_IpoActuator.h
    branches/itasc/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/itasc/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/itasc/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
    branches/itasc/source/gameengine/Ketsji/KX_MouseFocusSensor.h
    branches/itasc/source/gameengine/Ketsji/KX_ObjectActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_ObjectActuator.h
    branches/itasc/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/itasc/source/gameengine/Ketsji/KX_PyMath.cpp
    branches/itasc/source/gameengine/Ketsji/KX_PyMath.h
    branches/itasc/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/itasc/source/gameengine/Ketsji/KX_RadarSensor.cpp
    branches/itasc/source/gameengine/Ketsji/KX_RadarSensor.h
    branches/itasc/source/gameengine/Ketsji/KX_RaySensor.cpp
    branches/itasc/source/gameengine/Ketsji/KX_RaySensor.h
    branches/itasc/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
    branches/itasc/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
    branches/itasc/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
    branches/itasc/source/gameengine/Ketsji/KX_Scene.cpp
    branches/itasc/source/gameengine/Ketsji/KX_Scene.h
    branches/itasc/source/gameengine/Ketsji/KX_SceneActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_SceneActuator.h
    branches/itasc/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/itasc/source/gameengine/Ketsji/KX_StateActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_StateActuator.h
    branches/itasc/source/gameengine/Ketsji/KX_TouchSensor.cpp
    branches/itasc/source/gameengine/Ketsji/KX_TouchSensor.h
    branches/itasc/source/gameengine/Ketsji/KX_TrackToActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_TrackToActuator.h
    branches/itasc/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
    branches/itasc/source/gameengine/Ketsji/KX_VisibilityActuator.h
    branches/itasc/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
    branches/itasc/source/gameengine/PyDoc/GameTypes.py
    branches/itasc/source/gameengine/VideoTexture/Exception.cpp
    branches/itasc/source/nan_definitions.mk
    branches/itasc/tools/Blender.py
    branches/itasc/tools/btools.py

Added Paths:
-----------
    branches/itasc/extern/lzma/Makefile
    branches/itasc/extern/lzo/minilzo/Makefile.bak
    branches/itasc/intern/audaspace/OpenAL/Makefile
    branches/itasc/intern/audaspace/intern/AUD_FileFactory.cpp
    branches/itasc/intern/audaspace/intern/AUD_FileFactory.h
    branches/itasc/intern/audaspace/sndfile/
    branches/itasc/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
    branches/itasc/intern/audaspace/sndfile/AUD_SndFileFactory.h
    branches/itasc/intern/audaspace/sndfile/AUD_SndFileReader.cpp
    branches/itasc/intern/audaspace/sndfile/AUD_SndFileReader.h
    branches/itasc/intern/audaspace/sndfile/Makefile
    branches/itasc/release/datafiles/datatoc.py
    branches/itasc/source/blender/blenlib/BLI_voxel.h
    branches/itasc/source/blender/blenlib/intern/voxel.c
    branches/itasc/source/blender/editors/gpencil/gpencil_buttons.c
    branches/itasc/source/blender/editors/gpencil/gpencil_ops.c
    branches/itasc/source/blender/editors/gpencil/gpencil_paint.c
    branches/itasc/source/blender/editors/include/ED_sound.h
    branches/itasc/source/blender/editors/sound/
    branches/itasc/source/blender/editors/sound/SConscript
    branches/itasc/source/blender/editors/sound/sound_intern.h
    branches/itasc/source/blender/editors/sound/sound_ops.c
    branches/itasc/source/blender/makesrna/intern/rna_animation_api.c
    branches/itasc/source/blender/makesrna/intern/rna_gpencil.c
    branches/itasc/source/blender/makesrna/intern/rna_scene_api.c
    branches/itasc/source/blender/python/intern/bpy_array.c
    branches/itasc/source/blender/render/intern/include/pointdensity.h
    branches/itasc/source/blender/render/intern/include/volume_precache.h
    branches/itasc/source/blender/render/intern/include/volumetric.h
    branches/itasc/source/blender/render/intern/include/voxeldata.h
    branches/itasc/source/blender/render/intern/source/pointdensity.c
    branches/itasc/source/blender/render/intern/source/volume_precache.c
    branches/itasc/source/blender/render/intern/source/volumetric.c
    branches/itasc/source/blender/render/intern/source/voxeldata.c

Removed Paths:
-------------
    branches/itasc/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
    branches/itasc/intern/audaspace/sndfile/AUD_SndFileFactory.h
    branches/itasc/intern/audaspace/sndfile/AUD_SndFileReader.cpp
    branches/itasc/intern/audaspace/sndfile/AUD_SndFileReader.h
    branches/itasc/intern/audaspace/sndfile/Makefile
    branches/itasc/release/scripts/help_getting_started.py
    branches/itasc/release/scripts/help_manual.py
    branches/itasc/release/scripts/help_release_notes.py
    branches/itasc/release/scripts/help_tutorials.py
    branches/itasc/release/scripts/help_web_blender.py
    branches/itasc/release/scripts/help_web_devcomm.py
    branches/itasc/release/scripts/help_web_eshop.py
    branches/itasc/release/scripts/help_web_usercomm.py
    branches/itasc/source/blender/blenkernel/intern/smokehighres.c
    branches/itasc/source/blender/editors/sculpt_paint/sculpt_stroke.c
    branches/itasc/source/blender/editors/sound/SConscript
    branches/itasc/source/blender/editors/sound/sound_intern.h
    branches/itasc/source/blender/editors/sound/sound_ops.c

Modified: branches/itasc/CMake/macros.cmake
===================================================================
--- branches/itasc/CMake/macros.cmake	2009-08-28 13:42:58 UTC (rev 22840)
+++ branches/itasc/CMake/macros.cmake	2009-08-28 14:15:43 UTC (rev 22841)
@@ -70,6 +70,9 @@
   IF(WITH_JACK)
     LINK_DIRECTORIES(${JACK_LIBPATH})
   ENDIF(WITH_JACK)
+  IF(WITH_SNDFILE)
+    LINK_DIRECTORIES(${SNDFILE_LIBPATH})
+  ENDIF(WITH_SNDFILE)
   IF(WITH_FFTW3)
     LINK_DIRECTORIES(${FFTW3_LIBPATH})
   ENDIF(WITH_FFTW3)
@@ -118,6 +121,9 @@
   IF(WITH_JACK)
     TARGET_LINK_LIBRARIES(${target} ${JACK_LIB})
   ENDIF(WITH_JACK)
+  IF(WITH_SNDFILE)
+    TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB})
+  ENDIF(WITH_SNDFILE)
   IF(WITH_SDL)
     TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY})
   ENDIF(WITH_SDL)

Modified: branches/itasc/CMakeLists.txt
===================================================================
--- branches/itasc/CMakeLists.txt	2009-08-28 13:42:58 UTC (rev 22840)
+++ branches/itasc/CMakeLists.txt	2009-08-28 14:15:43 UTC (rev 22841)
@@ -70,7 +70,9 @@
 OPTION(WITH_WEBPLUGIN     "Enable Web Plugin (Unix only)" OFF)
 OPTION(WITH_FFTW3         "Enable FFTW3 support" OFF)
 OPTION(WITH_JACK          "Enable Jack Support (http://www.jackaudio.org)" OFF)
+OPTION(WITH_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
+# OPTION(WITH_BUILDINFO     "Include extra build details" ON)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
@@ -109,6 +111,13 @@
     SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
+  IF(WITH_SNDFILE)
+	SET(SNDFILE /usr)
+	SET(SNDFILE_INC ${SNDFILE}/include)
+	SET(SNDFILE_LIB sndfile)
+	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+  ENDIF(WITH_SNDFILE)
+
   FIND_LIBRARY(INTL_LIBRARY
     NAMES intl
     PATHS
@@ -204,7 +213,7 @@
   SET(PLATFORM_LINKFLAGS "-pthread")
 
   # Better warnings
-  SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wnested-externs -Wdeclaration-after-statement")
+  SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wdeclaration-after-statement")
   SET(CXX_WARNINGS "-Wall -Wno-invalid-offsetof -Wno-sign-compare")
 
   INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
@@ -242,11 +251,18 @@
 
   IF(WITH_JACK)
     SET(JACK ${LIBDIR}/jack)
-    SET(JACK_INC ${JACK}/include/jack)
-    SET(JACK_LIB jack)
+    SET(JACK_INC ${JACK}/include/jack ${JACK}/include)
+    SET(JACK_LIB libjack)
     SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
+  IF(WITH_SNDFILE)
+	SET(SNDFILE ${LIBDIR}/sndfile)
+	SET(SNDFILE_INC ${SNDFILE}/include)
+	SET(SNDFILE_LIB sndfile)
+	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+  ENDIF(WITH_SNDFILE)
+
   IF(CMAKE_CL_64)
     SET(PNG_LIBRARIES libpng)
   ELSE(CMAKE_CL_64)
@@ -392,6 +408,13 @@
     SET(JACK_LIBPATH ${JACK}/lib)
   ENDIF(WITH_JACK)
 
+  IF(WITH_SNDFILE)
+	SET(SNDFILE /usr)
+	SET(SNDFILE_INC ${SNDFILE}/include)
+	SET(SNDFILE_LIB sndfile)
+	SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
+  ENDIF(WITH_SNDFILE)
+
   SET(PYTHON_VERSION 3.1)
 
   IF(PYTHON_VERSION MATCHES 3.1)
@@ -489,6 +512,17 @@
   SET(BINRELOC_INC ${BINRELOC}/include)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
+
+# TODO - buildinfo
+# IF(UNIX)
+#   IF(WITH_BUILDINFO)
+#     EXEC_PROGRAM("date \"+%Y-%m-%d\"" OUTPUT_VARIABLE BUILD_DATE)
+#     EXEC_PROGRAM("date \"+%H:%M:%S\"" OUTPUT_VARIABLE BUILD_TIME)  
+#     EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV)
+#     SET(BUILD_TYPE ${CMAKE_BUILD_TYPE})
+#   ENDIF(WITH_BUILDINFO)
+# ENDIF(UNIX)
+
 #-----------------------------------------------------------------------------
 # Common.
 

Modified: branches/itasc/SConstruct
===================================================================
--- branches/itasc/SConstruct	2009-08-28 13:42:58 UTC (rev 22840)
+++ branches/itasc/SConstruct	2009-08-28 14:15:43 UTC (rev 22841)
@@ -580,11 +580,11 @@
 						'${LCGDIR}/ffmpeg/lib/avformat-52.dll',
 						'${LCGDIR}/ffmpeg/lib/avdevice-52.dll',
 						'${LCGDIR}/ffmpeg/lib/avutil-50.dll',
-						'${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
-						'${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
-						'${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
-						'${LCGDIR}/ffmpeg/lib/libx264-67.dll',
-						'${LCGDIR}/ffmpeg/lib/xvidcore.dll',
+#						'${LCGDIR}/ffmpeg/lib/libfaad-2.dll',
+#						'${LCGDIR}/ffmpeg/lib/libfaac-0.dll',
+#						'${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
+#						'${LCGDIR}/ffmpeg/lib/libx264-67.dll',
+#						'${LCGDIR}/ffmpeg/lib/xvidcore.dll',
 						'${LCGDIR}/ffmpeg/lib/swscale-0.dll']
 	if env['WITH_BF_JACK']:
 		dllsources += ['${LCGDIR}/jack/lib/libjack.dll']

Modified: branches/itasc/config/darwin-config.py
===================================================================
--- branches/itasc/config/darwin-config.py	2009-08-28 13:42:58 UTC (rev 22840)
+++ branches/itasc/config/darwin-config.py	2009-08-28 14:15:43 UTC (rev 22841)
@@ -1,10 +1,3 @@
-#
-# Note : if you want to alter this file
-# copy it as a whole in the upper folder
-# as user-config.py
-# dont create a new file with only some
-# vars changed.
-
 import commands
 
 # IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs
@@ -119,6 +112,12 @@
 BF_JACK_LIB = 'jack'
 BF_JACK_LIBPATH = '${BF_JACK}/lib'
 
+WITH_BF_SNDFILE = False
+BF_SNDFILE = LIBDIR + '/sndfile'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'sndfile'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)

Modified: branches/itasc/config/linux2-config.py
===================================================================
--- branches/itasc/config/linux2-config.py	2009-08-28 13:42:58 UTC (rev 22840)
+++ branches/itasc/config/linux2-config.py	2009-08-28 14:15:43 UTC (rev 22841)
@@ -33,6 +33,12 @@
 BF_JACK_LIB = 'jack'
 BF_JACK_LIBPATH = '${BF_JACK}/lib'
 
+WITH_BF_SNDFILE = False
+BF_SNDFILE = '/usr'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include/sndfile'
+BF_SNDFILE_LIB = 'sndfile'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = '/usr' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
@@ -85,23 +91,6 @@
 BF_BULLET_INC = '${BF_BULLET}'
 BF_BULLET_LIB = 'extern_bullet'
 
-#WITH_BF_NSPR = True
-#BF_NSPR = $(LIBDIR)/nspr
-#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
-#BF_NSPR_LIB = 
-
-# Uncomment the following line to use Mozilla inplace of netscape
-#CPPFLAGS += -DMOZ_NOT_NET
-# Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LIBDIR)/mozilla
-#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
-#BF_MOZILLA_LIB =
-# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
-# if this is not set.
-#
-# Be paranoid regarding library creation (do not update archives)
-#BF_PARANOID = True
-
 # enable freetype2 support for text objects
 BF_FREETYPE = '/usr'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
@@ -181,9 +170,10 @@
 ##ARFLAGSQUIET = ru
 ##
 C_WARN = ['-Wno-char-subscripts', '-Wdeclaration-after-statement']
-
 CC_WARN = ['-Wall']
+CXX_WARN = ['-Wno-invalid-offsetof', '-Wno-sign-compare']
 
+
 ##FIX_STUBS_WARNINGS = -Wno-unused
 
 LLIBS = ['util', 'c', 'm', 'dl', 'pthread', 'stdc++']

Modified: branches/itasc/config/win32-mingw-config.py
===================================================================
--- branches/itasc/config/win32-mingw-config.py	2009-08-28 13:42:58 UTC (rev 22840)
+++ branches/itasc/config/win32-mingw-config.py	2009-08-28 14:15:43 UTC (rev 22841)
@@ -3,14 +3,9 @@
 
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '3.1'
-#BF_PYTHON_VERSION = '2.6'
-#BF_PYTHON_VERSION = '2.6'
 WITH_BF_STATICPYTHON = False
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
-#BF_PYTHON_LIB = 'python25'
-#BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/lib25_vs2005'
-#BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/lib25_vs2005/libpython25.a'
 BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 BF_PYTHON_LIB_STATIC = '${BF_PYTHON}/lib/libpython${BF_PYTHON_VERSION[0]}${BF_PYTHON_VERSION[2]}.a'
@@ -22,9 +17,9 @@
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_FFMPEG = False
-BF_FFMPEG_LIB = 'avformat swscale avcodec avutil avdevice xvidcore x264'
-BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib'
-BF_FFMPEG_INC =  LIBDIR + '/gcc/ffmpeg/include'
+BF_FFMPEG_LIB = 'avformat-52 avcodec-52 avdevice-52 avutil-50 swscale-0'
+BF_FFMPEG_LIBPATH = LIBDIR + '/ffmpeg/lib'
+BF_FFMPEG_INC =  LIBDIR + '/ffmpeg/include'
 
 BF_LIBSAMPLERATE = LIBDIR + '/samplerate'
 BF_LIBSAMPLERATE_INC = '${BF_LIBSAMPLERATE}/include'
@@ -37,6 +32,12 @@
 BF_JACK_LIB = 'libjack'
 BF_JACK_LIBPATH = '${BF_JACK}/lib'
 
+WITH_BF_SNDFILE = False
+BF_SNDFILE = LIBDIR + '/sndfile'
+BF_SNDFILE_INC = '${BF_SNDFILE}/include'
+BF_SNDFILE_LIB = 'libsndfile'
+BF_SNDFILE_LIBPATH = '${BF_SNDFILE}/lib'
+
 WITH_BF_SDL = True
 BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
@@ -99,20 +100,6 @@
 BF_WINTAB = LIBDIR + '/wintab'
 BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
 
-#WITH_BF_NSPR = True
-#BF_NSPR = $(LIBDIR)/nspr
-#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
-#BF_NSPR_LIB = 
-
-# Uncomment the following line to use Mozilla inplace of netscape
-#CPPFLAGS += -DMOZ_NOT_NET
-# Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LIBDIR)/mozilla
-#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
-#BF_MOZILLA_LIB =
-# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
-# if this is not set.
-
 # enable freetype2 support for text objects
 BF_FREETYPE = LIBDIR + '/gcc/freetype'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'

Modified: branches/itasc/config/win32-vc-config.py
===================================================================
--- branches/itasc/config/win32-vc-config.py	2009-08-28 13:42:58 UTC (rev 22840)
+++ branches/itasc/config/win32-vc-config.py	2009-08-28 14:15:43 UTC (rev 22841)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list