merge with trunk/2.5 at r24463
authorJoseph Eagar <joeedh@gmail.com>
Sun, 22 Nov 2009 14:06:30 +0000 (14:06 +0000)
committerJoseph Eagar <joeedh@gmail.com>
Sun, 22 Nov 2009 14:06:30 +0000 (14:06 +0000)
commit9fa2a9d18a113698c2d2498a12e468a3a1bf08d4
treee385e870c56d01872f9ca867904a016d4f365e8f
parent3a19c341def9f3bcd2b185293c826ef71c126cb6
parent4617bb68ba4b1c5ab459673fffd98bf7203bb4f2
merge with trunk/2.5 at r24463
37 files changed:
intern/ghost/intern/GHOST_SystemCocoa.h
intern/ghost/intern/GHOST_SystemCocoa.mm
intern/ghost/intern/GHOST_WindowCocoa.h
intern/ghost/intern/GHOST_WindowCocoa.mm
release/datafiles/datatoc.py
release/scripts/modules/bpy_ext/Object.py
release/scripts/modules/bpy_ops.py
release/scripts/ui/space_console.py
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/node.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/drivers.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/poseobject.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/mesh/meshtools.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/transform/transform_manipulator.c
source/blender/editors/transform/transform_orientations.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/python/intern/bpy_interface.c
source/blender/python/intern/bpy_rna.c
source/blender/windowmanager/intern/wm_operators.c
source/creator/creator.c
source/gameengine/Converter/BL_ArmatureChannel.cpp
source/gameengine/Converter/BL_BlenderDataConversion.cpp