[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39792] trunk/blender: Merging pepper to trunk at revision 39791.
Joerg Mueller
nexyon at gmail.com
Tue Aug 30 11:15:57 CEST 2011
Revision: 39792
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39792
Author: nexyon
Date: 2011-08-30 09:15:55 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
Merging pepper to trunk at revision 39791.
Important note: I used rsync to do the local merge, as "svn merge --reintegrate ^/branches/soc-2011-pepper" doesn't work with our svn server right now!
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39791
Modified Paths:
--------------
trunk/blender/doc/python_api/rst/bge.types.rst
trunk/blender/intern/audaspace/CMakeLists.txt
trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.h
trunk/blender/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
trunk/blender/intern/audaspace/FX/AUD_BaseIIRFilterReader.h
trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_ButterworthFactory.h
trunk/blender/intern/audaspace/FX/AUD_CallbackIIRFilterReader.cpp
trunk/blender/intern/audaspace/FX/AUD_CallbackIIRFilterReader.h
trunk/blender/intern/audaspace/FX/AUD_DelayFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_DelayFactory.h
trunk/blender/intern/audaspace/FX/AUD_DelayReader.cpp
trunk/blender/intern/audaspace/FX/AUD_DelayReader.h
trunk/blender/intern/audaspace/FX/AUD_DoubleFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_DoubleFactory.h
trunk/blender/intern/audaspace/FX/AUD_DoubleReader.cpp
trunk/blender/intern/audaspace/FX/AUD_DoubleReader.h
trunk/blender/intern/audaspace/FX/AUD_EffectFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_EffectFactory.h
trunk/blender/intern/audaspace/FX/AUD_EffectReader.cpp
trunk/blender/intern/audaspace/FX/AUD_EffectReader.h
trunk/blender/intern/audaspace/FX/AUD_EnvelopeFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_EnvelopeFactory.h
trunk/blender/intern/audaspace/FX/AUD_FaderFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_FaderFactory.h
trunk/blender/intern/audaspace/FX/AUD_FaderReader.cpp
trunk/blender/intern/audaspace/FX/AUD_FaderReader.h
trunk/blender/intern/audaspace/FX/AUD_HighpassFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_HighpassFactory.h
trunk/blender/intern/audaspace/FX/AUD_IIRFilterFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_IIRFilterFactory.h
trunk/blender/intern/audaspace/FX/AUD_IIRFilterReader.cpp
trunk/blender/intern/audaspace/FX/AUD_IIRFilterReader.h
trunk/blender/intern/audaspace/FX/AUD_LimiterFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_LimiterFactory.h
trunk/blender/intern/audaspace/FX/AUD_LimiterReader.cpp
trunk/blender/intern/audaspace/FX/AUD_LimiterReader.h
trunk/blender/intern/audaspace/FX/AUD_LoopFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_LoopFactory.h
trunk/blender/intern/audaspace/FX/AUD_LoopReader.cpp
trunk/blender/intern/audaspace/FX/AUD_LoopReader.h
trunk/blender/intern/audaspace/FX/AUD_LowpassFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_LowpassFactory.h
trunk/blender/intern/audaspace/FX/AUD_PingPongFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_PingPongFactory.h
trunk/blender/intern/audaspace/FX/AUD_PitchFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_PitchFactory.h
trunk/blender/intern/audaspace/FX/AUD_PitchReader.cpp
trunk/blender/intern/audaspace/FX/AUD_PitchReader.h
trunk/blender/intern/audaspace/FX/AUD_RectifyFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_RectifyFactory.h
trunk/blender/intern/audaspace/FX/AUD_ReverseFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_ReverseFactory.h
trunk/blender/intern/audaspace/FX/AUD_ReverseReader.cpp
trunk/blender/intern/audaspace/FX/AUD_ReverseReader.h
trunk/blender/intern/audaspace/FX/AUD_SquareFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_SquareFactory.h
trunk/blender/intern/audaspace/FX/AUD_SumFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_SumFactory.h
trunk/blender/intern/audaspace/FX/AUD_SuperposeFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_SuperposeFactory.h
trunk/blender/intern/audaspace/FX/AUD_SuperposeReader.cpp
trunk/blender/intern/audaspace/FX/AUD_SuperposeReader.h
trunk/blender/intern/audaspace/FX/AUD_VolumeFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_VolumeFactory.h
trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
trunk/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.h
trunk/blender/intern/audaspace/Python/AUD_PyAPI.cpp
trunk/blender/intern/audaspace/Python/AUD_PyAPI.h
trunk/blender/intern/audaspace/SRC/AUD_SRCResampleFactory.cpp
trunk/blender/intern/audaspace/SRC/AUD_SRCResampleFactory.h
trunk/blender/intern/audaspace/SRC/AUD_SRCResampleReader.cpp
trunk/blender/intern/audaspace/SRC/AUD_SRCResampleReader.h
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.cpp
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGFactory.h
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.h
trunk/blender/intern/audaspace/fftw/AUD_BandPassReader.cpp
trunk/blender/intern/audaspace/intern/AUD_3DMath.h
trunk/blender/intern/audaspace/intern/AUD_Buffer.cpp
trunk/blender/intern/audaspace/intern/AUD_Buffer.h
trunk/blender/intern/audaspace/intern/AUD_BufferReader.cpp
trunk/blender/intern/audaspace/intern/AUD_BufferReader.h
trunk/blender/intern/audaspace/intern/AUD_C-API.cpp
trunk/blender/intern/audaspace/intern/AUD_C-API.h
trunk/blender/intern/audaspace/intern/AUD_ChannelMapperFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_ChannelMapperFactory.h
trunk/blender/intern/audaspace/intern/AUD_ChannelMapperReader.cpp
trunk/blender/intern/audaspace/intern/AUD_ChannelMapperReader.h
trunk/blender/intern/audaspace/intern/AUD_ConverterFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_ConverterFactory.h
trunk/blender/intern/audaspace/intern/AUD_ConverterFunctions.cpp
trunk/blender/intern/audaspace/intern/AUD_ConverterReader.cpp
trunk/blender/intern/audaspace/intern/AUD_ConverterReader.h
trunk/blender/intern/audaspace/intern/AUD_FileFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_FileFactory.h
trunk/blender/intern/audaspace/intern/AUD_I3DDevice.h
trunk/blender/intern/audaspace/intern/AUD_IDevice.h
trunk/blender/intern/audaspace/intern/AUD_IFactory.h
trunk/blender/intern/audaspace/intern/AUD_IReader.h
trunk/blender/intern/audaspace/intern/AUD_LinearResampleFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_LinearResampleFactory.h
trunk/blender/intern/audaspace/intern/AUD_LinearResampleReader.cpp
trunk/blender/intern/audaspace/intern/AUD_LinearResampleReader.h
trunk/blender/intern/audaspace/intern/AUD_Mixer.cpp
trunk/blender/intern/audaspace/intern/AUD_Mixer.h
trunk/blender/intern/audaspace/intern/AUD_MixerFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_MixerFactory.h
trunk/blender/intern/audaspace/intern/AUD_NULLDevice.cpp
trunk/blender/intern/audaspace/intern/AUD_NULLDevice.h
trunk/blender/intern/audaspace/intern/AUD_ReadDevice.cpp
trunk/blender/intern/audaspace/intern/AUD_ReadDevice.h
trunk/blender/intern/audaspace/intern/AUD_Reference.h
trunk/blender/intern/audaspace/intern/AUD_SequencerFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_SequencerFactory.h
trunk/blender/intern/audaspace/intern/AUD_SequencerReader.cpp
trunk/blender/intern/audaspace/intern/AUD_SequencerReader.h
trunk/blender/intern/audaspace/intern/AUD_SilenceFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_SilenceFactory.h
trunk/blender/intern/audaspace/intern/AUD_SilenceReader.cpp
trunk/blender/intern/audaspace/intern/AUD_SilenceReader.h
trunk/blender/intern/audaspace/intern/AUD_SinusFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_SinusFactory.h
trunk/blender/intern/audaspace/intern/AUD_SinusReader.cpp
trunk/blender/intern/audaspace/intern/AUD_SinusReader.h
trunk/blender/intern/audaspace/intern/AUD_SoftwareDevice.cpp
trunk/blender/intern/audaspace/intern/AUD_SoftwareDevice.h
trunk/blender/intern/audaspace/intern/AUD_Space.h
trunk/blender/intern/audaspace/intern/AUD_StreamBufferFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_StreamBufferFactory.h
trunk/blender/intern/audaspace/jack/AUD_JackDevice.cpp
trunk/blender/intern/audaspace/jack/AUD_JackDevice.h
trunk/blender/intern/audaspace/sndfile/AUD_SndFileFactory.cpp
trunk/blender/intern/audaspace/sndfile/AUD_SndFileFactory.h
trunk/blender/intern/audaspace/sndfile/AUD_SndFileReader.cpp
trunk/blender/intern/audaspace/sndfile/AUD_SndFileReader.h
trunk/blender/release/datafiles/blenderbuttons
trunk/blender/release/scripts/modules/bpy_types.py
trunk/blender/release/scripts/presets/ffmpeg/DV.py
trunk/blender/release/scripts/presets/ffmpeg/DVD.py
trunk/blender/release/scripts/presets/ffmpeg/SVCD.py
trunk/blender/release/scripts/presets/ffmpeg/VCD.py
trunk/blender/release/scripts/startup/bl_operators/nla.py
trunk/blender/release/scripts/startup/bl_operators/object.py
trunk/blender/release/scripts/startup/bl_ui/__init__.py
trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py
trunk/blender/release/scripts/startup/bl_ui/properties_game.py
trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py
trunk/blender/release/scripts/startup/bl_ui/properties_render.py
trunk/blender/release/scripts/startup/bl_ui/properties_scene.py
trunk/blender/release/scripts/startup/bl_ui/space_dopesheet.py
trunk/blender/release/scripts/startup/bl_ui/space_graph.py
trunk/blender/release/scripts/startup/bl_ui/space_info.py
trunk/blender/release/scripts/startup/bl_ui/space_nla.py
trunk/blender/release/scripts/startup/bl_ui/space_sequencer.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d.py
trunk/blender/source/blender/CMakeLists.txt
trunk/blender/source/blender/blenkernel/BKE_action.h
trunk/blender/source/blender/blenkernel/BKE_anim.h
trunk/blender/source/blender/blenkernel/BKE_animsys.h
trunk/blender/source/blender/blenkernel/BKE_armature.h
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenkernel/BKE_constraint.h
trunk/blender/source/blender/blenkernel/BKE_fcurve.h
trunk/blender/source/blender/blenkernel/BKE_library.h
trunk/blender/source/blender/blenkernel/BKE_main.h
trunk/blender/source/blender/blenkernel/BKE_nla.h
trunk/blender/source/blender/blenkernel/BKE_sequencer.h
trunk/blender/source/blender/blenkernel/BKE_sound.h
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenkernel/intern/action.c
trunk/blender/source/blender/blenkernel/intern/anim.c
trunk/blender/source/blender/blenkernel/intern/anim_sys.c
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/blenkernel/intern/blender.c
trunk/blender/source/blender/blenkernel/intern/constraint.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/fcurve.c
trunk/blender/source/blender/blenkernel/intern/fmodifier.c
trunk/blender/source/blender/blenkernel/intern/gpencil.c
trunk/blender/source/blender/blenkernel/intern/idcode.c
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/blenkernel/intern/key.c
trunk/blender/source/blender/blenkernel/intern/library.c
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/blenkernel/intern/sound.c
trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/collada/AnimationImporter.cpp
trunk/blender/source/blender/collada/AnimationImporter.h
trunk/blender/source/blender/collada/ArmatureExporter.cpp
trunk/blender/source/blender/collada/ArmatureExporter.h
trunk/blender/source/blender/collada/ArmatureImporter.cpp
trunk/blender/source/blender/collada/ArmatureImporter.h
trunk/blender/source/blender/collada/CMakeLists.txt
trunk/blender/source/blender/collada/CameraExporter.cpp
trunk/blender/source/blender/collada/DocumentExporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.cpp
trunk/blender/source/blender/collada/DocumentImporter.h
trunk/blender/source/blender/collada/EffectExporter.cpp
trunk/blender/source/blender/collada/ExtraHandler.cpp
trunk/blender/source/blender/collada/ExtraHandler.h
trunk/blender/source/blender/collada/GeometryExporter.h
trunk/blender/source/blender/collada/LightExporter.cpp
trunk/blender/source/blender/collada/SkinInfo.cpp
trunk/blender/source/blender/collada/TransformReader.cpp
trunk/blender/source/blender/collada/TransformWriter.cpp
trunk/blender/source/blender/editors/animation/anim_channels_defines.c
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/animation/anim_deps.c
trunk/blender/source/blender/editors/animation/anim_draw.c
trunk/blender/source/blender/editors/animation/anim_filter.c
trunk/blender/source/blender/editors/animation/anim_intern.h
trunk/blender/source/blender/editors/animation/anim_ipo_utils.c
trunk/blender/source/blender/editors/animation/anim_markers.c
trunk/blender/source/blender/editors/animation/anim_ops.c
trunk/blender/source/blender/editors/animation/drivers.c
trunk/blender/source/blender/editors/animation/fmodifier_ui.c
trunk/blender/source/blender/editors/animation/keyframes_draw.c
trunk/blender/source/blender/editors/animation/keyframes_edit.c
trunk/blender/source/blender/editors/animation/keyframes_general.c
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/animation/keyingsets.c
trunk/blender/source/blender/editors/armature/armature_intern.h
trunk/blender/source/blender/editors/armature/armature_ops.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/poseSlide.c
trunk/blender/source/blender/editors/armature/poseUtils.c
trunk/blender/source/blender/editors/armature/poselib.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/datafiles/blenderbuttons.c
trunk/blender/source/blender/editors/datafiles/startup.blend.c
trunk/blender/source/blender/editors/gpencil/drawgpencil.c
trunk/blender/source/blender/editors/gpencil/editaction_gpencil.c
trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
trunk/blender/source/blender/editors/gpencil/gpencil_intern.h
trunk/blender/source/blender/editors/gpencil/gpencil_ops.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/include/ED_anim_api.h
trunk/blender/source/blender/editors/include/ED_gpencil.h
trunk/blender/source/blender/editors/include/ED_keyframes_draw.h
trunk/blender/source/blender/editors/include/ED_keyframes_edit.h
trunk/blender/source/blender/editors/include/ED_keyframing.h
trunk/blender/source/blender/editors/include/ED_markers.h
trunk/blender/source/blender/editors/include/UI_icons.h
trunk/blender/source/blender/editors/include/UI_resources.h
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_anim.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_constraint.c
trunk/blender/source/blender/editors/object/object_intern.h
trunk/blender/source/blender/editors/object/object_ops.c
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/object/object_select.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sound/CMakeLists.txt
trunk/blender/source/blender/editors/sound/sound_ops.c
trunk/blender/source/blender/editors/space_action/action_draw.c
trunk/blender/source/blender/editors/space_action/action_edit.c
trunk/blender/source/blender/editors/space_action/action_intern.h
trunk/blender/source/blender/editors/space_action/action_ops.c
trunk/blender/source/blender/editors/space_action/action_select.c
trunk/blender/source/blender/editors/space_action/space_action.c
trunk/blender/source/blender/editors/space_buttons/buttons_context.c
trunk/blender/source/blender/editors/space_file/filelist.c
trunk/blender/source/blender/editors/space_graph/graph_buttons.c
trunk/blender/source/blender/editors/space_graph/graph_draw.c
trunk/blender/source/blender/editors/space_graph/graph_edit.c
trunk/blender/source/blender/editors/space_graph/graph_ops.c
trunk/blender/source/blender/editors/space_graph/graph_select.c
trunk/blender/source/blender/editors/space_graph/graph_utils.c
trunk/blender/source/blender/editors/space_graph/space_graph.c
trunk/blender/source/blender/editors/space_logic/logic_window.c
trunk/blender/source/blender/editors/space_nla/nla_buttons.c
trunk/blender/source/blender/editors/space_nla/nla_channels.c
trunk/blender/source/blender/editors/space_nla/nla_draw.c
trunk/blender/source/blender/editors/space_nla/nla_edit.c
trunk/blender/source/blender/editors/space_nla/nla_intern.h
trunk/blender/source/blender/editors/space_nla/nla_ops.c
trunk/blender/source/blender/editors/space_nla/nla_select.c
trunk/blender/source/blender/editors/space_nla/space_nla.c
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/editors/space_outliner/outliner_edit.c
trunk/blender/source/blender/editors/space_outliner/outliner_intern.h
trunk/blender/source/blender/editors/space_outliner/outliner_ops.c
trunk/blender/source/blender/editors/space_outliner/outliner_select.c
trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
trunk/blender/source/blender/editors/space_outliner/space_outliner.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_draw.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_sequencer/space_sequencer.c
trunk/blender/source/blender/editors/space_text/text_draw.c
trunk/blender/source/blender/editors/space_time/space_time.c
trunk/blender/source/blender/editors/space_time/time_intern.h
trunk/blender/source/blender/editors/space_time/time_ops.c
trunk/blender/source/blender/editors/space_view3d/drawanimviz.c
trunk/blender/source/blender/editors/space_view3d/drawarmature.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_ops.c
trunk/blender/source/blender/makesdna/DNA_ID.h
trunk/blender/source/blender/makesdna/DNA_action_types.h
trunk/blender/source/blender/makesdna/DNA_actuator_types.h
trunk/blender/source/blender/makesdna/DNA_anim_types.h
trunk/blender/source/blender/makesdna/DNA_armature_types.h
trunk/blender/source/blender/makesdna/DNA_constraint_types.h
trunk/blender/source/blender/makesdna/DNA_curve_types.h
trunk/blender/source/blender/makesdna/DNA_gpencil_types.h
trunk/blender/source/blender/makesdna/DNA_ipo_types.h
trunk/blender/source/blender/makesdna/DNA_nla_types.h
trunk/blender/source/blender/makesdna/DNA_object_types.h
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesdna/DNA_sequence_types.h
trunk/blender/source/blender/makesdna/DNA_sound_types.h
trunk/blender/source/blender/makesdna/DNA_userdef_types.h
trunk/blender/source/blender/makesdna/intern/makesdna.c
trunk/blender/source/blender/makesrna/RNA_access.h
trunk/blender/source/blender/makesrna/RNA_enum_types.h
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/makesrna.c
trunk/blender/source/blender/makesrna/intern/rna_ID.c
trunk/blender/source/blender/makesrna/intern/rna_access.c
trunk/blender/source/blender/makesrna/intern/rna_action.c
trunk/blender/source/blender/makesrna/intern/rna_actuator.c
trunk/blender/source/blender/makesrna/intern/rna_animation.c
trunk/blender/source/blender/makesrna/intern/rna_animation_api.c
trunk/blender/source/blender/makesrna/intern/rna_animviz.c
trunk/blender/source/blender/makesrna/intern/rna_armature.c
trunk/blender/source/blender/makesrna/intern/rna_constraint.c
trunk/blender/source/blender/makesrna/intern/rna_curve.c
trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
trunk/blender/source/blender/makesrna/intern/rna_gpencil.c
trunk/blender/source/blender/makesrna/intern/rna_internal.h
trunk/blender/source/blender/makesrna/intern/rna_main.c
trunk/blender/source/blender/makesrna/intern/rna_main_api.c
trunk/blender/source/blender/makesrna/intern/rna_nla.c
trunk/blender/source/blender/makesrna/intern/rna_object.c
trunk/blender/source/blender/makesrna/intern/rna_pose.c
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/makesrna/intern/rna_sequencer.c
trunk/blender/source/blender/makesrna/intern/rna_sound.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp
trunk/blender/source/gameengine/Converter/BL_ActionActuator.h
trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
trunk/blender/source/gameengine/Converter/BL_ArmatureObject.h
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Converter/BL_DeformableGameObject.cpp
trunk/blender/source/gameengine/Converter/BL_DeformableGameObject.h
trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.h
trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.cpp
trunk/blender/source/gameengine/Converter/BL_ShapeDeformer.h
trunk/blender/source/gameengine/Converter/BL_SkinDeformer.cpp
trunk/blender/source/gameengine/Converter/BL_SkinDeformer.h
trunk/blender/source/gameengine/Converter/CMakeLists.txt
trunk/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp
trunk/blender/source/gameengine/Converter/KX_BlenderScalarInterpolator.h
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
trunk/blender/source/gameengine/Converter/KX_IpoConvert.cpp
trunk/blender/source/gameengine/Converter/KX_IpoConvert.h
trunk/blender/source/gameengine/Converter/SConscript
trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
trunk/blender/source/gameengine/Ketsji/CMakeLists.txt
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
trunk/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.cpp
trunk/blender/source/gameengine/Ketsji/KX_Scene.h
trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.h
trunk/blender/source/gameengine/Ketsji/SConscript
trunk/blender/source/gameengine/SceneGraph/SG_IObject.cpp
trunk/blender/source/gameengine/SceneGraph/SG_IObject.h
Added Paths:
-----------
trunk/blender/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.cpp
trunk/blender/intern/audaspace/FX/AUD_DynamicIIRFilterFactory.h
trunk/blender/intern/audaspace/FX/AUD_DynamicIIRFilterReader.cpp
trunk/blender/intern/audaspace/FX/AUD_DynamicIIRFilterReader.h
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.cpp
trunk/blender/intern/audaspace/ffmpeg/AUD_FFMPEGWriter.h
trunk/blender/intern/audaspace/intern/AUD_AnimateableProperty.cpp
trunk/blender/intern/audaspace/intern/AUD_AnimateableProperty.h
trunk/blender/intern/audaspace/intern/AUD_FileWriter.cpp
trunk/blender/intern/audaspace/intern/AUD_FileWriter.h
trunk/blender/intern/audaspace/intern/AUD_I3DHandle.h
trunk/blender/intern/audaspace/intern/AUD_IHandle.h
trunk/blender/intern/audaspace/intern/AUD_IWriter.h
trunk/blender/intern/audaspace/intern/AUD_JOSResampleFactory.cpp
trunk/blender/intern/audaspace/intern/AUD_JOSResampleFactory.h
trunk/blender/intern/audaspace/intern/AUD_JOSResampleReader.cpp
trunk/blender/intern/audaspace/intern/AUD_JOSResampleReader.h
trunk/blender/intern/audaspace/intern/AUD_JOSResampleReaderCoeff.cpp
trunk/blender/intern/audaspace/intern/AUD_ReferenceHandler.cpp
trunk/blender/intern/audaspace/intern/AUD_ResampleReader.cpp
trunk/blender/intern/audaspace/intern/AUD_ResampleReader.h
trunk/blender/intern/audaspace/intern/AUD_SequencerEntry.cpp
trunk/blender/intern/audaspace/intern/AUD_SequencerEntry.h
trunk/blender/intern/audaspace/intern/AUD_SequencerHandle.cpp
trunk/blender/intern/audaspace/intern/AUD_SequencerHandle.h
trunk/blender/intern/audaspace/sndfile/AUD_SndFileWriter.cpp
trunk/blender/intern/audaspace/sndfile/AUD_SndFileWriter.h
trunk/blender/release/scripts/startup/bl_ui/properties_data_speaker.py
trunk/blender/source/blender/blenkernel/BKE_speaker.h
trunk/blender/source/blender/blenkernel/intern/speaker.c
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/AnimationExporter.h
trunk/blender/source/blender/makesdna/DNA_speaker_types.h
trunk/blender/source/blender/makesrna/intern/rna_speaker.c
trunk/blender/source/gameengine/Ketsji/BL_Action.cpp
trunk/blender/source/gameengine/Ketsji/BL_Action.h
trunk/blender/source/gameengine/Ketsji/BL_ActionManager.cpp
trunk/blender/source/gameengine/Ketsji/BL_ActionManager.h
Modified: trunk/blender/doc/python_api/rst/bge.types.rst
===================================================================
--- trunk/blender/doc/python_api/rst/bge.types.rst 2011-08-30 08:22:03 UTC (rev 39791)
+++ trunk/blender/doc/python_api/rst/bge.types.rst 2011-08-30 09:15:55 UTC (rev 39792)
@@ -1539,6 +1539,63 @@
Return the value matching key, or the default value if its not found.
:return: The key value or a default.
+ .. method:: playAction(name, start_frame, end_frame, layer=0, priority=0 blendin=0, play_mode=ACT_MODE_PLAY, layer_weight=0.0, ipo_flags=0, speed=1.0)
+
+ Plays an action.
+
+ :arg name: the name of the action
+ :type name: string
+ :arg start: the start frame of the action
+ :type start: float
+ :arg end: the end frame of the action
+ :type end: float
+ :arg layer: the layer the action will play in (actions in different layers are added/blended together)
+ :type layer: integer
+ :arg priority: only play this action if there isn't an action currently playing in this layer with a higher (lower number) priority
+ :type priority: integer
+ :arg blendin: the amount of blending between this animation and the previous one on this layer
+ :type blendin: float
+ :arg play_mode: the play mode
+ :type play_mode: KX_ACTION_PLAY, KX_ACTION_LOOP, or KX_ACTION_PING_PONG
+ :arg layer_weight: how much of the previous layer to use for blending (0 = add)
+ :type layer_weight: float
+ :arg ipo_flags: flags for the old IPO behaviors (force, etc)
+ :type ipo_flags: int bitfield
+ :arg speed: the playback speed of the action as a factor (1.0 = normal speed, 2.0 = 2x speed, etc)
+ :type speed: float
+
+ .. method:: stopAction(layer=0)
+
+ Stop playing the action on the given layer.
+
+ :arg layer: The layer to stop playing.
+ :type layer: integer
+
+ .. method:: getActionFrame(layer=0)
+
+ Gets the current frame of the action playing in the supplied layer.
+
+ :arg layer: The layer that you want to get the frame from.
+ :type layer: integer
+
+ :return: The current frame of the action
+
+ .. method:: setActionFrame(frame, layer=0)
+
+ Set the current frame of the action playing in the supplied layer.
+
+ :arg layer: The layer where you want to set the frame
+ :type layer: integer
+ :arg frame: The frame to set the action to
+ :type frame: float
+
+ .. method:: isPlayingAction(layer=0)
+
+ Checks to see if there is an action playing in the given layer.
+
+ :arg layer: The layer to check for a playing action.
+ :type layer: integer
+
.. class:: KX_IpoActuator(SCA_IActuator)
IPO actuator activates an animation.
Modified: trunk/blender/intern/audaspace/CMakeLists.txt
===================================================================
--- trunk/blender/intern/audaspace/CMakeLists.txt 2011-08-30 08:22:03 UTC (rev 39791)
+++ trunk/blender/intern/audaspace/CMakeLists.txt 2011-08-30 09:15:55 UTC (rev 39792)
@@ -41,6 +41,8 @@
FX/AUD_DelayReader.cpp
FX/AUD_DoubleFactory.cpp
FX/AUD_DoubleReader.cpp
+ FX/AUD_DynamicIIRFilterFactory.cpp
+ FX/AUD_DynamicIIRFilterReader.cpp
FX/AUD_EffectFactory.cpp
FX/AUD_EffectReader.cpp
FX/AUD_EnvelopeFactory.cpp
@@ -66,6 +68,8 @@
FX/AUD_SuperposeReader.cpp
FX/AUD_VolumeFactory.cpp
intern/AUD_3DMath.h
+ intern/AUD_AnimateableProperty.cpp
+ intern/AUD_AnimateableProperty.h
intern/AUD_Buffer.cpp
intern/AUD_Buffer.h
intern/AUD_BufferReader.cpp
@@ -82,14 +86,21 @@
intern/AUD_ConverterFunctions.h
intern/AUD_ConverterReader.cpp
intern/AUD_ConverterReader.h
- intern/AUD_DefaultMixer.cpp
- intern/AUD_DefaultMixer.h
intern/AUD_FileFactory.cpp
intern/AUD_FileFactory.h
+ intern/AUD_FileWriter.cpp
+ intern/AUD_FileWriter.h
intern/AUD_I3DDevice.h
+ intern/AUD_I3DHandle.h
intern/AUD_IDevice.h
intern/AUD_IFactory.h
+ intern/AUD_IHandle.h
intern/AUD_IReader.h
+ intern/AUD_IWriter.h
+ intern/AUD_JOSResampleFactory.cpp
+ intern/AUD_JOSResampleFactory.h
+ intern/AUD_JOSResampleReader.cpp
+ intern/AUD_JOSResampleReader.h
intern/AUD_LinearResampleFactory.cpp
intern/AUD_LinearResampleFactory.h
intern/AUD_LinearResampleReader.cpp
@@ -104,9 +115,15 @@
intern/AUD_ReadDevice.cpp
intern/AUD_ReadDevice.h
intern/AUD_Reference.h
- intern/AUD_ResampleFactory.h
+ intern/AUD_ReferenceHandler.cpp
+ intern/AUD_ResampleReader.cpp
+ intern/AUD_ResampleReader.h
+ intern/AUD_SequencerEntry.cpp
+ intern/AUD_SequencerEntry.h
intern/AUD_SequencerFactory.cpp
intern/AUD_SequencerFactory.h
+ intern/AUD_SequencerHandle.cpp
+ intern/AUD_SequencerHandle.h
intern/AUD_SequencerReader.cpp
intern/AUD_SequencerReader.h
intern/AUD_SilenceFactory.cpp
@@ -131,6 +148,8 @@
FX/AUD_DelayReader.h
FX/AUD_DoubleFactory.h
FX/AUD_DoubleReader.h
+ FX/AUD_DynamicIIRFilterFactory.h
+ FX/AUD_DynamicIIRFilterReader.h
FX/AUD_EffectFactory.h
FX/AUD_EffectReader.h
FX/AUD_EnvelopeFactory.h
@@ -168,9 +187,11 @@
list(APPEND SRC
ffmpeg/AUD_FFMPEGFactory.cpp
ffmpeg/AUD_FFMPEGReader.cpp
+ ffmpeg/AUD_FFMPEGWriter.cpp
ffmpeg/AUD_FFMPEGFactory.h
ffmpeg/AUD_FFMPEGReader.h
+ ffmpeg/AUD_FFMPEGWriter.h
)
endif()
@@ -230,9 +251,11 @@
list(APPEND SRC
sndfile/AUD_SndFileFactory.cpp
sndfile/AUD_SndFileReader.cpp
+ sndfile/AUD_SndFileWriter.cpp
sndfile/AUD_SndFileFactory.h
sndfile/AUD_SndFileReader.h
+ sndfile/AUD_SndFileWriter.h
)
endif()
Modified: trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.cpp 2011-08-30 08:22:03 UTC (rev 39791)
+++ trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.cpp 2011-08-30 09:15:55 UTC (rev 39792)
@@ -32,7 +32,7 @@
#include "AUD_AccumulatorFactory.h"
#include "AUD_CallbackIIRFilterReader.h"
-sample_t accumulatorFilterAdditive(AUD_CallbackIIRFilterReader* reader, void* useless)
+sample_t AUD_AccumulatorFactory::accumulatorFilterAdditive(AUD_CallbackIIRFilterReader* reader, void* useless)
{
float in = reader->x(0);
float lastin = reader->x(-1);
@@ -42,7 +42,7 @@
return out;
}
-sample_t accumulatorFilter(AUD_CallbackIIRFilterReader* reader, void* useless)
+sample_t AUD_AccumulatorFactory::accumulatorFilter(AUD_CallbackIIRFilterReader* reader, void* useless)
{
float in = reader->x(0);
float lastin = reader->x(-1);
@@ -52,14 +52,14 @@
return out;
}
-AUD_AccumulatorFactory::AUD_AccumulatorFactory(AUD_IFactory* factory,
+AUD_AccumulatorFactory::AUD_AccumulatorFactory(AUD_Reference<AUD_IFactory> factory,
bool additive) :
AUD_EffectFactory(factory),
m_additive(additive)
{
}
-AUD_IReader* AUD_AccumulatorFactory::createReader() const
+AUD_Reference<AUD_IReader> AUD_AccumulatorFactory::createReader()
{
return new AUD_CallbackIIRFilterReader(getReader(), 2, 2,
m_additive ? accumulatorFilterAdditive : accumulatorFilter);
Modified: trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.h
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.h 2011-08-30 08:22:03 UTC (rev 39791)
+++ trunk/blender/intern/audaspace/FX/AUD_AccumulatorFactory.h 2011-08-30 09:15:55 UTC (rev 39792)
@@ -33,9 +33,14 @@
#define AUD_ACCUMULATORFACTORY
#include "AUD_EffectFactory.h"
+class AUD_CallbackIIRFilterReader;
/**
* This factory creates an accumulator reader.
+ *
+ * The accumulator adds the difference at the input to the last output in case
+ * it's positive. In additive mode it additionaly adds the difference always.
+ * So in case the difference is positive, it's added twice.
*/
class AUD_AccumulatorFactory : public AUD_EffectFactory
{
@@ -55,9 +60,12 @@
* \param factory The input factory.
* \param additive Whether the accumulator is additive.
*/
- AUD_AccumulatorFactory(AUD_IFactory* factory, bool additive = false);
+ AUD_AccumulatorFactory(AUD_Reference<AUD_IFactory> factory, bool additive = false);
- virtual AUD_IReader* createReader() const;
+ virtual AUD_Reference<AUD_IReader> createReader();
+
+ static sample_t accumulatorFilterAdditive(AUD_CallbackIIRFilterReader* reader, void* useless);
+ static sample_t accumulatorFilter(AUD_CallbackIIRFilterReader* reader, void* useless);
};
#endif //AUD_ACCUMULATORFACTORY
Modified: trunk/blender/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp
===================================================================
--- trunk/blender/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp 2011-08-30 08:22:03 UTC (rev 39791)
+++ trunk/blender/intern/audaspace/FX/AUD_BaseIIRFilterReader.cpp 2011-08-30 09:15:55 UTC (rev 39792)
@@ -33,20 +33,20 @@
#include <cstring>
-#define CC m_channels + m_channel
+#define CC m_specs.channels + m_channel
-AUD_BaseIIRFilterReader::AUD_BaseIIRFilterReader(AUD_IReader* reader, int in,
+AUD_BaseIIRFilterReader::AUD_BaseIIRFilterReader(AUD_Reference<AUD_IReader> reader, int in,
int out) :
AUD_EffectReader(reader),
- m_channels(reader->getSpecs().channels),
+ m_specs(reader->getSpecs()),
m_xlen(in), m_ylen(out),
m_xpos(0), m_ypos(0), m_channel(0)
{
- m_x = new sample_t[in * m_channels];
- m_y = new sample_t[out * m_channels];
+ m_x = new sample_t[m_xlen * m_specs.channels];
+ m_y = new sample_t[m_ylen * m_specs.channels];
- memset(m_x, 0, sizeof(sample_t) * in * m_channels);
- memset(m_y, 0, sizeof(sample_t) * out * m_channels);
+ memset(m_x, 0, sizeof(sample_t) * m_xlen * m_specs.channels);
+ memset(m_y, 0, sizeof(sample_t) * m_ylen * m_specs.channels);
}
AUD_BaseIIRFilterReader::~AUD_BaseIIRFilterReader()
@@ -55,24 +55,77 @@
delete[] m_y;
}
-void AUD_BaseIIRFilterReader::read(int & length, sample_t* & buffer)
+void AUD_BaseIIRFilterReader::setLengths(int in, int out)
{
- sample_t* buf;
+ if(in != m_xlen)
+ {
+ sample_t* xn = new sample_t[in * m_specs.channels];
+ memset(xn, 0, sizeof(sample_t) * in * m_specs.channels);
- int samplesize = AUD_SAMPLE_SIZE(m_reader->getSpecs());
+ for(m_channel = 0; m_channel < m_specs.channels; m_channel++)
+ {
+ for(int i = 1; i <= in && i <= m_xlen; i++)
+ {
+ xn[(in - i) * CC] = x(-i);
+ }
+ }
- m_reader->read(length, buf);
+ delete[] m_x;
+ m_x = xn;
+ m_xpos = 0;
+ m_xlen = in;
+ }
- if(m_buffer.getSize() < length * samplesize)
- m_buffer.resize(length * samplesize);
+ if(out != m_ylen)
+ {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list