svn merge ^/trunk/blender -r40890:40950
authorCampbell Barton <ideasman42@gmail.com>
Fri, 14 Oct 2011 01:35:20 +0000 (01:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 14 Oct 2011 01:35:20 +0000 (01:35 +0000)
commit4e118bb22f246468a6e0a5524c87c0243b7a3d5d
tree7326c91636f991c8bcaa95fe0efd49aa570f4e65
parent7eadd540d48ceaae0078d48a05ede663df3ea01a
parentbe24b4dfccfda38c776545d571897ab17ecc96a6
svn merge ^/trunk/blender -r40890:40950
35 files changed:
source/blender/blenkernel/BKE_cdderivedmesh.h
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/BKE_subsurf.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/anim.c
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/bvhutils.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/constraint.c
source/blender/blenkernel/intern/curve.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/displist.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/key.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenkernel/intern/smoke.c
source/blender/blenlib/intern/path_util.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/curve/editfont.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/mesh/mesh_ops.c
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_transform.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/mathutils/mathutils_Quaternion.c