svn merge ^/trunk/blender -r42303:42329
authorCampbell Barton <ideasman42@gmail.com>
Fri, 2 Dec 2011 01:01:07 +0000 (01:01 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 2 Dec 2011 01:01:07 +0000 (01:01 +0000)
commit15ad39e6848ea54da8a3f36b867f8b09a7b8b163
tree53e4f1c2f37d0e2f3679e284a8f7c0f3f66f6d5c
parentce6487291349b00a85f265d2b8cfb682e2bb8086
parent1936b31cd0f7741ec39f638cc57286e5b379134c
svn merge ^/trunk/blender -r42303:42329
14 files changed:
intern/cycles/blender/blender_mesh.cpp
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/editderivedbmesh.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/mesh_validate.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/intern/dna_genfile.c
source/blender/makesrna/RNA_access.h