svn merge ^/trunk/blender -r42521:42550
authorCampbell Barton <ideasman42@gmail.com>
Sat, 10 Dec 2011 05:38:00 +0000 (05:38 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 10 Dec 2011 05:38:00 +0000 (05:38 +0000)
commit65f3b93f144699fa4aafa46c7e226aa1390b7239
tree1a9599589c98d9e17631844fd011463031fe59cd
parent99d893bb89a96dd0d6cb9410b12928e7ade4b565
parenta88b29c062f32514e4414bfd4006f7b348077a42
svn merge ^/trunk/blender -r42521:42550
17 files changed:
intern/cycles/blender/blender_mesh.cpp
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/editderivedmesh.c
source/blender/blenkernel/intern/mesh_validate.c
source/blender/blenkernel/intern/particle.c
source/blender/editors/armature/editarmature.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/modifiers/intern/MOD_hook.c
source/blender/modifiers/intern/MOD_mask.c
source/blender/render/intern/source/render_texture.c