[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25618] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 25613.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Tue Dec 29 22:46:36 CET 2009
Revision: 25618
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25618
Author: kjym3
Date: 2009-12-29 22:46:36 +0100 (Tue, 29 Dec 2009)
Log Message:
-----------
Merged changes in the trunk up to revision 25613.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25613
Modified Paths:
--------------
branches/soc-2008-mxcurioni/config/darwin-config.py
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/Makefile
branches/soc-2008-mxcurioni/intern/audaspace/SConscript
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_BufferReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_C-API.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterFunctions.cpp
branches/soc-2008-mxcurioni/intern/audaspace/intern/AUD_ConverterFunctions.h
branches/soc-2008-mxcurioni/intern/audaspace/intern/Makefile
branches/soc-2008-mxcurioni/intern/audaspace/make/msvc_9_0/audaspace.vcproj
branches/soc-2008-mxcurioni/intern/audaspace/sndfile/Makefile
branches/soc-2008-mxcurioni/intern/opennl/superlu/sgstrf.c
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2008-mxcurioni/release/scripts/io/export_3ds.py
branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py
branches/soc-2008-mxcurioni/release/scripts/io/export_mdd.py
branches/soc-2008-mxcurioni/release/scripts/io/export_obj.py
branches/soc-2008-mxcurioni/release/scripts/io/export_ply.py
branches/soc-2008-mxcurioni/release/scripts/io/export_x3d.py
branches/soc-2008-mxcurioni/release/scripts/io/import_anim_bvh.py
branches/soc-2008-mxcurioni/release/scripts/io/import_scene_3ds.py
branches/soc-2008-mxcurioni/release/scripts/io/import_scene_obj.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/__init__.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/balancing.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/client.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/master.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/master_html.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/model.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/operators.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/slave.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/ui.py
branches/soc-2008-mxcurioni/release/scripts/io/netrender/utils.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy/ops.py
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_types.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/leg_quadruped_generic.py
branches/soc-2008-mxcurioni/release/scripts/modules/rigify/spine_pivot_flex.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_info.py
branches/soc-2008-mxcurioni/release/scripts/modules/rna_prop_ui.py
branches/soc-2008-mxcurioni/release/scripts/op/add_armature_human.py
branches/soc-2008-mxcurioni/release/scripts/op/add_mesh_torus.py
branches/soc-2008-mxcurioni/release/scripts/op/console_python.py
branches/soc-2008-mxcurioni/release/scripts/op/console_shell.py
branches/soc-2008-mxcurioni/release/scripts/op/mesh.py
branches/soc-2008-mxcurioni/release/scripts/op/mesh_skin.py
branches/soc-2008-mxcurioni/release/scripts/op/object.py
branches/soc-2008-mxcurioni/release/scripts/op/presets.py
branches/soc-2008-mxcurioni/release/scripts/op/screen_play_rendered_anim.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_follow_active.py
branches/soc-2008-mxcurioni/release/scripts/op/uvcalc_smart_project.py
branches/soc-2008-mxcurioni/release/scripts/op/vertexpaint_dirt.py
branches/soc-2008-mxcurioni/release/scripts/op/wm.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/HDTV_1080p.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/HDTV_720p.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/TV_PAL.py
branches/soc-2008-mxcurioni/release/scripts/presets/render/TV_PAL_16_colon_9.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator.py
branches/soc-2008-mxcurioni/release/scripts/templates/operator_simple.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_game.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_softbody.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_console.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_time.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/release/test/rna_array.py
branches/soc-2008-mxcurioni/source/Makefile
branches/soc-2008-mxcurioni/source/blender/avi/intern/avi.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_key.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_object.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_screen.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_writeavi.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_writeffmpeg.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_writeframeserver.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/brush.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata_file.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fcurve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/script.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeavi.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeframeserver.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_listbase.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_geom.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/listbase.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_geom.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_general.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/curve_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/B.blend.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframes_edit.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/view2d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_data.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_shapekey.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screendump.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/space_action.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/space_console.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_panels.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/space_file.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/space_graph.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_info/info_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_window.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/space_logic.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/space_nla.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/space_time.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/time_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/readimage.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/targa.c
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_anim_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_camera.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_context.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_particle.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_pose.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_rna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2008-mxcurioni/source/blender/python/BPY_extern.h
branches/soc-2008-mxcurioni/source/blender/python/generic/Geometry.c
branches/soc-2008-mxcurioni/source/blender/python/generic/bpy_internal_import.c
branches/soc-2008-mxcurioni/source/blender/python/generic/matrix.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/python/intern/stubs.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/qtkit_export.m
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2008-mxcurioni/source/blender/quicktime/quicktime_export.h
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_window.h
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyMath.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_CameraData.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2008-mxcurioni/source/tools/MakeCursor.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyReader.h
branches/soc-2008-mxcurioni/intern/audaspace/fftw/
branches/soc-2008-mxcurioni/intern/audaspace/fftw/AUD_BandPassFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/fftw/AUD_BandPassFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/fftw/AUD_BandPassReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/fftw/AUD_BandPassReader.h
branches/soc-2008-mxcurioni/intern/audaspace/fftw/Makefile
branches/soc-2008-mxcurioni/source/blender/python/sphinx_doc_gen.py
Removed Paths:
-------------
branches/soc-2008-mxcurioni/intern/audaspace/fftw/AUD_BandPassFactory.cpp
branches/soc-2008-mxcurioni/intern/audaspace/fftw/AUD_BandPassFactory.h
branches/soc-2008-mxcurioni/intern/audaspace/fftw/AUD_BandPassReader.cpp
branches/soc-2008-mxcurioni/intern/audaspace/fftw/AUD_BandPassReader.h
branches/soc-2008-mxcurioni/intern/audaspace/fftw/Makefile
branches/soc-2008-mxcurioni/release/scripts/modules/dynamic_menu.py
branches/soc-2008-mxcurioni/source/blender/python/epy_doc_gen.py
Property Changed:
----------------
branches/soc-2008-mxcurioni/release/scripts/io/netrender/netrender.css
Modified: branches/soc-2008-mxcurioni/config/darwin-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/darwin-config.py 2009-12-29 21:20:46 UTC (rev 25617)
+++ branches/soc-2008-mxcurioni/config/darwin-config.py 2009-12-29 21:46:36 UTC (rev 25618)
@@ -47,18 +47,21 @@
# CC = 'gcc-3.3'
# CXX = 'g++-3.3'
MAC_MIN_VERS = '10.4'
+ MACOSX_DEPLOYMENT_TARGET = '10.4'
MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
LCGDIR = '#../lib/darwin-8.0.0-powerpc'
CC = 'gcc-4.0'
CXX = 'g++-4.0'
elif MACOSX_ARCHITECTURE == 'i386':
MAC_MIN_VERS = '10.4'
+ MACOSX_DEPLOYMENT_TARGET = '10.4'
MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
LCGDIR = '#../lib/darwin-8.x.i386'
CC = 'gcc-4.0'
CXX = 'g++-4.0'
else :
MAC_MIN_VERS = '10.5'
+ MACOSX_DEPLOYMENT_TARGET = '10.5'
MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
LCGDIR = '#../lib/darwin-9.x.universal'
CC = 'gcc-4.2'
Modified: branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp
===================================================================
--- branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp 2009-12-29 21:20:46 UTC (rev 25617)
+++ branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.cpp 2009-12-29 21:46:36 UTC (rev 25618)
@@ -793,7 +793,7 @@
//
btSoftBody* btSoftBodyHelpers::CreateFromTriMesh(btSoftBodyWorldInfo& worldInfo,const btScalar* vertices,
const int* triangles,
- int ntriangles)
+ int ntriangles, bool randomizeConstraints)
{
int maxidx=0;
int i,j,ni;
@@ -828,14 +828,16 @@
#undef IDX
psb->appendFace(idx[0],idx[1],idx[2]);
}
- // don't randomize now, let's give a chance to the application to set face data
- //psb->randomizeConstraints();
+ if (randomizeConstraints)
+ {
+ psb->randomizeConstraints();
+ }
return(psb);
}
//
btSoftBody* btSoftBodyHelpers::CreateFromConvexHull(btSoftBodyWorldInfo& worldInfo, const btVector3* vertices,
- int nvertices)
+ int nvertices, bool randomizeConstraints)
{
HullDesc hdsc(QF_TRIANGLES,nvertices,vertices);
HullResult hres;
@@ -855,6 +857,9 @@
psb->appendFace(idx[0],idx[1],idx[2]);
}
hlib.ReleaseResult(hres);
- psb->randomizeConstraints();
+ if (randomizeConstraints)
+ {
+ psb->randomizeConstraints();
+ }
return(psb);
}
Modified: branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h 2009-12-29 21:20:46 UTC (rev 25617)
+++ branches/soc-2008-mxcurioni/extern/bullet2/src/BulletSoftBody/btSoftBodyHelpers.h 2009-12-29 21:46:36 UTC (rev 25618)
@@ -109,11 +109,13 @@
static btSoftBody* CreateFromTriMesh( btSoftBodyWorldInfo& worldInfo,
const btScalar* vertices,
const int* triangles,
- int ntriangles);
+ int ntriangles,
+ bool randomizeConstraints = true);
/* Create from convex-hull */
static btSoftBody* CreateFromConvexHull( btSoftBodyWorldInfo& worldInfo,
const btVector3* vertices,
- int nvertices);
+ int nvertices,
+ bool randomizeConstraints = true);
};
#endif //SOFT_BODY_HELPERS_H
Modified: branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt 2009-12-29 21:20:46 UTC (rev 25617)
+++ branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt 2009-12-29 21:46:36 UTC (rev 25618)
@@ -40,11 +40,6 @@
SET(INC ${INC} OpenAL ${OPENAL_INCLUDE_DIR})
FILE(GLOB OPENALSRC OpenAL/*.cpp)
ADD_DEFINITIONS(-DWITH_OPENAL)
-
- STRING(REGEX MATCH ".*ramework.*" FRAMEWORK ${OPENAL_INCLUDE_DIR})
- IF(FRAMEWORK)
- ADD_DEFINITIONS(-DAPPLE_FRAMEWORK_FIX)
- ENDIF(FRAMEWORK)
ENDIF(WITH_OPENAL)
IF(WITH_JACK)
@@ -59,6 +54,12 @@
ADD_DEFINITIONS(-DWITH_SNDFILE)
ENDIF(WITH_SNDFILE)
-SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC})
+IF(WITH_FFTW3)
+ SET(INC ${INC} fftw ${FFTW3_INC})
+ FILE(GLOB FFTW3SRC fftw/*.cpp)
+ ADD_DEFINITIONS(-DWITH_FFTW3)
+ENDIF(WITH_FFTW3)
+SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${FFTW3SRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC})
+
BLENDERLIB(bf_audaspace "${SRC}" "${INC}")
Modified: branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopFactory.h
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopFactory.h 2009-12-29 21:20:46 UTC (rev 25617)
+++ branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_LoopFactory.h 2009-12-29 21:46:36 UTC (rev 25618)
@@ -38,7 +38,7 @@
/**
* The loop count.
*/
- float m_loop;
+ int m_loop;
public:
/**
Copied: branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyFactory.cpp (from rev 25611, trunk/blender/intern/audaspace/FX/AUD_RectifyFactory.cpp)
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyFactory.cpp (rev 0)
+++ branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyFactory.cpp 2009-12-29 21:46:36 UTC (rev 25618)
@@ -0,0 +1,45 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_RectifyFactory.h"
+#include "AUD_RectifyReader.h"
+
+AUD_RectifyFactory::AUD_RectifyFactory(AUD_IFactory* factory) :
+ AUD_EffectFactory(factory) {}
+
+AUD_RectifyFactory::AUD_RectifyFactory() :
+ AUD_EffectFactory(0) {}
+
+AUD_IReader* AUD_RectifyFactory::createReader()
+{
+ AUD_IReader* reader = getReader();
+
+ if(reader != 0)
+ {
+ reader = new AUD_RectifyReader(reader); AUD_NEW("reader")
+ }
+
+ return reader;
+}
Copied: branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyFactory.h (from rev 25611, trunk/blender/intern/audaspace/FX/AUD_RectifyFactory.h)
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyFactory.h (rev 0)
+++ branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyFactory.h 2009-12-29 21:46:36 UTC (rev 25618)
@@ -0,0 +1,51 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#ifndef AUD_RECTIFYFACTORY
+#define AUD_RECTIFYFACTORY
+
+#include "AUD_EffectFactory.h"
+
+/**
+ * This factory rectifies another factory.
+ */
+class AUD_RectifyFactory : public AUD_EffectFactory
+{
+public:
+ /**
+ * Creates a new rectify factory.
+ * \param factory The input factory.
+ */
+ AUD_RectifyFactory(AUD_IFactory* factory = 0);
+
+ /**
+ * Creates a new rectify factory.
+ */
+ AUD_RectifyFactory();
+
+ virtual AUD_IReader* createReader();
+};
+
+#endif //AUD_RECTIFYFACTORY
Copied: branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyReader.cpp (from rev 25611, trunk/blender/intern/audaspace/FX/AUD_RectifyReader.cpp)
===================================================================
--- branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyReader.cpp (rev 0)
+++ branches/soc-2008-mxcurioni/intern/audaspace/FX/AUD_RectifyReader.cpp 2009-12-29 21:46:36 UTC (rev 25618)
@@ -0,0 +1,82 @@
+/*
+ * $Id$
+ *
+ * ***** BEGIN LGPL LICENSE BLOCK *****
+ *
+ * Copyright 2009 Jörg Hermann Müller
+ *
+ * This file is part of AudaSpace.
+ *
+ * AudaSpace is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * AudaSpace is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with AudaSpace. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * ***** END LGPL LICENSE BLOCK *****
+ */
+
+#include "AUD_RectifyReader.h"
+#include "AUD_Buffer.h"
+
+#include <cstring>
+
+AUD_RectifyReader::AUD_RectifyReader(AUD_IReader* reader) :
+ AUD_EffectReader(reader)
+{
+ int bigendian = 1;
+ bigendian = (((char*)&bigendian)[0]) ? 0: 1; // 1 if Big Endian
+
+ switch(m_reader->getSpecs().format)
+ {
+ case AUD_FORMAT_S16:
+ m_rectify = AUD_rectify<int16_t>;
+ break;
+ case AUD_FORMAT_S32:
+ m_rectify = AUD_rectify<int32_t>;
+ break;
+ case AUD_FORMAT_FLOAT32:
+ m_rectify = AUD_rectify<float>;
+ break;
+ case AUD_FORMAT_FLOAT64:
+ m_rectify = AUD_rectify<double>;
+ break;
+ case AUD_FORMAT_U8:
+ m_rectify = AUD_rectify_u8;
+ break;
+ case AUD_FORMAT_S24:
+ m_rectify = bigendian ? AUD_rectify_s24_be : AUD_rectify_s24_le;
+ break;
+ default:
+ delete m_reader;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list