[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31506] branches/particles-2010: svn merge -r31346:31505 https://svn.blender.org/svnroot/bf-blender/trunk/ blender

Lukas Toenne lukas.toenne at googlemail.com
Sat Aug 21 20:46:40 CEST 2010


Revision: 31506
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31506
Author:   lukastoenne
Date:     2010-08-21 20:46:38 +0200 (Sat, 21 Aug 2010)

Log Message:
-----------
svn merge -r31346:31505 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Modified Paths:
--------------
    branches/particles-2010/intern/audaspace/CMakeLists.txt
    branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_ButterworthFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_ButterworthFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_DelayFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_DelayFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_DelayReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_DelayReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_DoubleReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_DoubleReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_EffectFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_EffectFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_EffectReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_EffectReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_EnvelopeFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_FaderFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_FaderFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_FaderReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_FaderReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_HighpassFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_HighpassFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_LimiterFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_LimiterFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_LimiterReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_LimiterReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_LoopFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_LoopFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_LoopReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_LoopReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_LowpassFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_LowpassFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_PingPongFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_PingPongFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_PitchFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_PitchFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_PitchReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_PitchReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_RectifyFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_RectifyFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_ReverseFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_ReverseFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_ReverseReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_ReverseReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_SquareFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_SquareFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_SumFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_SumFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_VolumeFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_VolumeFactory.h
    branches/particles-2010/intern/audaspace/Makefile
    branches/particles-2010/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
    branches/particles-2010/intern/audaspace/OpenAL/AUD_OpenALDevice.h
    branches/particles-2010/intern/audaspace/SConscript
    branches/particles-2010/intern/audaspace/SDL/AUD_SDLDevice.cpp
    branches/particles-2010/intern/audaspace/SDL/AUD_SDLDevice.h
    branches/particles-2010/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
    branches/particles-2010/intern/audaspace/SRC/AUD_SRCResampleFactory.h
    branches/particles-2010/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
    branches/particles-2010/intern/audaspace/SRC/AUD_SRCResampleReader.h
    branches/particles-2010/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
    branches/particles-2010/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
    branches/particles-2010/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
    branches/particles-2010/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
    branches/particles-2010/intern/audaspace/fftw/AUD_BandPassReader.h
    branches/particles-2010/intern/audaspace/intern/AUD_Buffer.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_Buffer.h
    branches/particles-2010/intern/audaspace/intern/AUD_BufferReader.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_BufferReader.h
    branches/particles-2010/intern/audaspace/intern/AUD_C-API.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_C-API.h
    branches/particles-2010/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_ChannelMapperFactory.h
    branches/particles-2010/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_ChannelMapperReader.h
    branches/particles-2010/intern/audaspace/intern/AUD_ConverterFactory.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_ConverterFactory.h
    branches/particles-2010/intern/audaspace/intern/AUD_ConverterReader.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_ConverterReader.h
    branches/particles-2010/intern/audaspace/intern/AUD_FileFactory.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_FileFactory.h
    branches/particles-2010/intern/audaspace/intern/AUD_I3DDevice.h
    branches/particles-2010/intern/audaspace/intern/AUD_IDevice.h
    branches/particles-2010/intern/audaspace/intern/AUD_IFactory.h
    branches/particles-2010/intern/audaspace/intern/AUD_IReader.h
    branches/particles-2010/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_LinearResampleFactory.h
    branches/particles-2010/intern/audaspace/intern/AUD_LinearResampleReader.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_LinearResampleReader.h
    branches/particles-2010/intern/audaspace/intern/AUD_Mixer.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_Mixer.h
    branches/particles-2010/intern/audaspace/intern/AUD_MixerFactory.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_MixerFactory.h
    branches/particles-2010/intern/audaspace/intern/AUD_NULLDevice.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_NULLDevice.h
    branches/particles-2010/intern/audaspace/intern/AUD_ReadDevice.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_ReadDevice.h
    branches/particles-2010/intern/audaspace/intern/AUD_Reference.h
    branches/particles-2010/intern/audaspace/intern/AUD_SequencerFactory.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_SequencerFactory.h
    branches/particles-2010/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_SequencerReader.h
    branches/particles-2010/intern/audaspace/intern/AUD_SinusFactory.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_SinusFactory.h
    branches/particles-2010/intern/audaspace/intern/AUD_SinusReader.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_SinusReader.h
    branches/particles-2010/intern/audaspace/intern/AUD_SoftwareDevice.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_SoftwareDevice.h
    branches/particles-2010/intern/audaspace/intern/AUD_Space.h
    branches/particles-2010/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_StreamBufferFactory.h
    branches/particles-2010/intern/audaspace/intern/Makefile
    branches/particles-2010/intern/audaspace/jack/AUD_JackDevice.cpp
    branches/particles-2010/intern/audaspace/jack/AUD_JackDevice.h
    branches/particles-2010/intern/audaspace/make/msvc_9_0/audaspace.vcproj
    branches/particles-2010/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
    branches/particles-2010/intern/audaspace/sndfile/AUD_SndFileFactory.h
    branches/particles-2010/intern/audaspace/sndfile/AUD_SndFileReader.cpp
    branches/particles-2010/intern/audaspace/sndfile/AUD_SndFileReader.h
    branches/particles-2010/intern/smoke/intern/WTURBULENCE.cpp
    branches/particles-2010/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
    branches/particles-2010/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/particles-2010/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/particles-2010/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/particles-2010/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/particles-2010/release/scripts/io/export_3ds.py
    branches/particles-2010/release/scripts/io/export_fbx.py
    branches/particles-2010/release/scripts/io/export_mdd.py
    branches/particles-2010/release/scripts/io/export_obj.py
    branches/particles-2010/release/scripts/io/export_ply.py
    branches/particles-2010/release/scripts/io/export_x3d.py
    branches/particles-2010/release/scripts/io/import_anim_bvh.py
    branches/particles-2010/release/scripts/io/import_scene_3ds.py
    branches/particles-2010/release/scripts/io/import_scene_obj.py
    branches/particles-2010/release/scripts/io/import_shape_mdd.py
    branches/particles-2010/release/scripts/io/netrender/client.py
    branches/particles-2010/release/scripts/io/netrender/operators.py
    branches/particles-2010/release/scripts/io/netrender/repath.py
    branches/particles-2010/release/scripts/io/netrender/slave.py
    branches/particles-2010/release/scripts/io/netrender/ui.py
    branches/particles-2010/release/scripts/keyingsets/keyingsets_utils.py
    branches/particles-2010/release/scripts/modules/add_object_utils.py
    branches/particles-2010/release/scripts/modules/bpy/__init__.py
    branches/particles-2010/release/scripts/modules/bpy/utils.py
    branches/particles-2010/release/scripts/modules/bpy_types.py
    branches/particles-2010/release/scripts/modules/bpyml.py
    branches/particles-2010/release/scripts/modules/graphviz_export.py
    branches/particles-2010/release/scripts/modules/rigify/__init__.py
    branches/particles-2010/release/scripts/modules/rigify/arm_biped.py
    branches/particles-2010/release/scripts/modules/rigify/copy.py
    branches/particles-2010/release/scripts/modules/rigify/delta.py
    branches/particles-2010/release/scripts/modules/rigify/eye_balls.py
    branches/particles-2010/release/scripts/modules/rigify/eye_lid.py
    branches/particles-2010/release/scripts/modules/rigify/finger_curl.py
    branches/particles-2010/release/scripts/modules/rigify/leg_biped.py
    branches/particles-2010/release/scripts/modules/rigify/leg_quadruped.py
    branches/particles-2010/release/scripts/modules/rigify/mouth.py
    branches/particles-2010/release/scripts/modules/rigify/neck.py
    branches/particles-2010/release/scripts/modules/rigify/neck_flex.py
    branches/particles-2010/release/scripts/modules/rigify/palm_curl.py
    branches/particles-2010/release/scripts/modules/rigify/shape_key_control.py
    branches/particles-2010/release/scripts/modules/rigify/shape_key_distance.py
    branches/particles-2010/release/scripts/modules/rigify/shape_key_rotdiff.py
    branches/particles-2010/release/scripts/modules/rigify/spine_pivot_flex.py
    branches/particles-2010/release/scripts/modules/rigify/stretch.py
    branches/particles-2010/release/scripts/modules/rigify/stretch_twist.py
    branches/particles-2010/release/scripts/modules/rigify/tail_control.py
    branches/particles-2010/release/scripts/modules/rigify/tongue.py
    branches/particles-2010/release/scripts/modules/rigify/track_dual.py
    branches/particles-2010/release/scripts/modules/rigify/track_reverse.py
    branches/particles-2010/release/scripts/modules/rigify_utils.py
    branches/particles-2010/release/scripts/modules/rna_info.py
    branches/particles-2010/release/scripts/op/add_armature_human.py
    branches/particles-2010/release/scripts/op/add_mesh_torus.py
    branches/particles-2010/release/scripts/op/fcurve_euler_filter.py
    branches/particles-2010/release/scripts/op/image.py
    branches/particles-2010/release/scripts/op/mesh.py
    branches/particles-2010/release/scripts/op/nla.py
    branches/particles-2010/release/scripts/op/object.py
    branches/particles-2010/release/scripts/op/presets.py
    branches/particles-2010/release/scripts/op/screen_play_rendered_anim.py
    branches/particles-2010/release/scripts/op/sequencer.py
    branches/particles-2010/release/scripts/op/uv.py
    branches/particles-2010/release/scripts/op/uvcalc_follow_active.py
    branches/particles-2010/release/scripts/op/uvcalc_smart_project.py
    branches/particles-2010/release/scripts/op/vertexpaint_dirt.py
    branches/particles-2010/release/scripts/presets/interaction/blender.py
    branches/particles-2010/release/scripts/presets/interaction/maya.py
    branches/particles-2010/release/scripts/templates/operator_uv.py
    branches/particles-2010/release/scripts/ui/properties_animviz.py
    branches/particles-2010/release/scripts/ui/properties_data_armature.py
    branches/particles-2010/release/scripts/ui/properties_data_armature_rigify.py
    branches/particles-2010/release/scripts/ui/properties_data_bone.py
    branches/particles-2010/release/scripts/ui/properties_data_camera.py
    branches/particles-2010/release/scripts/ui/properties_data_curve.py
    branches/particles-2010/release/scripts/ui/properties_data_lamp.py
    branches/particles-2010/release/scripts/ui/properties_data_lattice.py
    branches/particles-2010/release/scripts/ui/properties_data_mesh.py
    branches/particles-2010/release/scripts/ui/properties_data_metaball.py
    branches/particles-2010/release/scripts/ui/properties_data_modifier.py
    branches/particles-2010/release/scripts/ui/properties_game.py
    branches/particles-2010/release/scripts/ui/properties_material.py
    branches/particles-2010/release/scripts/ui/properties_object.py
    branches/particles-2010/release/scripts/ui/properties_object_constraint.py
    branches/particles-2010/release/scripts/ui/properties_particle.py
    branches/particles-2010/release/scripts/ui/properties_physics_cloth.py
    branches/particles-2010/release/scripts/ui/properties_physics_common.py
    branches/particles-2010/release/scripts/ui/properties_physics_field.py
    branches/particles-2010/release/scripts/ui/properties_physics_fluid.py
    branches/particles-2010/release/scripts/ui/properties_physics_smoke.py
    branches/particles-2010/release/scripts/ui/properties_physics_softbody.py
    branches/particles-2010/release/scripts/ui/properties_render.py
    branches/particles-2010/release/scripts/ui/properties_scene.py
    branches/particles-2010/release/scripts/ui/properties_texture.py
    branches/particles-2010/release/scripts/ui/properties_world.py
    branches/particles-2010/release/scripts/ui/space_console.py
    branches/particles-2010/release/scripts/ui/space_dopesheet.py
    branches/particles-2010/release/scripts/ui/space_filebrowser.py
    branches/particles-2010/release/scripts/ui/space_graph.py
    branches/particles-2010/release/scripts/ui/space_image.py
    branches/particles-2010/release/scripts/ui/space_info.py
    branches/particles-2010/release/scripts/ui/space_logic.py
    branches/particles-2010/release/scripts/ui/space_nla.py
    branches/particles-2010/release/scripts/ui/space_node.py
    branches/particles-2010/release/scripts/ui/space_outliner.py
    branches/particles-2010/release/scripts/ui/space_sequencer.py
    branches/particles-2010/release/scripts/ui/space_text.py
    branches/particles-2010/release/scripts/ui/space_time.py
    branches/particles-2010/release/scripts/ui/space_userpref.py
    branches/particles-2010/release/scripts/ui/space_userpref_keymap.py
    branches/particles-2010/release/scripts/ui/space_view3d.py
    branches/particles-2010/release/scripts/ui/space_view3d_toolbar.py
    branches/particles-2010/source/Makefile
    branches/particles-2010/source/blender/avi/intern/avi.c
    branches/particles-2010/source/blender/avi/intern/avi_intern.h
    branches/particles-2010/source/blender/blenfont/intern/blf_lang.c
    branches/particles-2010/source/blender/blenkernel/BKE_pointcache.h
    branches/particles-2010/source/blender/blenkernel/intern/BME_Customdata.c
    branches/particles-2010/source/blender/blenkernel/intern/BME_conversions.c
    branches/particles-2010/source/blender/blenkernel/intern/DerivedMesh.c
    branches/particles-2010/source/blender/blenkernel/intern/anim.c
    branches/particles-2010/source/blender/blenkernel/intern/armature.c
    branches/particles-2010/source/blender/blenkernel/intern/boids.c
    branches/particles-2010/source/blender/blenkernel/intern/booleanops_mesh.c
    branches/particles-2010/source/blender/blenkernel/intern/brush.c
    branches/particles-2010/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/particles-2010/source/blender/blenkernel/intern/collision.c
    branches/particles-2010/source/blender/blenkernel/intern/constraint.c
    branches/particles-2010/source/blender/blenkernel/intern/depsgraph.c
    branches/particles-2010/source/blender/blenkernel/intern/effect.c
    branches/particles-2010/source/blender/blenkernel/intern/fluidsim.c
    branches/particles-2010/source/blender/blenkernel/intern/fmodifier.c
    branches/particles-2010/source/blender/blenkernel/intern/idcode.c
    branches/particles-2010/source/blender/blenkernel/intern/implicit.c
    branches/particles-2010/source/blender/blenkernel/intern/material.c
    branches/particles-2010/source/blender/blenkernel/intern/mesh.c
    branches/particles-2010/source/blender/blenkernel/intern/modifier.c
    branches/particles-2010/source/blender/blenkernel/intern/node.c
    branches/particles-2010/source/blender/blenkernel/intern/paint.c
    branches/particles-2010/source/blender/blenkernel/intern/particle.c
    branches/particles-2010/source/blender/blenkernel/intern/particle_system.c
    branches/particles-2010/source/blender/blenkernel/intern/scene.c
    branches/particles-2010/source/blender/blenkernel/intern/screen.c
    branches/particles-2010/source/blender/blenkernel/intern/shrinkwrap.c
    branches/particles-2010/source/blender/blenkernel/intern/sketch.c
    branches/particles-2010/source/blender/blenkernel/intern/softbody.c
    branches/particles-2010/source/blender/blenkernel/intern/sound.c
    branches/particles-2010/source/blender/blenkernel/intern/world.c
    branches/particles-2010/source/blender/blenkernel/intern/writeframeserver.c
    branches/particles-2010/source/blender/blenlib/BLI_ghash.h
    branches/particles-2010/source/blender/blenlib/intern/BLI_ghash.c
    branches/particles-2010/source/blender/blenlib/intern/math_geom.c
    branches/particles-2010/source/blender/blenlib/intern/math_matrix.c
    branches/particles-2010/source/blender/blenlib/intern/math_rotation.c
    branches/particles-2010/source/blender/blenlib/intern/math_vector.c
    branches/particles-2010/source/blender/blenlib/intern/pbvh.c
    branches/particles-2010/source/blender/blenlib/intern/winstuff.c
    branches/particles-2010/source/blender/blenloader/intern/readfile.c
    branches/particles-2010/source/blender/collada/DocumentExporter.cpp
    branches/particles-2010/source/blender/editors/animation/fmodifier_ui.c
    branches/particles-2010/source/blender/editors/animation/keyframes_draw.c
    branches/particles-2010/source/blender/editors/armature/armature_ops.c
    branches/particles-2010/source/blender/editors/armature/editarmature.c
    branches/particles-2010/source/blender/editors/armature/editarmature_generate.c
    branches/particles-2010/source/blender/editors/armature/poseSlide.c
    branches/particles-2010/source/blender/editors/armature/poseUtils.c
    branches/particles-2010/source/blender/editors/armature/poseobject.c
    branches/particles-2010/source/blender/editors/armature/reeb.c
    branches/particles-2010/source/blender/editors/curve/curve_ops.c
    branches/particles-2010/source/blender/editors/curve/editcurve.c
    branches/particles-2010/source/blender/editors/gpencil/drawgpencil.c
    branches/particles-2010/source/blender/editors/gpencil/editaction_gpencil.c
    branches/particles-2010/source/blender/editors/gpencil/gpencil_buttons.c
    branches/particles-2010/source/blender/editors/gpencil/gpencil_edit.c
    branches/particles-2010/source/blender/editors/include/UI_interface.h
    branches/particles-2010/source/blender/editors/interface/interface.c
    branches/particles-2010/source/blender/editors/interface/interface_anim.c
    branches/particles-2010/source/blender/editors/interface/interface_icons.c
    branches/particles-2010/source/blender/editors/interface/interface_layout.c
    branches/particles-2010/source/blender/editors/interface/interface_style.c
    branches/particles-2010/source/blender/editors/interface/interface_templates.c
    branches/particles-2010/source/blender/editors/interface/interface_widgets.c
    branches/particles-2010/source/blender/editors/interface/view2d.c
    branches/particles-2010/source/blender/editors/interface/view2d_ops.c
    branches/particles-2010/source/blender/editors/mesh/editface.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_add.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_mods.c
    branches/particles-2010/source/blender/editors/mesh/editmesh_tools.c
    branches/particles-2010/source/blender/editors/mesh/loopcut.c
    branches/particles-2010/source/blender/editors/mesh/mesh_ops.c
    branches/particles-2010/source/blender/editors/object/object_add.c
    branches/particles-2010/source/blender/editors/object/object_edit.c
    branches/particles-2010/source/blender/editors/object/object_group.c
    branches/particles-2010/source/blender/editors/object/object_ops.c
    branches/particles-2010/source/blender/editors/object/object_relations.c
    branches/particles-2010/source/blender/editors/object/object_select.c
    branches/particles-2010/source/blender/editors/object/object_transform.c
    branches/particles-2010/source/blender/editors/physics/physics_fluid.c
    branches/particles-2010/source/blender/editors/render/render_preview.c
    branches/particles-2010/source/blender/editors/screen/screen_edit.c
    branches/particles-2010/source/blender/editors/screen/screen_ops.c
    branches/particles-2010/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/particles-2010/source/blender/editors/sculpt_paint/sculpt.c
    branches/particles-2010/source/blender/editors/sculpt_paint/sculpt_undo.c
    branches/particles-2010/source/blender/editors/sound/Makefile
    branches/particles-2010/source/blender/editors/space_action/action_draw.c
    branches/particles-2010/source/blender/editors/space_action/action_edit.c
    branches/particles-2010/source/blender/editors/space_action/action_ops.c
    branches/particles-2010/source/blender/editors/space_api/space.c
    branches/particles-2010/source/blender/editors/space_api/spacetypes.c
    branches/particles-2010/source/blender/editors/space_buttons/buttons_header.c
    branches/particles-2010/source/blender/editors/space_console/console_draw.c
    branches/particles-2010/source/blender/editors/space_file/filesel.c
    branches/particles-2010/source/blender/editors/space_file/writeimage.c
    branches/particles-2010/source/blender/editors/space_graph/Makefile
    branches/particles-2010/source/blender/editors/space_graph/graph_buttons.c
    branches/particles-2010/source/blender/editors/space_graph/graph_draw.c
    branches/particles-2010/source/blender/editors/space_graph/graph_edit.c
    branches/particles-2010/source/blender/editors/space_graph/graph_ops.c
    branches/particles-2010/source/blender/editors/space_graph/graph_utils.c
    branches/particles-2010/source/blender/editors/space_image/image_buttons.c
    branches/particles-2010/source/blender/editors/space_image/image_header.c
    branches/particles-2010/source/blender/editors/space_image/space_image.c
    branches/particles-2010/source/blender/editors/space_info/info_ops.c
    branches/particles-2010/source/blender/editors/space_logic/logic_buttons.c
    branches/particles-2010/source/blender/editors/space_logic/logic_window.c
    branches/particles-2010/source/blender/editors/space_logic/space_logic.c
    branches/particles-2010/source/blender/editors/space_nla/nla_buttons.c
    branches/particles-2010/source/blender/editors/space_nla/nla_channels.c
    branches/particles-2010/source/blender/editors/space_nla/nla_draw.c
    branches/particles-2010/source/blender/editors/space_nla/nla_ops.c
    branches/particles-2010/source/blender/editors/space_node/drawnode.c
    branches/particles-2010/source/blender/editors/space_node/node_buttons.c
    branches/particles-2010/source/blender/editors/space_node/node_draw.c
    branches/particles-2010/source/blender/editors/space_node/node_edit.c
    branches/particles-2010/source/blender/editors/space_node/node_header.c
    branches/particles-2010/source/blender/editors/space_node/space_node.c
    branches/particles-2010/source/blender/editors/space_outliner/outliner.c
    branches/particles-2010/source/blender/editors/space_outliner/space_outliner.c
    branches/particles-2010/source/blender/editors/space_script/script_edit.c
    branches/particles-2010/source/blender/editors/space_script/script_header.c
    branches/particles-2010/source/blender/editors/space_script/script_ops.c
    branches/particles-2010/source/blender/editors/space_sequencer/Makefile
    branches/particles-2010/source/blender/editors/space_sequencer/sequencer_add.c
    branches/particles-2010/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/particles-2010/source/blender/editors/space_sequencer/sequencer_select.c
    branches/particles-2010/source/blender/editors/space_sound/Makefile
    branches/particles-2010/source/blender/editors/space_text/text_draw.c
    branches/particles-2010/source/blender/editors/space_text/text_header.c
    branches/particles-2010/source/blender/editors/space_time/time_ops.c
    branches/particles-2010/source/blender/editors/space_userpref/space_userpref.c
    branches/particles-2010/source/blender/editors/space_view3d/drawanimviz.c
    branches/particles-2010/source/blender/editors/space_view3d/drawarmature.c
    branches/particles-2010/source/blender/editors/space_view3d/drawobject.c
    branches/particles-2010/source/blender/editors/space_view3d/drawvolume.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_buttons.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_draw.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_header.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_ops.c
    branches/particles-2010/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/particles-2010/source/blender/editors/transform/transform.c
    branches/particles-2010/source/blender/editors/transform/transform_constraints.c
    branches/particles-2010/source/blender/editors/transform/transform_conversions.c
    branches/particles-2010/source/blender/editors/transform/transform_generics.c
    branches/particles-2010/source/blender/editors/transform/transform_ops.c
    branches/particles-2010/source/blender/editors/transform/transform_snap.c
    branches/particles-2010/source/blender/gpu/intern/gpu_extensions.c
    branches/particles-2010/source/blender/ikplugin/intern/ikplugin_api.c
    branches/particles-2010/source/blender/imbuf/intern/allocimbuf.c
    branches/particles-2010/source/blender/imbuf/intern/anim.c
    branches/particles-2010/source/blender/imbuf/intern/cache.c
    branches/particles-2010/source/blender/imbuf/intern/filter.c
    branches/particles-2010/source/blender/imbuf/intern/imbuf.h
    branches/particles-2010/source/blender/imbuf/intern/iris.c
    branches/particles-2010/source/blender/imbuf/intern/jp2.c
    branches/particles-2010/source/blender/imbuf/intern/png.c
    branches/particles-2010/source/blender/imbuf/intern/radiance_hdr.c
    branches/particles-2010/source/blender/imbuf/intern/rotate.c
    branches/particles-2010/source/blender/imbuf/intern/scaling.c
    branches/particles-2010/source/blender/imbuf/intern/targa.c
    branches/particles-2010/source/blender/imbuf/intern/util.c
    branches/particles-2010/source/blender/makesdna/DNA_modifier_types.h
    branches/particles-2010/source/blender/makesdna/DNA_scene_types.h
    branches/particles-2010/source/blender/makesdna/intern/SConscript
    branches/particles-2010/source/blender/makesrna/RNA_access.h
    branches/particles-2010/source/blender/makesrna/RNA_define.h
    branches/particles-2010/source/blender/makesrna/RNA_enum_types.h
    branches/particles-2010/source/blender/makesrna/RNA_types.h
    branches/particles-2010/source/blender/makesrna/intern/Makefile
    branches/particles-2010/source/blender/makesrna/intern/SConscript
    branches/particles-2010/source/blender/makesrna/intern/rna_ID.c
    branches/particles-2010/source/blender/makesrna/intern/rna_access.c
    branches/particles-2010/source/blender/makesrna/intern/rna_action.c
    branches/particles-2010/source/blender/makesrna/intern/rna_actuator.c
    branches/particles-2010/source/blender/makesrna/intern/rna_animation.c
    branches/particles-2010/source/blender/makesrna/intern/rna_animviz.c
    branches/particles-2010/source/blender/makesrna/intern/rna_armature.c
    branches/particles-2010/source/blender/makesrna/intern/rna_boid.c
    branches/particles-2010/source/blender/makesrna/intern/rna_brush.c
    branches/particles-2010/source/blender/makesrna/intern/rna_camera.c
    branches/particles-2010/source/blender/makesrna/intern/rna_cloth.c
    branches/particles-2010/source/blender/makesrna/intern/rna_color.c
    branches/particles-2010/source/blender/makesrna/intern/rna_constraint.c
    branches/particles-2010/source/blender/makesrna/intern/rna_controller.c
    branches/particles-2010/source/blender/makesrna/intern/rna_curve.c
    branches/particles-2010/source/blender/makesrna/intern/rna_define.c
    branches/particles-2010/source/blender/makesrna/intern/rna_fcurve.c
    branches/particles-2010/source/blender/makesrna/intern/rna_fluidsim.c
    branches/particles-2010/source/blender/makesrna/intern/rna_gpencil.c
    branches/particles-2010/source/blender/makesrna/intern/rna_group.c
    branches/particles-2010/source/blender/makesrna/intern/rna_image.c
    branches/particles-2010/source/blender/makesrna/intern/rna_internal.h
    branches/particles-2010/source/blender/makesrna/intern/rna_key.c
    branches/particles-2010/source/blender/makesrna/intern/rna_lamp.c
    branches/particles-2010/source/blender/makesrna/intern/rna_lattice.c
    branches/particles-2010/source/blender/makesrna/intern/rna_main.c
    branches/particles-2010/source/blender/makesrna/intern/rna_material.c
    branches/particles-2010/source/blender/makesrna/intern/rna_material_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_mesh.c
    branches/particles-2010/source/blender/makesrna/intern/rna_mesh_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_meta.c
    branches/particles-2010/source/blender/makesrna/intern/rna_modifier.c
    branches/particles-2010/source/blender/makesrna/intern/rna_nla.c
    branches/particles-2010/source/blender/makesrna/intern/rna_nodetree.c
    branches/particles-2010/source/blender/makesrna/intern/rna_object.c
    branches/particles-2010/source/blender/makesrna/intern/rna_object_force.c
    branches/particles-2010/source/blender/makesrna/intern/rna_particle.c
    branches/particles-2010/source/blender/makesrna/intern/rna_particleset.c
    branches/particles-2010/source/blender/makesrna/intern/rna_pose.c
    branches/particles-2010/source/blender/makesrna/intern/rna_property.c
    branches/particles-2010/source/blender/makesrna/intern/rna_render.c
    branches/particles-2010/source/blender/makesrna/intern/rna_rna.c
    branches/particles-2010/source/blender/makesrna/intern/rna_scene.c
    branches/particles-2010/source/blender/makesrna/intern/rna_scene_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_screen.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sensor.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sequencer.c
    branches/particles-2010/source/blender/makesrna/intern/rna_smoke.c
    branches/particles-2010/source/blender/makesrna/intern/rna_sound.c
    branches/particles-2010/source/blender/makesrna/intern/rna_space.c
    branches/particles-2010/source/blender/makesrna/intern/rna_text.c
    branches/particles-2010/source/blender/makesrna/intern/rna_texture.c
    branches/particles-2010/source/blender/makesrna/intern/rna_ui.c
    branches/particles-2010/source/blender/makesrna/intern/rna_ui_api.c
    branches/particles-2010/source/blender/makesrna/intern/rna_userdef.c
    branches/particles-2010/source/blender/makesrna/intern/rna_vfont.c
    branches/particles-2010/source/blender/makesrna/intern/rna_wm.c
    branches/particles-2010/source/blender/makesrna/intern/rna_world.c
    branches/particles-2010/source/blender/makesrna/rna_cleanup/rna_cleaner.py
    branches/particles-2010/source/blender/makesrna/rna_cleanup/rna_cleaner_merge.py
    branches/particles-2010/source/blender/makesrna/rna_cleanup/rna_properties.txt
    branches/particles-2010/source/blender/modifiers/intern/MOD_array.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_bevel.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_boolean_util.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_build.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_cloth.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_collision.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_mask.c
    branches/particles-2010/source/blender/modifiers/intern/MOD_particleinstance.c
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
    branches/particles-2010/source/blender/nodes/intern/CMP_nodes/CMP_sepcombHSVA.c
    branches/particles-2010/source/blender/nodes/intern/SIM_nodes/SIM_get_particle_data.c
    branches/particles-2010/source/blender/nodes/intern/SIM_util.h
    branches/particles-2010/source/blender/python/CMakeLists.txt
    branches/particles-2010/source/blender/python/SConscript
    branches/particles-2010/source/blender/python/doc/examples/mathutils.py
    branches/particles-2010/source/blender/python/doc/sphinx_doc_gen.py
    branches/particles-2010/source/blender/python/generic/blf_api.c
    branches/particles-2010/source/blender/python/generic/mathutils_color.c
    branches/particles-2010/source/blender/python/generic/mathutils_euler.c
    branches/particles-2010/source/blender/python/generic/mathutils_matrix.c
    branches/particles-2010/source/blender/python/generic/mathutils_quat.c
    branches/particles-2010/source/blender/python/generic/mathutils_vector.c
    branches/particles-2010/source/blender/python/intern/Makefile
    branches/particles-2010/source/blender/python/intern/bpy.c
    branches/particles-2010/source/blender/python/intern/bpy_operator_wrap.c
    branches/particles-2010/source/blender/python/intern/bpy_rna.c
    branches/particles-2010/source/blender/python/intern/bpy_rna.h
    branches/particles-2010/source/blender/render/intern/raytrace/bvh.h
    branches/particles-2010/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
    branches/particles-2010/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
    branches/particles-2010/source/blender/render/intern/source/pipeline.c
    branches/particles-2010/source/blender/windowmanager/WM_api.h
    branches/particles-2010/source/blender/windowmanager/intern/wm_init_exit.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_operators.c
    branches/particles-2010/source/blender/windowmanager/intern/wm_window.c
    branches/particles-2010/source/blender/windowmanager/wm_window.h
    branches/particles-2010/source/creator/creator.c
    branches/particles-2010/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/particles-2010/source/gameengine/Converter/BL_ArmatureChannel.cpp
    branches/particles-2010/source/gameengine/Converter/BL_ArmatureConstraint.cpp
    branches/particles-2010/source/gameengine/Converter/BL_ArmatureObject.cpp
    branches/particles-2010/source/gameengine/Expressions/PyObjectPlus.h
    branches/particles-2010/source/gameengine/GameLogic/SCA_ISensor.cpp
    branches/particles-2010/source/gameengine/GameLogic/SCA_ISensor.h
    branches/particles-2010/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    branches/particles-2010/source/gameengine/GameLogic/SCA_PythonController.cpp
    branches/particles-2010/source/gameengine/GamePlayer/ActiveX/CControlRefresher.cpp
    branches/particles-2010/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/particles-2010/source/gameengine/GamePlayer/netscape/common/npmac.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/particles-2010/source/gameengine/Ketsji/KX_Camera.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_ConstraintWrapper.h
    branches/particles-2010/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_PolyProxy.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_PolyProxy.h
    branches/particles-2010/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_Scene.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_SoundActuator.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_SoundActuator.h
    branches/particles-2010/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/particles-2010/source/gameengine/Ketsji/KX_VertexProxy.h

Added Paths:
-----------
    branches/particles-2010/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_DoubleFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_DoubleFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_IIRFilterFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_IIRFilterFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_IIRFilterReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_IIRFilterReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_SuperposeFactory.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_SuperposeFactory.h
    branches/particles-2010/intern/audaspace/FX/AUD_SuperposeReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_SuperposeReader.h
    branches/particles-2010/intern/audaspace/Python/
    branches/particles-2010/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/particles-2010/intern/audaspace/Python/AUD_PyAPI.h
    branches/particles-2010/intern/audaspace/Python/Makefile
    branches/particles-2010/intern/audaspace/intern/AUD_3DMath.h
    branches/particles-2010/intern/audaspace/intern/AUD_DefaultMixer.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_DefaultMixer.h
    branches/particles-2010/intern/audaspace/intern/AUD_PyInit.h
    branches/particles-2010/intern/audaspace/intern/AUD_SilenceFactory.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_SilenceFactory.h
    branches/particles-2010/intern/audaspace/intern/AUD_SilenceReader.cpp
    branches/particles-2010/intern/audaspace/intern/AUD_SilenceReader.h
    branches/particles-2010/release/scripts/modules/animsys_refactor.py
    branches/particles-2010/release/scripts/op/animsys_update.py
    branches/particles-2010/source/blender/makesrna/rna_cleanup/rna_update.sh
    branches/particles-2010/source/blender/python/doc/alternative/
    branches/particles-2010/source/blender/python/doc/alternative/README
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/layout.html
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/page.html
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/bg.png
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/default.css_t
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/favicon.ico
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/jquery.sidebar.js
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/pygments.css
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/rnd.png
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/rndbl.png
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/rndbr.png
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/theme.conf
    branches/particles-2010/source/blender/python/doc/alternative/datatypes.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/
    branches/particles-2010/source/blender/python/doc/alternative/epy/PhysicsConstraints.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/VideoTexture.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/__init__.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/bgl.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/geometry.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/idprop.py
    branches/particles-2010/source/blender/python/doc/alternative/epyparser.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/
    branches/particles-2010/source/blender/python/doc/alternative/examples/PhysicsConstraints.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/VideoTexture.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Device.lock.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Factory.filter.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Factory.join.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Factory.pingpong.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Factory.sine.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.events.allkeys.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.events.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.logic.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.render.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.CListValue.from_id.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Camera.boxInsideFrustum.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Camera.getScreenPosition.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Camera.getScreenRay.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Camera.getScreenVect.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Camera.pointInsideFrustum.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Camera.sphereInsideFrustum.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_GameObject.rayCast.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_LightObject.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_MeshProxy.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_PolygonMaterial.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_PolygonMaterial.setCustomMaterial.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_PolygonMaterial.setTexture.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_SCA_ReplaceMeshActuator.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Scene.active_camera.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Scene.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_VertexProxy.getRGBA.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_VertexProxy.setRGBA.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bgl.Buffer.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bgl.glRasterPos.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bgl.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bpy.data.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/geometry.BoxPack2D.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/geometry.PolyFill.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/idprop.IDGroup.iteritems.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/idprop.IDGroup.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/idprop.IDGroup.values.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/idprop.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/mathutils.Euler.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/mathutils.Matrix.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/mathutils.Quaternion.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/mathutils.Vector.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/mathutils.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/
    branches/particles-2010/source/blender/python/doc/alternative/mako/LICENSE
    branches/particles-2010/source/blender/python/doc/alternative/mako/__init__.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/_ast_util.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ast.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/cache.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/codegen.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/exceptions.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/__init__.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/autohandler.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/babelplugin.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/preprocessors.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/pygmentplugin.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/turbogears.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/filters.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/lexer.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/lookup.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/parsetree.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/pygen.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/pyparser.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/runtime.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/template.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/util.py
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/AUTHORS
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/LICENSE
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/__init__.py
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/_constants.py
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/_native.py
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/_speedups.c
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/_speedups.py
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/_speedups.so
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/tests.py
    branches/particles-2010/source/blender/python/doc/alternative/pyparser.py
    branches/particles-2010/source/blender/python/doc/alternative/rnaparser.py
    branches/particles-2010/source/blender/python/doc/alternative/rst/
    branches/particles-2010/source/blender/python/doc/alternative/rst/bge.events.rst
    branches/particles-2010/source/blender/python/doc/alternative/rst/bge.logic.rst
    branches/particles-2010/source/blender/python/doc/alternative/rst/bge.render.rst
    branches/particles-2010/source/blender/python/doc/alternative/rst/bge.types.rst
    branches/particles-2010/source/blender/python/doc/alternative/run.py
    branches/particles-2010/source/blender/python/doc/alternative/sphinxoutput.py
    branches/particles-2010/source/blender/python/doc/alternative/sphinxparser.py
    branches/particles-2010/source/blender/python/doc/alternative/templates/
    branches/particles-2010/source/blender/python/doc/alternative/templates/Class.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/Layout.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/Module.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/bge.events.Module.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/bge.logic.Module.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/bpy.data.Module.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/bpy.ops.Class.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/bpy.ops.Module.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/bpy.types.Class.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/conf.py
    branches/particles-2010/source/blender/python/doc/alternative/templates/contents.rst
    branches/particles-2010/source/blender/python/doc/alternative/util.py
    branches/particles-2010/source/blender/python/doc/alternative/validator.py

Removed Paths:
-------------
    branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_ButterworthReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_ButterworthReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_EnvelopeReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_EnvelopeReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_HighpassReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_HighpassReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_LowpassReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_LowpassReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_RectifyReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_RectifyReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_SquareReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_SquareReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_SumReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_SumReader.h
    branches/particles-2010/intern/audaspace/FX/AUD_VolumeReader.cpp
    branches/particles-2010/intern/audaspace/FX/AUD_VolumeReader.h
    branches/particles-2010/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/particles-2010/intern/audaspace/Python/AUD_PyAPI.h
    branches/particles-2010/intern/audaspace/Python/Makefile
    branches/particles-2010/intern/audaspace/intern/AUD_SourceCaps.h
    branches/particles-2010/source/blender/python/doc/alternative/README
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/layout.html
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/page.html
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/bg.png
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/default.css_t
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/favicon.ico
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/jquery.sidebar.js
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/pygments.css
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/rnd.png
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/rndbl.png
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/static/rndbr.png
    branches/particles-2010/source/blender/python/doc/alternative/blender-org/theme.conf
    branches/particles-2010/source/blender/python/doc/alternative/datatypes.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/
    branches/particles-2010/source/blender/python/doc/alternative/epy/PhysicsConstraints.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/VideoTexture.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/__init__.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/bgl.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/geometry.py
    branches/particles-2010/source/blender/python/doc/alternative/epy/idprop.py
    branches/particles-2010/source/blender/python/doc/alternative/epyparser.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/
    branches/particles-2010/source/blender/python/doc/alternative/examples/PhysicsConstraints.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/VideoTexture.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Device.lock.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Factory.filter.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Factory.join.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Factory.pingpong.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.Factory.sine.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/aud.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.events.allkeys.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.events.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.logic.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.render.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.CListValue.from_id.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Camera.boxInsideFrustum.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Camera.getScreenPosition.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Camera.getScreenRay.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Camera.getScreenVect.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Camera.pointInsideFrustum.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Camera.sphereInsideFrustum.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_GameObject.rayCast.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_LightObject.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_MeshProxy.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_PolygonMaterial.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_PolygonMaterial.setCustomMaterial.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_PolygonMaterial.setTexture.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_SCA_ReplaceMeshActuator.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Scene.active_camera.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_Scene.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_VertexProxy.getRGBA.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bge.types.KX_VertexProxy.setRGBA.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bgl.Buffer.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bgl.glRasterPos.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bgl.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/bpy.data.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/geometry.BoxPack2D.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/geometry.PolyFill.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/idprop.IDGroup.iteritems.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/idprop.IDGroup.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/idprop.IDGroup.values.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/idprop.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/mathutils.Euler.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/mathutils.Matrix.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/mathutils.Quaternion.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/mathutils.Vector.py
    branches/particles-2010/source/blender/python/doc/alternative/examples/mathutils.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/
    branches/particles-2010/source/blender/python/doc/alternative/mako/LICENSE
    branches/particles-2010/source/blender/python/doc/alternative/mako/__init__.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/_ast_util.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ast.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/cache.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/codegen.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/exceptions.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/__init__.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/autohandler.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/babelplugin.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/preprocessors.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/pygmentplugin.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/ext/turbogears.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/filters.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/lexer.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/lookup.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/parsetree.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/pygen.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/pyparser.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/runtime.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/template.py
    branches/particles-2010/source/blender/python/doc/alternative/mako/util.py
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/AUTHORS
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/LICENSE
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/__init__.py
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/_constants.py
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/_native.py
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/_speedups.c
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/_speedups.py
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/_speedups.so
    branches/particles-2010/source/blender/python/doc/alternative/markupsafe/tests.py
    branches/particles-2010/source/blender/python/doc/alternative/pyparser.py
    branches/particles-2010/source/blender/python/doc/alternative/rnaparser.py
    branches/particles-2010/source/blender/python/doc/alternative/rst/
    branches/particles-2010/source/blender/python/doc/alternative/rst/bge.events.rst
    branches/particles-2010/source/blender/python/doc/alternative/rst/bge.logic.rst
    branches/particles-2010/source/blender/python/doc/alternative/rst/bge.render.rst
    branches/particles-2010/source/blender/python/doc/alternative/rst/bge.types.rst
    branches/particles-2010/source/blender/python/doc/alternative/run.py
    branches/particles-2010/source/blender/python/doc/alternative/sphinxoutput.py
    branches/particles-2010/source/blender/python/doc/alternative/sphinxparser.py
    branches/particles-2010/source/blender/python/doc/alternative/templates/
    branches/particles-2010/source/blender/python/doc/alternative/templates/Class.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/Layout.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/Module.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/bge.events.Module.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/bge.logic.Module.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/bpy.data.Module.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/bpy.ops.Class.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/bpy.ops.Module.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/bpy.types.Class.rst
    branches/particles-2010/source/blender/python/doc/alternative/templates/conf.py
    branches/particles-2010/source/blender/python/doc/alternative/templates/contents.rst
    branches/particles-2010/source/blender/python/doc/alternative/util.py
    branches/particles-2010/source/blender/python/doc/alternative/validator.py

Modified: branches/particles-2010/intern/audaspace/CMakeLists.txt
===================================================================
--- branches/particles-2010/intern/audaspace/CMakeLists.txt	2010-08-21 17:07:19 UTC (rev 31505)
+++ branches/particles-2010/intern/audaspace/CMakeLists.txt	2010-08-21 18:46:38 UTC (rev 31506)
@@ -54,12 +54,19 @@
 	ADD_DEFINITIONS(-DWITH_SNDFILE)
 ENDIF(WITH_SNDFILE)
 
-IF(WITH_FFTW3)
-	SET(INC ${INC} fftw ${FFTW3_INC})
-	FILE(GLOB FFTW3SRC fftw/*.cpp)
-	ADD_DEFINITIONS(-DWITH_FFTW3)
-ENDIF(WITH_FFTW3)
+#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})
+IF(WITH_PYTHON)
+	SET(INC ${INC} Python ${PYTHON_INC})
+	FILE(GLOB PYTHONSRC Python/*.cpp)
+ELSE(WITH_PYTHON)
+	ADD_DEFINITIONS(-DDISABLE_PYTHON)
+ENDIF(WITH_PYTHON)
 
+SET(SRC ${SRC} ${FFMPEGSRC} ${SNDFILESRC} ${FFTW3SRC} ${SDLSRC} ${OPENALSRC} ${JACKSRC} ${PYTHONSRC})
+
 BLENDERLIB(bf_audaspace "${SRC}" "${INC}")

Modified: branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
===================================================================
--- branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorFactory.cpp	2010-08-21 17:07:19 UTC (rev 31505)
+++ branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorFactory.cpp	2010-08-21 18:46:38 UTC (rev 31506)
@@ -24,26 +24,37 @@
  */
 
 #include "AUD_AccumulatorFactory.h"
-#include "AUD_AccumulatorReader.h"
+#include "AUD_CallbackIIRFilterReader.h"
 
+sample_t accumulatorFilterAdditive(AUD_CallbackIIRFilterReader* reader, void* useless)
+{
+	float in = reader->x(0);
+	float lastin = reader->x(-1);
+	float out = reader->y(-1) + in - lastin;
+	if(in > lastin)
+		out += in - lastin;
+	return out;
+}
+
+sample_t accumulatorFilter(AUD_CallbackIIRFilterReader* reader, void* useless)
+{
+	float in = reader->x(0);
+	float lastin = reader->x(-1);
+	float out = reader->y(-1);
+	if(in > lastin)
+		out += in - lastin;
+	return out;
+}
+
 AUD_AccumulatorFactory::AUD_AccumulatorFactory(AUD_IFactory* factory,
 											   bool additive) :
 		AUD_EffectFactory(factory),
-		m_additive(additive) {}
+		m_additive(additive)
+{
+}
 
-AUD_AccumulatorFactory::AUD_AccumulatorFactory(bool additive) :
-		AUD_EffectFactory(0),
-		m_additive(additive) {}
-
-AUD_IReader* AUD_AccumulatorFactory::createReader()
+AUD_IReader* AUD_AccumulatorFactory::createReader() const
 {
-	AUD_IReader* reader = getReader();
-
-	if(reader != 0)
-	{
-		reader = new AUD_AccumulatorReader(reader, m_additive);
-		AUD_NEW("reader")
-	}
-
-	return reader;
+	return new AUD_CallbackIIRFilterReader(getReader(), 2, 2,
+							m_additive ? accumulatorFilterAdditive : accumulatorFilter);
 }

Modified: branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorFactory.h
===================================================================
--- branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorFactory.h	2010-08-21 17:07:19 UTC (rev 31505)
+++ branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorFactory.h	2010-08-21 18:46:38 UTC (rev 31506)
@@ -37,8 +37,12 @@
 	/**
 	 * Whether the accumulator is additive.
 	 */
-	bool m_additive;
+	const bool m_additive;
 
+	// hide copy constructor and operator=
+	AUD_AccumulatorFactory(const AUD_AccumulatorFactory&);
+	AUD_AccumulatorFactory& operator=(const AUD_AccumulatorFactory&);
+
 public:
 	/**
 	 * Creates a new accumulator factory.
@@ -47,13 +51,7 @@
 	 */
 	AUD_AccumulatorFactory(AUD_IFactory* factory, bool additive = false);
 
-	/**
-	 * Creates a new accumulator factory.
-	 * \param additive Whether the accumulator is additive.
-	 */
-	AUD_AccumulatorFactory(bool additive = false);
-
-	virtual AUD_IReader* createReader();
+	virtual AUD_IReader* createReader() const;
 };
 
 #endif //AUD_ACCUMULATORFACTORY

Deleted: branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorReader.cpp
===================================================================
--- branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorReader.cpp	2010-08-21 17:07:19 UTC (rev 31505)
+++ branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorReader.cpp	2010-08-21 18:46:38 UTC (rev 31506)
@@ -1,99 +0,0 @@
-/*
- * $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_AccumulatorReader.h"
-#include "AUD_Buffer.h"
-
-#include <cstring>
-
-#define CC specs.channels + channel
-
-AUD_AccumulatorReader::AUD_AccumulatorReader(AUD_IReader* reader,
-											 bool additive) :
-		AUD_EffectReader(reader),
-		m_additive(additive)
-{
-	AUD_Specs specs = reader->getSpecs();
-	int samplesize = AUD_SAMPLE_SIZE(specs);
-
-	m_buffer = new AUD_Buffer(); AUD_NEW("buffer")
-
-	m_sums = new AUD_Buffer(samplesize); AUD_NEW("buffer")
-	memset(m_sums->getBuffer(), 0, samplesize);
-
-	m_prevs = new AUD_Buffer(samplesize); AUD_NEW("buffer")
-	memset(m_prevs->getBuffer(), 0, samplesize);
-}
-
-AUD_AccumulatorReader::~AUD_AccumulatorReader()
-{
-	delete m_buffer; AUD_DELETE("buffer")
-	delete m_sums; AUD_DELETE("buffer")
-	delete m_prevs; AUD_DELETE("buffer")
-}
-
-void AUD_AccumulatorReader::read(int & length, sample_t* & buffer)
-{
-	sample_t* buf;
-	sample_t* sums;
-	sample_t* prevs;
-	sums = m_sums->getBuffer();
-	prevs = m_prevs->getBuffer();
-
-	AUD_Specs specs = m_reader->getSpecs();
-
-	m_reader->read(length, buf);
-	if(m_buffer->getSize() < length * AUD_SAMPLE_SIZE(specs))
-		m_buffer->resize(length * AUD_SAMPLE_SIZE(specs));
-
-	buffer = m_buffer->getBuffer();
-
-	if(m_additive)
-	{
-		for(int channel = 0; channel < specs.channels; channel++)
-		{
-			for(int i = 0; i < length; i++)
-			{
-				if(buf[i * CC] > prevs[channel])
-					sums[channel] += buf[i * CC] - prevs[channel];
-				buffer[i * CC] = sums[channel] + buf[i * CC];
-				prevs[channel] = buf[i * CC];
-			}
-		}
-	}
-	else
-	{
-		for(int channel = 0; channel < specs.channels; channel++)
-		{
-			for(int i = 0; i < length * specs.channels; i++)
-			{
-				if(buf[i * CC] > prevs[channel])
-					sums[channel] += buf[i * CC] - prevs[channel];
-				buffer[i * CC] = sums[channel];
-				prevs[channel] = buf[i * CC];
-			}
-		}
-	}
-}

Deleted: branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorReader.h
===================================================================
--- branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorReader.h	2010-08-21 17:07:19 UTC (rev 31505)
+++ branches/particles-2010/intern/audaspace/FX/AUD_AccumulatorReader.h	2010-08-21 18:46:38 UTC (rev 31506)
@@ -1,75 +0,0 @@
-/*
- * $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_ACCUMULATORREADER
-#define AUD_ACCUMULATORREADER
-
-#include "AUD_EffectReader.h"
-class AUD_Buffer;
-
-/**
- * This class represents an accumulator.
- */
-class AUD_AccumulatorReader : public AUD_EffectReader
-{
-private:
-	/**
-	 * The playback buffer.
-	 */
-	AUD_Buffer *m_buffer;
-
-	/**
-	 * The sums of the specific channels.
-	 */
-	AUD_Buffer *m_sums;
-
-	/**
-	 * The previous results of the specific channels.
-	 */
-	AUD_Buffer *m_prevs;
-
-	/**
-	 * Whether the accumulator is additive.
-	 */
-	bool m_additive;
-
-public:
-	/**
-	 * Creates a new accumulator reader.
-	 * \param reader The reader to read from.
-	 * \param additive Whether the accumulator is additive.
-	 * \exception AUD_Exception Thrown if the reader specified is NULL.
-	 */
-	AUD_AccumulatorReader(AUD_IReader* reader, bool additive);
-
-	/**
-	 * Destroys the reader.
-	 */
-	virtual ~AUD_AccumulatorReader();
-
-	virtual void read(int & length, sample_t* & buffer);
-};
-
-#endif //AUD_ACCUMULATORREADER

Copied: branches/particles-2010/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp (from rev 31505, trunk/blender/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp)
===================================================================
--- branches/particles-2010/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp	                        (rev 0)
+++ branches/particles-2010/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp	2010-08-21 18:46:38 UTC (rev 31506)
@@ -0,0 +1,76 @@
+/*
+ * $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/>.
+ *

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list