[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21714] branches/soundsystem: svn merge with 2.5 branch from revision 21504 to 21713

Jörg Müller nexyon at gmail.com
Mon Jul 20 09:50:59 CEST 2009


Revision: 21714
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21714
Author:   nexyon
Date:     2009-07-20 09:50:57 +0200 (Mon, 20 Jul 2009)

Log Message:
-----------
svn merge with 2.5 branch from revision 21504 to 21713

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

Modified Paths:
--------------
    branches/soundsystem/blenderplayer/CMakeLists.txt
    branches/soundsystem/config/win32-mingw-config.py
    branches/soundsystem/config/win32-vc-config.py
    branches/soundsystem/config/win64-vc-config.py
    branches/soundsystem/extern/binreloc/CMakeLists.txt
    branches/soundsystem/extern/binreloc/Makefile
    branches/soundsystem/extern/bullet2/src/SConscript
    branches/soundsystem/extern/ffmpeg/SConscript
    branches/soundsystem/extern/libopenjpeg/SConscript
    branches/soundsystem/intern/elbeem/SConscript
    branches/soundsystem/projectfiles_vc9/blender/blender.vcproj
    branches/soundsystem/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/soundsystem/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soundsystem/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/soundsystem/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/soundsystem/release/datafiles/preview.blend
    branches/soundsystem/release/io/export_ply.py
    branches/soundsystem/release/ui/buttons_data_armature.py
    branches/soundsystem/release/ui/buttons_data_bone.py
    branches/soundsystem/release/ui/buttons_data_camera.py
    branches/soundsystem/release/ui/buttons_data_lattice.py
    branches/soundsystem/release/ui/buttons_data_mesh.py
    branches/soundsystem/release/ui/buttons_data_modifier.py
    branches/soundsystem/release/ui/buttons_material.py
    branches/soundsystem/release/ui/buttons_object_constraint.py
    branches/soundsystem/release/ui/buttons_objects.py
    branches/soundsystem/release/ui/buttons_particle.py
    branches/soundsystem/release/ui/buttons_physics_field.py
    branches/soundsystem/release/ui/buttons_physics_fluid.py
    branches/soundsystem/release/ui/buttons_physics_softbody.py
    branches/soundsystem/release/ui/buttons_scene.py
    branches/soundsystem/release/ui/buttons_texture.py
    branches/soundsystem/release/ui/buttons_world.py
    branches/soundsystem/release/ui/space_filebrowser.py
    branches/soundsystem/release/ui/space_image.py
    branches/soundsystem/release/ui/space_info.py
    branches/soundsystem/release/ui/space_outliner.py
    branches/soundsystem/release/ui/space_sequencer.py
    branches/soundsystem/release/ui/space_text.py
    branches/soundsystem/release/ui/space_view3d_toolbar.py
    branches/soundsystem/source/Makefile
    branches/soundsystem/source/blender/blenfont/BLF_api.h
    branches/soundsystem/source/blender/blenfont/intern/blf.c
    branches/soundsystem/source/blender/blenfont/intern/blf_font.c
    branches/soundsystem/source/blender/blenfont/intern/blf_glyph.c
    branches/soundsystem/source/blender/blenfont/intern/blf_internal.h
    branches/soundsystem/source/blender/blenfont/intern/blf_internal_types.h
    branches/soundsystem/source/blender/blenkernel/BKE_action.h
    branches/soundsystem/source/blender/blenkernel/BKE_animsys.h
    branches/soundsystem/source/blender/blenkernel/BKE_colortools.h
    branches/soundsystem/source/blender/blenkernel/BKE_context.h
    branches/soundsystem/source/blender/blenkernel/BKE_fcurve.h
    branches/soundsystem/source/blender/blenkernel/BKE_nla.h
    branches/soundsystem/source/blender/blenkernel/BKE_particle.h
    branches/soundsystem/source/blender/blenkernel/BKE_report.h
    branches/soundsystem/source/blender/blenkernel/BKE_utildefines.h
    branches/soundsystem/source/blender/blenkernel/BKE_writeffmpeg.h
    branches/soundsystem/source/blender/blenkernel/intern/action.c
    branches/soundsystem/source/blender/blenkernel/intern/anim_sys.c
    branches/soundsystem/source/blender/blenkernel/intern/armature.c
    branches/soundsystem/source/blender/blenkernel/intern/colortools.c
    branches/soundsystem/source/blender/blenkernel/intern/context.c
    branches/soundsystem/source/blender/blenkernel/intern/depsgraph.c
    branches/soundsystem/source/blender/blenkernel/intern/effect.c
    branches/soundsystem/source/blender/blenkernel/intern/exotic.c
    branches/soundsystem/source/blender/blenkernel/intern/fcurve.c
    branches/soundsystem/source/blender/blenkernel/intern/fluidsim.c
    branches/soundsystem/source/blender/blenkernel/intern/image.c
    branches/soundsystem/source/blender/blenkernel/intern/ipo.c
    branches/soundsystem/source/blender/blenkernel/intern/material.c
    branches/soundsystem/source/blender/blenkernel/intern/modifier.c
    branches/soundsystem/source/blender/blenkernel/intern/multires.c
    branches/soundsystem/source/blender/blenkernel/intern/nla.c
    branches/soundsystem/source/blender/blenkernel/intern/object.c
    branches/soundsystem/source/blender/blenkernel/intern/particle.c
    branches/soundsystem/source/blender/blenkernel/intern/particle_system.c
    branches/soundsystem/source/blender/blenkernel/intern/pointcache.c
    branches/soundsystem/source/blender/blenkernel/intern/report.c
    branches/soundsystem/source/blender/blenkernel/intern/scene.c
    branches/soundsystem/source/blender/blenkernel/intern/sequence.c
    branches/soundsystem/source/blender/blenkernel/intern/texture.c
    branches/soundsystem/source/blender/blenkernel/intern/writeavi.c
    branches/soundsystem/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soundsystem/source/blender/blenlib/BLI_arithb.h
    branches/soundsystem/source/blender/blenlib/BLI_editVert.h
    branches/soundsystem/source/blender/blenlib/BLI_fileops.h
    branches/soundsystem/source/blender/blenlib/intern/arithb.c
    branches/soundsystem/source/blender/blenlib/intern/fileops.c
    branches/soundsystem/source/blender/blenlib/intern/util.c
    branches/soundsystem/source/blender/blenloader/intern/readfile.c
    branches/soundsystem/source/blender/blenloader/intern/writefile.c
    branches/soundsystem/source/blender/editors/Makefile
    branches/soundsystem/source/blender/editors/SConscript
    branches/soundsystem/source/blender/editors/animation/anim_channels.c
    branches/soundsystem/source/blender/editors/animation/anim_deps.c
    branches/soundsystem/source/blender/editors/animation/anim_draw.c
    branches/soundsystem/source/blender/editors/animation/anim_filter.c
    branches/soundsystem/source/blender/editors/animation/anim_markers.c
    branches/soundsystem/source/blender/editors/animation/anim_ops.c
    branches/soundsystem/source/blender/editors/animation/drivers.c
    branches/soundsystem/source/blender/editors/animation/keyframes_draw.c
    branches/soundsystem/source/blender/editors/animation/keyframes_edit.c
    branches/soundsystem/source/blender/editors/animation/keyframes_general.c
    branches/soundsystem/source/blender/editors/animation/keyframing.c
    branches/soundsystem/source/blender/editors/animation/keyingsets.c
    branches/soundsystem/source/blender/editors/armature/editarmature.c
    branches/soundsystem/source/blender/editors/armature/editarmature_retarget.c
    branches/soundsystem/source/blender/editors/armature/editarmature_sketch.c
    branches/soundsystem/source/blender/editors/armature/poselib.c
    branches/soundsystem/source/blender/editors/armature/poseobject.c
    branches/soundsystem/source/blender/editors/curve/editcurve.c
    branches/soundsystem/source/blender/editors/datafiles/B.blend.c
    branches/soundsystem/source/blender/editors/datafiles/preview.blend.c
    branches/soundsystem/source/blender/editors/gpencil/gpencil_edit.c
    branches/soundsystem/source/blender/editors/include/BIF_glutil.h
    branches/soundsystem/source/blender/editors/include/ED_anim_api.h
    branches/soundsystem/source/blender/editors/include/ED_armature.h
    branches/soundsystem/source/blender/editors/include/ED_curve.h
    branches/soundsystem/source/blender/editors/include/ED_keyframes_draw.h
    branches/soundsystem/source/blender/editors/include/ED_keyframing.h
    branches/soundsystem/source/blender/editors/include/ED_mesh.h
    branches/soundsystem/source/blender/editors/include/ED_object.h
    branches/soundsystem/source/blender/editors/include/ED_screen.h
    branches/soundsystem/source/blender/editors/include/ED_screen_types.h
    branches/soundsystem/source/blender/editors/include/ED_space_api.h
    branches/soundsystem/source/blender/editors/include/ED_transform.h
    branches/soundsystem/source/blender/editors/include/UI_interface.h
    branches/soundsystem/source/blender/editors/include/UI_view2d.h
    branches/soundsystem/source/blender/editors/interface/interface.c
    branches/soundsystem/source/blender/editors/interface/interface_anim.c
    branches/soundsystem/source/blender/editors/interface/interface_handlers.c
    branches/soundsystem/source/blender/editors/interface/interface_intern.h
    branches/soundsystem/source/blender/editors/interface/interface_layout.c
    branches/soundsystem/source/blender/editors/interface/interface_panel.c
    branches/soundsystem/source/blender/editors/interface/interface_regions.c
    branches/soundsystem/source/blender/editors/interface/interface_style.c
    branches/soundsystem/source/blender/editors/interface/interface_templates.c
    branches/soundsystem/source/blender/editors/interface/interface_utils.c
    branches/soundsystem/source/blender/editors/interface/interface_widgets.c
    branches/soundsystem/source/blender/editors/interface/resources.c
    branches/soundsystem/source/blender/editors/interface/view2d.c
    branches/soundsystem/source/blender/editors/interface/view2d_ops.c
    branches/soundsystem/source/blender/editors/mesh/editmesh.c
    branches/soundsystem/source/blender/editors/mesh/editmesh_mods.c
    branches/soundsystem/source/blender/editors/mesh/editmesh_tools.c
    branches/soundsystem/source/blender/editors/mesh/mesh_ops.c
    branches/soundsystem/source/blender/editors/mesh/meshtools.c
    branches/soundsystem/source/blender/editors/object/editconstraint.c
    branches/soundsystem/source/blender/editors/object/editgroup.c
    branches/soundsystem/source/blender/editors/object/object_edit.c
    branches/soundsystem/source/blender/editors/object/object_intern.h
    branches/soundsystem/source/blender/editors/object/object_ops.c
    branches/soundsystem/source/blender/editors/object/object_vgroup.c
    branches/soundsystem/source/blender/editors/physics/ed_fluidsim.c
    branches/soundsystem/source/blender/editors/physics/editparticle.c
    branches/soundsystem/source/blender/editors/preview/previewrender.c
    branches/soundsystem/source/blender/editors/screen/area.c
    branches/soundsystem/source/blender/editors/screen/glutil.c
    branches/soundsystem/source/blender/editors/screen/screen_context.c
    branches/soundsystem/source/blender/editors/screen/screen_edit.c
    branches/soundsystem/source/blender/editors/screen/screen_ops.c
    branches/soundsystem/source/blender/editors/sculpt_paint/paint_image.c
    branches/soundsystem/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soundsystem/source/blender/editors/sculpt_paint/sculpt.c
    branches/soundsystem/source/blender/editors/space_action/action_draw.c
    branches/soundsystem/source/blender/editors/space_action/action_edit.c
    branches/soundsystem/source/blender/editors/space_action/action_header.c
    branches/soundsystem/source/blender/editors/space_action/action_intern.h
    branches/soundsystem/source/blender/editors/space_action/action_ops.c
    branches/soundsystem/source/blender/editors/space_action/action_select.c
    branches/soundsystem/source/blender/editors/space_action/space_action.c
    branches/soundsystem/source/blender/editors/space_api/spacetypes.c
    branches/soundsystem/source/blender/editors/space_buttons/buttons_context.c
    branches/soundsystem/source/blender/editors/space_buttons/buttons_header.c
    branches/soundsystem/source/blender/editors/space_buttons/buttons_intern.h
    branches/soundsystem/source/blender/editors/space_buttons/buttons_ops.c
    branches/soundsystem/source/blender/editors/space_buttons/space_buttons.c
    branches/soundsystem/source/blender/editors/space_file/file_draw.c
    branches/soundsystem/source/blender/editors/space_file/file_ops.c
    branches/soundsystem/source/blender/editors/space_file/filesel.c
    branches/soundsystem/source/blender/editors/space_file/writeimage.c
    branches/soundsystem/source/blender/editors/space_graph/graph_buttons.c
    branches/soundsystem/source/blender/editors/space_graph/graph_draw.c
    branches/soundsystem/source/blender/editors/space_graph/graph_edit.c
    branches/soundsystem/source/blender/editors/space_graph/graph_header.c
    branches/soundsystem/source/blender/editors/space_graph/graph_intern.h
    branches/soundsystem/source/blender/editors/space_graph/graph_ops.c
    branches/soundsystem/source/blender/editors/space_graph/graph_select.c
    branches/soundsystem/source/blender/editors/space_graph/space_graph.c
    branches/soundsystem/source/blender/editors/space_image/image_buttons.c
    branches/soundsystem/source/blender/editors/space_image/image_draw.c
    branches/soundsystem/source/blender/editors/space_image/image_ops.c
    branches/soundsystem/source/blender/editors/space_image/image_render.c
    branches/soundsystem/source/blender/editors/space_info/space_info.c
    branches/soundsystem/source/blender/editors/space_nla/nla_header.c
    branches/soundsystem/source/blender/editors/space_nla/nla_intern.h
    branches/soundsystem/source/blender/editors/space_nla/space_nla.c
    branches/soundsystem/source/blender/editors/space_node/SConscript
    branches/soundsystem/source/blender/editors/space_node/node_edit.c
    branches/soundsystem/source/blender/editors/space_node/node_select.c
    branches/soundsystem/source/blender/editors/space_outliner/outliner.c
    branches/soundsystem/source/blender/editors/space_outliner/outliner_intern.h
    branches/soundsystem/source/blender/editors/space_outliner/outliner_ops.c
    branches/soundsystem/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soundsystem/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soundsystem/source/blender/editors/space_text/space_text.c
    branches/soundsystem/source/blender/editors/space_text/text_draw.c
    branches/soundsystem/source/blender/editors/space_text/text_intern.h
    branches/soundsystem/source/blender/editors/space_text/text_ops.c
    branches/soundsystem/source/blender/editors/space_text/text_python.c
    branches/soundsystem/source/blender/editors/space_time/time_header.c
    branches/soundsystem/source/blender/editors/space_view3d/drawarmature.c
    branches/soundsystem/source/blender/editors/space_view3d/drawobject.c
    branches/soundsystem/source/blender/editors/space_view3d/space_view3d.c
    branches/soundsystem/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soundsystem/source/blender/editors/space_view3d/view3d_edit.c
    branches/soundsystem/source/blender/editors/space_view3d/view3d_header.c
    branches/soundsystem/source/blender/editors/space_view3d/view3d_ops.c
    branches/soundsystem/source/blender/editors/space_view3d/view3d_select.c
    branches/soundsystem/source/blender/editors/space_view3d/view3d_view.c
    branches/soundsystem/source/blender/editors/transform/transform.c
    branches/soundsystem/source/blender/editors/transform/transform.h
    branches/soundsystem/source/blender/editors/transform/transform_constraints.c
    branches/soundsystem/source/blender/editors/transform/transform_conversions.c
    branches/soundsystem/source/blender/editors/transform/transform_generics.c
    branches/soundsystem/source/blender/editors/transform/transform_manipulator.c
    branches/soundsystem/source/blender/editors/transform/transform_ops.c
    branches/soundsystem/source/blender/editors/transform/transform_orientations.c
    branches/soundsystem/source/blender/gpu/GPU_draw.h
    branches/soundsystem/source/blender/gpu/intern/gpu_draw.c
    branches/soundsystem/source/blender/imbuf/IMB_imbuf_types.h
    branches/soundsystem/source/blender/imbuf/intern/divers.c
    branches/soundsystem/source/blender/makesdna/DNA_action_types.h
    branches/soundsystem/source/blender/makesdna/DNA_anim_types.h
    branches/soundsystem/source/blender/makesdna/DNA_armature_types.h
    branches/soundsystem/source/blender/makesdna/DNA_camera_types.h
    branches/soundsystem/source/blender/makesdna/DNA_curve_types.h
    branches/soundsystem/source/blender/makesdna/DNA_material_types.h
    branches/soundsystem/source/blender/makesdna/DNA_meshdata_types.h
    branches/soundsystem/source/blender/makesdna/DNA_object_types.h
    branches/soundsystem/source/blender/makesdna/DNA_particle_types.h
    branches/soundsystem/source/blender/makesdna/DNA_scene_types.h
    branches/soundsystem/source/blender/makesdna/DNA_space_types.h
    branches/soundsystem/source/blender/makesdna/DNA_userdef_types.h
    branches/soundsystem/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soundsystem/source/blender/makesrna/RNA_access.h
    branches/soundsystem/source/blender/makesrna/RNA_define.h
    branches/soundsystem/source/blender/makesrna/RNA_types.h
    branches/soundsystem/source/blender/makesrna/SConscript
    branches/soundsystem/source/blender/makesrna/intern/CMakeLists.txt
    branches/soundsystem/source/blender/makesrna/intern/Makefile
    branches/soundsystem/source/blender/makesrna/intern/SConscript
    branches/soundsystem/source/blender/makesrna/intern/makesrna.c
    branches/soundsystem/source/blender/makesrna/intern/rna_access.c
    branches/soundsystem/source/blender/makesrna/intern/rna_animation.c
    branches/soundsystem/source/blender/makesrna/intern/rna_armature.c
    branches/soundsystem/source/blender/makesrna/intern/rna_brush.c
    branches/soundsystem/source/blender/makesrna/intern/rna_camera.c
    branches/soundsystem/source/blender/makesrna/intern/rna_cloth.c
    branches/soundsystem/source/blender/makesrna/intern/rna_color.c
    branches/soundsystem/source/blender/makesrna/intern/rna_constraint.c
    branches/soundsystem/source/blender/makesrna/intern/rna_context.c
    branches/soundsystem/source/blender/makesrna/intern/rna_curve.c
    branches/soundsystem/source/blender/makesrna/intern/rna_define.c
    branches/soundsystem/source/blender/makesrna/intern/rna_fcurve.c
    branches/soundsystem/source/blender/makesrna/intern/rna_internal.h
    branches/soundsystem/source/blender/makesrna/intern/rna_internal_types.h
    branches/soundsystem/source/blender/makesrna/intern/rna_key.c
    branches/soundsystem/source/blender/makesrna/intern/rna_lamp.c
    branches/soundsystem/source/blender/makesrna/intern/rna_lattice.c
    branches/soundsystem/source/blender/makesrna/intern/rna_material.c
    branches/soundsystem/source/blender/makesrna/intern/rna_mesh.c
    branches/soundsystem/source/blender/makesrna/intern/rna_modifier.c
    branches/soundsystem/source/blender/makesrna/intern/rna_object.c
    branches/soundsystem/source/blender/makesrna/intern/rna_particle.c
    branches/soundsystem/source/blender/makesrna/intern/rna_pose.c
    branches/soundsystem/source/blender/makesrna/intern/rna_rna.c
    branches/soundsystem/source/blender/makesrna/intern/rna_scene.c
    branches/soundsystem/source/blender/makesrna/intern/rna_screen.c
    branches/soundsystem/source/blender/makesrna/intern/rna_space.c
    branches/soundsystem/source/blender/makesrna/intern/rna_texture.c
    branches/soundsystem/source/blender/makesrna/intern/rna_ui.c
    branches/soundsystem/source/blender/makesrna/intern/rna_ui_api.c
    branches/soundsystem/source/blender/makesrna/intern/rna_userdef.c
    branches/soundsystem/source/blender/makesrna/intern/rna_vpaint.c
    branches/soundsystem/source/blender/makesrna/intern/rna_world.c
    branches/soundsystem/source/blender/nodes/intern/CMP_nodes/CMP_image.c
    branches/soundsystem/source/blender/python/SConscript
    branches/soundsystem/source/blender/python/generic/Mathutils.c
    branches/soundsystem/source/blender/python/generic/bpy_internal_import.c
    branches/soundsystem/source/blender/python/intern/bpy_interface.c
    branches/soundsystem/source/blender/python/intern/bpy_operator.c
    branches/soundsystem/source/blender/python/intern/bpy_operator_wrap.c
    branches/soundsystem/source/blender/python/intern/bpy_rna.c
    branches/soundsystem/source/blender/python/intern/bpy_ui.c
    branches/soundsystem/source/blender/python/intern/bpy_util.c
    branches/soundsystem/source/blender/python/intern/bpy_util.h
    branches/soundsystem/source/blender/render/intern/include/shading.h
    branches/soundsystem/source/blender/render/intern/source/convertblender.c
    branches/soundsystem/source/blender/render/intern/source/initrender.c
    branches/soundsystem/source/blender/render/intern/source/pipeline.c
    branches/soundsystem/source/blender/render/intern/source/pixelshading.c
    branches/soundsystem/source/blender/render/intern/source/rayshade.c
    branches/soundsystem/source/blender/render/intern/source/rendercore.c
    branches/soundsystem/source/blender/render/intern/source/shadeinput.c
    branches/soundsystem/source/blender/render/intern/source/sss.c
    branches/soundsystem/source/blender/render/intern/source/strand.c
    branches/soundsystem/source/blender/render/intern/source/texture.c
    branches/soundsystem/source/blender/windowmanager/WM_api.h
    branches/soundsystem/source/blender/windowmanager/WM_types.h
    branches/soundsystem/source/blender/windowmanager/intern/wm.c
    branches/soundsystem/source/blender/windowmanager/intern/wm_draw.c
    branches/soundsystem/source/blender/windowmanager/intern/wm_event_system.c
    branches/soundsystem/source/blender/windowmanager/intern/wm_gesture.c
    branches/soundsystem/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soundsystem/source/blender/windowmanager/intern/wm_operators.c
    branches/soundsystem/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soundsystem/source/blender/windowmanager/wm.h
    branches/soundsystem/source/creator/CMakeLists.txt
    branches/soundsystem/source/creator/creator.c
    branches/soundsystem/source/gameengine/BlenderRoutines/SConscript
    branches/soundsystem/source/gameengine/Expressions/KX_Python.h
    branches/soundsystem/source/gameengine/Expressions/SConscript
    branches/soundsystem/source/gameengine/GameLogic/SConscript
    branches/soundsystem/source/gameengine/GamePlayer/common/SConscript
    branches/soundsystem/source/gameengine/GamePlayer/ghost/SConscript
    branches/soundsystem/source/gameengine/Ketsji/KXNetwork/SConscript
    branches/soundsystem/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/soundsystem/source/gameengine/Ketsji/SConscript
    branches/soundsystem/source/gameengine/Physics/Bullet/SConscript
    branches/soundsystem/source/gameengine/Physics/common/SConscript
    branches/soundsystem/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    branches/soundsystem/source/gameengine/Rasterizer/SConscript
    branches/soundsystem/source/gameengine/SceneGraph/SConscript
    branches/soundsystem/source/gameengine/VideoTexture/SConscript
    branches/soundsystem/source/nan_definitions.mk
    branches/soundsystem/tools/Blender.py

Added Paths:
-----------
    branches/soundsystem/release/ui/bpy_ops.py
    branches/soundsystem/release/ui/buttons_physics_cloth.py
    branches/soundsystem/release/ui/space_console.py
    branches/soundsystem/release/ui/space_view3d.py
    branches/soundsystem/release/windows/extra/python30.zip
    branches/soundsystem/release/windows/extra/python31.zip
    branches/soundsystem/source/blender/blenkernel/intern/fmodifier.c
    branches/soundsystem/source/blender/blenkernel/nla_private.h
    branches/soundsystem/source/blender/blenlib/BLI_dlrbTree.h
    branches/soundsystem/source/blender/blenlib/intern/DLRB_tree.c
    branches/soundsystem/source/blender/editors/animation/fmodifier_ui.c
    branches/soundsystem/source/blender/editors/space_console/
    branches/soundsystem/source/blender/editors/space_console/Makefile
    branches/soundsystem/source/blender/editors/space_console/SConscript
    branches/soundsystem/source/blender/editors/space_console/console_draw.c
    branches/soundsystem/source/blender/editors/space_console/console_intern.h
    branches/soundsystem/source/blender/editors/space_console/console_ops.c
    branches/soundsystem/source/blender/editors/space_console/console_report.c
    branches/soundsystem/source/blender/editors/space_console/space_console.c
    branches/soundsystem/source/blender/editors/space_graph/graph_utils.c
    branches/soundsystem/source/blender/editors/space_nla/nla_buttons.c
    branches/soundsystem/source/blender/editors/space_nla/nla_channels.c
    branches/soundsystem/source/blender/editors/space_nla/nla_draw.c
    branches/soundsystem/source/blender/editors/space_nla/nla_edit.c
    branches/soundsystem/source/blender/editors/space_nla/nla_ops.c
    branches/soundsystem/source/blender/editors/space_nla/nla_select.c
    branches/soundsystem/source/blender/makesrna/intern/rna_nla.c

Removed Paths:
-------------
    branches/soundsystem/release/beos-4.5-i386/
    branches/soundsystem/release/beos-5.0-i386/
    branches/soundsystem/release/ui/buttons_physic_cloth.py
    branches/soundsystem/source/blender/editors/space_console/Makefile
    branches/soundsystem/source/blender/editors/space_console/SConscript
    branches/soundsystem/source/blender/editors/space_console/console_draw.c
    branches/soundsystem/source/blender/editors/space_console/console_intern.h
    branches/soundsystem/source/blender/editors/space_console/console_ops.c
    branches/soundsystem/source/blender/editors/space_console/console_report.c
    branches/soundsystem/source/blender/editors/space_console/space_console.c

Property Changed:
----------------
    branches/soundsystem/source/blender/python/generic/BGL.h

Modified: branches/soundsystem/blenderplayer/CMakeLists.txt
===================================================================
--- branches/soundsystem/blenderplayer/CMakeLists.txt	2009-07-20 03:18:16 UTC (rev 21713)
+++ branches/soundsystem/blenderplayer/CMakeLists.txt	2009-07-20 07:50:57 UTC (rev 21714)
@@ -32,10 +32,10 @@
   ADD_DEFINITIONS(-DWITH_QUICKTIME)
 ENDIF(WITH_QUICKTIME)
 
-IF(LINUX)
+IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   ADD_DEFINITIONS(-DWITH_BINRELOC)
   INCLUDE_DIRECTORIES(${BINRELOC_INC})
-endif(LINUX)
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dna.c

Modified: branches/soundsystem/config/win32-mingw-config.py
===================================================================
--- branches/soundsystem/config/win32-mingw-config.py	2009-07-20 03:18:16 UTC (rev 21713)
+++ branches/soundsystem/config/win32-mingw-config.py	2009-07-20 07:50:57 UTC (rev 21714)
@@ -2,7 +2,7 @@
 LIBDIR = "${LCGDIR}"
 
 BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_VERSION = '3.1'
 #BF_PYTHON_VERSION = '2.6'
 WITH_BF_STATICPYTHON = False
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
@@ -149,7 +149,7 @@
 BF_DEBUG = False
 BF_DEBUG_CCFLAGS= ['-g']
 
-BF_PROFILE_CCFLAGS = ['-pg', '-g ']
+BF_PROFILE_CCFLAGS = ['-pg', '-g']
 BF_PROFILE_LINKFLAGS = ['-pg']
 BF_PROFILE_FLAGS = BF_PROFILE_CCFLAGS
 BF_PROFILE = False

Modified: branches/soundsystem/config/win32-vc-config.py
===================================================================
--- branches/soundsystem/config/win32-vc-config.py	2009-07-20 03:18:16 UTC (rev 21713)
+++ branches/soundsystem/config/win32-vc-config.py	2009-07-20 07:50:57 UTC (rev 21714)
@@ -9,10 +9,10 @@
 BF_FFMPEG_LIB = 'avformat-52.lib avcodec-52.lib avdevice-52.lib avutil-50.lib swscale-0.lib'
 
 BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '2.6'
+BF_PYTHON_VERSION = '3.1'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python26'
+BF_PYTHON_LIB = 'python31'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = True
@@ -149,7 +149,7 @@
 CC = 'cl.exe'
 CXX = 'cl.exe'
 
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
 CXXFLAGS = ['/EHsc']
 
 BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
@@ -165,7 +165,7 @@
 
 LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
 
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/LARGEADDRESSAWARE']
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"msvcprtd.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/NODEFAULTLIB:"msvcrt.lib"', '/NODEFAULTLIB:"msvcrtd.lib"', '/NODEFAULTLIB:"msvcmrt.lib"', '/NODEFAULTLIB:"msvcurt.lib"', '/LARGEADDRESSAWARE']
 
 # # Todo
 # BF_PROFILE_CCFLAGS = ['-pg', '-g ']

Modified: branches/soundsystem/config/win64-vc-config.py
===================================================================
--- branches/soundsystem/config/win64-vc-config.py	2009-07-20 03:18:16 UTC (rev 21713)
+++ branches/soundsystem/config/win64-vc-config.py	2009-07-20 07:50:57 UTC (rev 21714)
@@ -9,10 +9,10 @@
 BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib swscale-0.lib'
 
 BF_PYTHON = LIBDIR + '/python'
-BF_PYTHON_VERSION = '3.0'
+BF_PYTHON_VERSION = '3.1'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python30'
+BF_PYTHON_LIB = 'python31'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = False 
@@ -152,7 +152,8 @@
 CC = 'cl.exe'
 CXX = 'cl.exe'
 
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CFLAGS = []
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
 CXXFLAGS = ['/EHsc']
 
 BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
@@ -172,16 +173,13 @@
 
 BF_DEBUG=False
 BF_BSC=False
-CFLAGS = []
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
-CXXFLAGS = ['/EHsc']
 
 if BF_DEBUG:
 	BF_NUMJOBS=1
 else:
 	BF_NUMJOBS=6
 
-PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"']
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"msvcprtd.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/NODEFAULTLIB:"msvcrt.lib"', '/NODEFAULTLIB:"msvcrtd.lib"', '/NODEFAULTLIB:"msvcmrt.lib"', '/NODEFAULTLIB:"msvcurt.lib"']
 
 BF_BUILDDIR = '..\\build\\blender25-win64-vc'
 BF_INSTALLDIR='..\\install\\blender25-win64-vc'

Modified: branches/soundsystem/extern/binreloc/CMakeLists.txt
===================================================================
--- branches/soundsystem/extern/binreloc/CMakeLists.txt	2009-07-20 03:18:16 UTC (rev 21713)
+++ branches/soundsystem/extern/binreloc/CMakeLists.txt	2009-07-20 07:50:57 UTC (rev 21714)
@@ -18,8 +18,8 @@
 # All rights reserved.
 #
 
-SET(INC ./include ${WINTAB_INC})
-ADD_DEFINITIONS(-DWITH_BINRELOC)
+SET(INC ./include )
+ADD_DEFINITIONS(-DENABLE_BINRELOC)
 FILE(GLOB SRC *.c)
 
 BLENDERLIB(extern_binreloc "${SRC}" "${INC}")

Modified: branches/soundsystem/extern/binreloc/Makefile
===================================================================
--- branches/soundsystem/extern/binreloc/Makefile	2009-07-20 03:18:16 UTC (rev 21713)
+++ branches/soundsystem/extern/binreloc/Makefile	2009-07-20 07:50:57 UTC (rev 21714)
@@ -27,7 +27,7 @@
 
 include nan_definitions.mk
 
-CPPFLAGS += -I./include
+CPPFLAGS += -DENABLE_BINRELOC -I./include
 
 
 include nan_compile.mk

Modified: branches/soundsystem/extern/bullet2/src/SConscript
===================================================================
--- branches/soundsystem/extern/bullet2/src/SConscript	2009-07-20 03:18:16 UTC (rev 21713)
+++ branches/soundsystem/extern/bullet2/src/SConscript	2009-07-20 07:50:57 UTC (rev 21714)
@@ -10,7 +10,7 @@
 if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
     defs += ' WIN32 NDEBUG _WINDOWS _LIB'
     #cflags += ['/MT', '/W3', '/GX', '/O2', '/Op']
-    cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3']
+    cflags += ['/MT', '/W3', '/GX', '/Og', '/Ot', '/Ob1', '/Op', '/G6', '/O3', '/EHcs']
 elif env['OURPLATFORM']=='win32-mingw':
     defs += ' NDEBUG'
     cflags += ['-O2']

Modified: branches/soundsystem/extern/ffmpeg/SConscript
===================================================================
--- branches/soundsystem/extern/ffmpeg/SConscript	2009-07-20 03:18:16 UTC (rev 21713)
+++ branches/soundsystem/extern/ffmpeg/SConscript	2009-07-20 07:50:57 UTC (rev 21714)
@@ -148,7 +148,7 @@
                 break
         sources.append(s)
         
-    if env['OURPLATFORM'] in ['win32-mingw', 'win32-vc' , 'darwin'] :
+    if env['OURPLATFORM'] in ['win32-mingw', 'win32-vc', 'win64-vc' , 'darwin'] :
     	defs = "HAVE_AV_CONFIG_H  _ISOC9X_SOURCE"
     else :
     	defs = "HAVE_AV_CONFIG_H _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _ISOC9X_SOURCE"

Modified: branches/soundsystem/extern/libopenjpeg/SConscript
===================================================================
--- branches/soundsystem/extern/libopenjpeg/SConscript	2009-07-20 03:18:16 UTC (rev 21713)
+++ branches/soundsystem/extern/libopenjpeg/SConscript	2009-07-20 07:50:57 UTC (rev 21714)
@@ -10,14 +10,14 @@
 flags = []
 defs = []
 
-if env['OURPLATFORM'] == 'win32-vc':
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
 	flags = []
 	defs.append('OPJ_STATIC')
 else:
 	flags = ['-Wall', '-O3', '-ffast-math', '-std=c99']
 
 oj_env = env.Clone()
-if not env['OURPLATFORM'] == 'win32-vc':
+if not env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
 	oj_env.Replace(CCFLAGS = '')
 	oj_env.Replace(BF_DEBUG_FLAGS = '')
 

Modified: branches/soundsystem/intern/elbeem/SConscript
===================================================================
--- branches/soundsystem/intern/elbeem/SConscript	2009-07-20 03:18:16 UTC (rev 21713)
+++ branches/soundsystem/intern/elbeem/SConscript	2009-07-20 07:50:57 UTC (rev 21714)
@@ -10,7 +10,7 @@
 if env['WITH_BF_OPENMP']:
     defs += ' PARALLEL'
 
-if env['OURPLATFORM']=='win32-vc':
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
     defs += ' USE_MSVC6FIXES'
 incs = env['BF_PNG_INC'] + ' ' + env['BF_ZLIB_INC'] 
 incs += ' extern '

Modified: branches/soundsystem/projectfiles_vc9/blender/blender.vcproj
===================================================================
--- branches/soundsystem/projectfiles_vc9/blender/blender.vcproj	2009-07-20 03:18:16 UTC (rev 21713)
+++ branches/soundsystem/projectfiles_vc9/blender/blender.vcproj	2009-07-20 07:50:57 UTC (rev 21714)
@@ -209,39 +209,6 @@
 	</References>
 	<Files>
 		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-			>
-			<File
-				RelativePath="..\..\source\creator\buildinfo.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\source\creator\creator.c"
-				>
-			</File>
-			<File
-				RelativePath="..\..\source\icons\winblender.rc"
-				>
-				<FileConfiguration
-					Name="Blender Release|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="\blenderdev\blender.test2\source\icons;$(NoInherit)"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Blender Debug|Win32"
-					>
-					<Tool
-						Name="VCResourceCompilerTool"
-						AdditionalIncludeDirectories="\blenderdev\blender.test2\source\icons;$(NoInherit)"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
 			Name="Resource Files"
 			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
 			>
@@ -253,6 +220,39 @@
 				RelativePath="..\..\source\icons\winblenderfile.ico"
 				>
 			</File>

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list