svn merge -r41751:41779 ^/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Tue, 15 Nov 2011 02:05:32 +0000 (02:05 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 15 Nov 2011 02:05:32 +0000 (02:05 +0000)
commite59ab6486f9e7285815671044b785c28365d5165
tree4a9406c8181a817a8b96243ae167acc740ed20f7
parent35ab6cabbf62187290e417dba6d8b18cd4fe18de
parentb1019a56b54294fc91293c5c43ef46d54950ae84
svn merge -r41751:41779  ^/trunk/blender
51 files changed:
CMakeLists.txt
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/multires.c
source/blender/blenkernel/intern/particle.c
source/blender/blenlib/BLI_edgehash.h
source/blender/blenlib/BLI_math_geom.h
source/blender/blenlib/intern/math_geom.c
source/blender/blenlib/intern/pbvh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/reeb.c
source/blender/editors/curve/editcurve.c
source/blender/editors/mesh/mesh_data.c
source/blender/editors/object/object_bake.c
source/blender/editors/object/object_edit.c
source/blender/editors/object/object_hook.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_generics.c
source/blender/editors/transform/transform_orientations.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_armature.c
source/blender/modifiers/intern/MOD_array.c
source/blender/modifiers/intern/MOD_boolean.c
source/blender/modifiers/intern/MOD_curve.c
source/blender/modifiers/intern/MOD_displace.c
source/blender/modifiers/intern/MOD_hook.c
source/blender/modifiers/intern/MOD_lattice.c
source/blender/modifiers/intern/MOD_mirror.c
source/blender/modifiers/intern/MOD_smooth.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/render_texture.c
source/gameengine/Physics/Bullet/CcdPhysicsController.cpp