Merge from trunk
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Wed, 11 Jun 2008 22:53:52 +0000 (22:53 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Wed, 11 Jun 2008 22:53:52 +0000 (22:53 +0000)
commit39d35edbe680424f88ddc2cff8ecd86fb77fae89
tree2339f4372eb36dd2b5a36500c9c6ea484d4c39c5
parentb5432c6780d41302155f8aad382be173341bdea2
Merge from trunk
svn merge -r 15104:15202 https://svn.blender.org/svnroot/bf-blender/trunk/blender
59 files changed:
extern/bFTGL/SConscript
extern/libopenjpeg/opj_malloc.h
extern/libopenjpeg/patches/osx.patch [new file with mode: 0644]
release/datafiles/blenderbuttons
release/scripts/import_dxf.py
source/blender/blenkernel/BKE_object.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/pointcache.c
source/blender/blenkernel/intern/text.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/intern/BLI_kdopbvh.c
source/blender/blenlib/intern/arithb.c
source/blender/blenlib/intern/bpath.c
source/blender/blenlib/intern/util.c
source/blender/include/BIF_resources.h
source/blender/include/BSE_view.h
source/blender/include/transform.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/python/BPY_interface.c
source/blender/python/api2_2x/Blender.c
source/blender/python/api2_2x/Object.c
source/blender/python/api2_2x/Particle.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/intern/include/render_types.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/rendercore.c
source/blender/src/blenderbuttons.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/drawmesh.c
source/blender/src/drawview.c
source/blender/src/editmesh_lib.c
source/blender/src/editnode.c
source/blender/src/editparticle.c
source/blender/src/header_view3d.c
source/blender/src/meshtools.c
source/blender/src/space.c
source/blender/src/transform.c
source/blender/src/transform_generics.c
source/blender/src/transform_snap.c
source/blender/src/view.c
source/gameengine/Converter/BL_ArmatureObject.cpp
source/gameengine/GamePlayer/common/GPC_PolygonMaterial.cpp
source/gameengine/Ketsji/KX_BlenderMaterial.cpp
source/gameengine/Ketsji/KX_RayCast.cpp
source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_GLExtensionManager.h