Merged from trunk
authorIan Thompson <quornian@googlemail.com>
Mon, 9 Jun 2008 14:04:19 +0000 (14:04 +0000)
committerIan Thompson <quornian@googlemail.com>
Mon, 9 Jun 2008 14:04:19 +0000 (14:04 +0000)
commit10d59e720827660ab73801165c3c0925a27c5101
tree36e45ee082b1abdcfcb64906a604fcda9119060d
parent7fd8c2424f339dfad88745e7d39b3ddcb8b484fc
Merged from trunk
svn merge -r14988:15170 https://svn.blender.org/svnroot/bf-blender/trunk/blender
150 files changed:
config/linux2-config.py
config/win32-vc-config.py
extern/SConscript
extern/bFTGL/SConscript
extern/libopenjpeg/SConscript [new file with mode: 0644]
extern/libopenjpeg/bio.c [new file with mode: 0644]
extern/libopenjpeg/bio.h [new file with mode: 0644]
extern/libopenjpeg/cio.c [new file with mode: 0644]
extern/libopenjpeg/cio.h [new file with mode: 0644]
extern/libopenjpeg/dwt.c [new file with mode: 0644]
extern/libopenjpeg/dwt.h [new file with mode: 0644]
extern/libopenjpeg/event.c [new file with mode: 0644]
extern/libopenjpeg/event.h [new file with mode: 0644]
extern/libopenjpeg/fix.h [new file with mode: 0644]
extern/libopenjpeg/image.c [new file with mode: 0644]
extern/libopenjpeg/image.h [new file with mode: 0644]
extern/libopenjpeg/int.h [new file with mode: 0644]
extern/libopenjpeg/j2k.c [new file with mode: 0644]
extern/libopenjpeg/j2k.h [new file with mode: 0644]
extern/libopenjpeg/j2k_lib.c [new file with mode: 0644]
extern/libopenjpeg/j2k_lib.h [new file with mode: 0644]
extern/libopenjpeg/jp2.c [new file with mode: 0644]
extern/libopenjpeg/jp2.h [new file with mode: 0644]
extern/libopenjpeg/jpt.c [new file with mode: 0644]
extern/libopenjpeg/jpt.h [new file with mode: 0644]
extern/libopenjpeg/license.txt [new file with mode: 0644]
extern/libopenjpeg/mct.c [new file with mode: 0644]
extern/libopenjpeg/mct.h [new file with mode: 0644]
extern/libopenjpeg/mqc.c [new file with mode: 0644]
extern/libopenjpeg/mqc.h [new file with mode: 0644]
extern/libopenjpeg/openjpeg.c [new file with mode: 0644]
extern/libopenjpeg/openjpeg.h [new file with mode: 0644]
extern/libopenjpeg/opj_includes.h [new file with mode: 0644]
extern/libopenjpeg/opj_malloc.h [new file with mode: 0644]
extern/libopenjpeg/pi.c [new file with mode: 0644]
extern/libopenjpeg/pi.h [new file with mode: 0644]
extern/libopenjpeg/raw.c [new file with mode: 0644]
extern/libopenjpeg/raw.h [new file with mode: 0644]
extern/libopenjpeg/t1.c [new file with mode: 0644]
extern/libopenjpeg/t1.h [new file with mode: 0644]
extern/libopenjpeg/t1_generate_luts.c [new file with mode: 0644]
extern/libopenjpeg/t1_luts.h [new file with mode: 0644]
extern/libopenjpeg/t2.c [new file with mode: 0644]
extern/libopenjpeg/t2.h [new file with mode: 0644]
extern/libopenjpeg/tcd.c [new file with mode: 0644]
extern/libopenjpeg/tcd.h [new file with mode: 0644]
extern/libopenjpeg/tgt.c [new file with mode: 0644]
extern/libopenjpeg/tgt.h [new file with mode: 0644]
extern/libredcode/AUTHOR [new file with mode: 0644]
extern/libredcode/LICENSE [new file with mode: 0644]
extern/libredcode/NOTES [new file with mode: 0644]
extern/libredcode/SConscript [new file with mode: 0644]
extern/libredcode/codec.c [new file with mode: 0644]
extern/libredcode/codec.h [new file with mode: 0644]
extern/libredcode/debayer.c [new file with mode: 0644]
extern/libredcode/debayer.h [new file with mode: 0644]
extern/libredcode/format.c [new file with mode: 0644]
extern/libredcode/format.h [new file with mode: 0644]
intern/bsp/SConscript
intern/guardedalloc/intern/mmap_win.c
release/scripts/import_dxf.py
release/scripts/uv_from_adjacent.py [deleted file]
release/scripts/uv_seams_from_islands.py
release/scripts/uvcalc_lightmap.py
release/windows/installer/00.sconsblender.nsi
source/blender/blenkernel/BKE_bmesh.h
source/blender/blenkernel/BKE_bmeshCustomData.h [new file with mode: 0644]
source/blender/blenkernel/BKE_cloth.h
source/blender/blenkernel/BKE_collision.h
source/blender/blenkernel/intern/BME_Customdata.c [new file with mode: 0644]
source/blender/blenkernel/intern/BME_conversions.c
source/blender/blenkernel/intern/BME_mesh.c
source/blender/blenkernel/intern/BME_structure.c
source/blender/blenkernel/intern/BME_tools.c
source/blender/blenkernel/intern/bmesh_private.h
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/kdop.c [deleted file]
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/blenlib/BLI_kdopbvh.h [new file with mode: 0644]
source/blender/blenlib/intern/BLI_kdopbvh.c [new file with mode: 0644]
source/blender/blenlib/intern/bpath.c
source/blender/blenlib/intern/util.c
source/blender/blenloader/intern/readfile.c
source/blender/imbuf/SConscript
source/blender/imbuf/intern/IMB_anim.h
source/blender/imbuf/intern/anim.c
source/blender/imbuf/intern/util.c
source/blender/include/BIF_editseq.h
source/blender/include/BSE_view.h
source/blender/include/transform.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/python/BPY_interface.c
source/blender/python/api2_2x/Blender.c
source/blender/python/api2_2x/Draw.c
source/blender/python/api2_2x/Material.c
source/blender/python/api2_2x/Node.c
source/blender/python/api2_2x/Object.c
source/blender/python/api2_2x/Particle.c
source/blender/python/api2_2x/Scene.c
source/blender/python/api2_2x/Sys.c
source/blender/python/api2_2x/doc/Object.py
source/blender/python/api2_2x/sceneRender.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/extern/include/RE_raytrace.h
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/envmap.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/rendercore.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_object.c
source/blender/src/buttons_scene.c
source/blender/src/drawipo.c
source/blender/src/drawobject.c
source/blender/src/drawseq.c
source/blender/src/drawview.c
source/blender/src/editaction.c
source/blender/src/editarmature.c
source/blender/src/editmesh_tools.c
source/blender/src/editnode.c
source/blender/src/editseq.c
source/blender/src/filesel.c
source/blender/src/fluidsim.c
source/blender/src/interface.c
source/blender/src/meshtools.c
source/blender/src/space.c
source/blender/src/toets.c
source/blender/src/transform.c
source/blender/src/transform_conversions.c
source/blender/src/transform_manipulator.c
source/blender/src/transform_orientations.c
source/blender/src/view.c
source/creator/creator.c
source/gameengine/Converter/BL_ArmatureObject.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_GameObject.h
source/gameengine/Ketsji/KX_RayCast.cpp
source/gameengine/PyDoc/KX_GameObject.py
source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h
tools/btools.py