copied across changes which were missed by merging.
authorCampbell Barton <ideasman42@gmail.com>
Mon, 9 May 2011 02:45:52 +0000 (02:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 9 May 2011 02:45:52 +0000 (02:45 +0000)
commit14a2330d7b4edbb294b77072f99283cdd0fa6bae
treee9fe439775625c3d42e057ea5d366c1767033ce6
parent6ef77cf95accc3cb914e7efd964118ce6e9521cf
copied across changes which were missed by merging.
138 files changed:
build_files/cmake/example_scripts/make_quicky.py
doc/BL-license.txt [deleted file]
doc/bf-members.txt [deleted file]
doc/blender.1 [deleted file]
extern/libopenjpeg/CMakeLists.txt
intern/SoundSystem/CMakeLists.txt [deleted file]
intern/SoundSystem/Makefile [deleted file]
intern/SoundSystem/SConscript [deleted file]
intern/SoundSystem/SND_C-api.h [deleted file]
intern/SoundSystem/SND_CDObject.h [deleted file]
intern/SoundSystem/SND_DependKludge.h [deleted file]
intern/SoundSystem/SND_DeviceManager.h [deleted file]
intern/SoundSystem/SND_IAudioDevice.h [deleted file]
intern/SoundSystem/SND_Scene.h [deleted file]
intern/SoundSystem/SND_SoundListener.h [deleted file]
intern/SoundSystem/SND_SoundObject.h [deleted file]
intern/SoundSystem/SND_Utils.h [deleted file]
intern/SoundSystem/SND_WaveCache.h [deleted file]
intern/SoundSystem/SND_WaveSlot.h [deleted file]
intern/SoundSystem/SND_test/Makefile [deleted file]
intern/SoundSystem/SND_test/SND_test.c [deleted file]
intern/SoundSystem/SoundDefines.h [deleted file]
intern/SoundSystem/dummy/Makefile [deleted file]
intern/SoundSystem/dummy/SND_DummyDevice.cpp [deleted file]
intern/SoundSystem/dummy/SND_DummyDevice.h [deleted file]
intern/SoundSystem/intern/Makefile [deleted file]
intern/SoundSystem/intern/SND_AudioDevice.cpp [deleted file]
intern/SoundSystem/intern/SND_AudioDevice.h [deleted file]
intern/SoundSystem/intern/SND_C-api.cpp [deleted file]
intern/SoundSystem/intern/SND_CDObject.cpp [deleted file]
intern/SoundSystem/intern/SND_DeviceManager.cpp [deleted file]
intern/SoundSystem/intern/SND_IdObject.cpp [deleted file]
intern/SoundSystem/intern/SND_IdObject.h [deleted file]
intern/SoundSystem/intern/SND_Scene.cpp [deleted file]
intern/SoundSystem/intern/SND_SoundListener.cpp [deleted file]
intern/SoundSystem/intern/SND_SoundObject.cpp [deleted file]
intern/SoundSystem/intern/SND_Utils.cpp [deleted file]
intern/SoundSystem/intern/SND_WaveCache.cpp [deleted file]
intern/SoundSystem/intern/SND_WaveSlot.cpp [deleted file]
intern/SoundSystem/make/msvc_6_0/SoundSystem.dsp [deleted file]
intern/SoundSystem/make/msvc_6_0/dummy/DummySoundSystem.dsp [deleted file]
intern/SoundSystem/make/msvc_6_0/openal/OpenALSoundSystem.dsp [deleted file]
intern/SoundSystem/make/msvc_7_0/SoundSystem.vcproj [deleted file]
intern/SoundSystem/make/msvc_7_0/dummy/DummySoundSystem.vcproj [deleted file]
intern/SoundSystem/make/msvc_7_0/openal/OpenALSoundSystem.vcproj [deleted file]
intern/SoundSystem/make/msvc_9_0/SoundSystem.vcproj [deleted file]
intern/SoundSystem/make/msvc_9_0/dummy/DummySoundSystem.vcproj [deleted file]
intern/SoundSystem/make/msvc_9_0/openal/OpenALSoundSystem.vcproj [deleted file]
intern/SoundSystem/openal/Makefile [deleted file]
intern/SoundSystem/openal/SND_OpenALDevice.cpp [deleted file]
intern/SoundSystem/openal/SND_OpenALDevice.h [deleted file]
intern/SoundSystem/openal/pthread_cancel.cpp [deleted file]
intern/SoundSystem/sdl/Makefile [deleted file]
intern/SoundSystem/sdl/SND_SDLCDDevice.cpp [deleted file]
intern/SoundSystem/sdl/SND_SDLCDDevice.h [deleted file]
intern/container/CTR_HashedPtr.h [moved from intern/SoundSystem/SND_Object.h with 59% similarity]
intern/decimation/SConscript
intern/elbeem/intern/elbeem.h [deleted file]
intern/guardedalloc/SConscript
intern/itasc/kdl/frameacc.hpp
intern/opennl/superlu/sgstrf.c
intern/string/SConscript
release/plugins/sequence/Makefile [deleted file]
release/scripts/export_cal3d.py [deleted file]
release/scripts/modules/bpy/app.py [deleted file]
release/scripts/modules/bpy_ops.py [deleted file]
release/scripts/modules/dynamic_menu.py [deleted file]
release/scripts/op/add_mesh_torus.py [deleted file]
release/scripts/op/animsys_update.py [deleted file]
release/scripts/op/console_python.py [deleted file]
release/scripts/op/fcurve_euler_filter.py [deleted file]
release/scripts/op/image.py [deleted file]
release/scripts/op/mesh.py [deleted file]
release/scripts/op/nla.py [deleted file]
release/scripts/op/object.py [deleted file]
release/scripts/op/object_align.py [deleted file]
release/scripts/op/object_randomize_transform.py [deleted file]
release/scripts/op/presets.py [deleted file]
release/scripts/op/screen_play_rendered_anim.py [deleted file]
release/scripts/op/sequencer.py [deleted file]
release/scripts/op/uv.py [deleted file]
release/scripts/op/uvcalc_follow_active.py [deleted file]
release/scripts/op/uvcalc_smart_project.py [deleted file]
release/scripts/op/vertexpaint_dirt.py [deleted file]
release/scripts/op/wm.py [deleted file]
release/scripts/presets/interaction/maya.py
release/scripts/startup/bl_ui/space_info.py
release/scripts/templates/operator.py [deleted file]
release/scripts/uv_from_adjacent.py [deleted file]
release/windows/installer/01.installer.bmp [new file with mode: 0644]
source/blender/editors/armature/poseobject.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_constraint.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_transform.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/screen/Makefile [deleted file]
source/blender/editors/space_file/Makefile [deleted file]
source/blender/editors/space_image/Makefile [deleted file]
source/blender/editors/space_info/Makefile [deleted file]
source/blender/gpu/GPU_material.h
source/blender/ikplugin/intern/itasc_plugin.cpp
source/blender/makesdna/intern/SConscript
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/SConscript
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_constraint.c
source/blender/makesrna/intern/rna_fcurve.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/rna_cleanup/rna_properties.txt
source/blender/makesrna/rna_cleanup/rna_update.sh
source/blender/nodes/intern/SHD_nodes/SHD_output.c
source/blender/python/BPY_menus.c [deleted file]
source/blender/python/BPY_menus.h [deleted file]
source/blender/python/Makefile [deleted file]
source/blender/python/epy_doc_gen.py [deleted file]
source/blender/python/intern/Makefile [deleted file]
source/blender/python/intern/bpy_rna.h
source/blender/python/intern/bpy_ui.c [deleted file]
source/blender/python/intern/bpy_ui.h [deleted file]
source/blender/python/simple_enum_gen.py
source/blender/readblenfile/intern/BLO_readblenfile.c
source/blender/render/intern/raytrace/reorganize.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/pointdensity.c
source/blender/render/intern/source/shadeoutput.c
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c
source/creator/CMakeLists.txt
source/creator/creator.c
source/gameengine/Ketsji/SConscript
source/gameengine/Rasterizer/SConscript