svn merge ^/trunk/blender -r40872:40890
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Oct 2011 22:50:01 +0000 (22:50 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Oct 2011 22:50:01 +0000 (22:50 +0000)
commit7eadd540d48ceaae0078d48a05ede663df3ea01a
tree4c7743146970928e7d73ad768249d5d5d9b5ab54
parent02b409ee1320e5f2bb473ef1410bef165efbb51c
parentf6cd962df7c5f70570647e5b0cadcb632717ad3d
svn merge ^/trunk/blender -r40872:40890
15 files changed:
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/editderivedbmesh.c
source/blender/blenkernel/intern/mesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/makesrna/intern/rna_object.c
source/blender/modifiers/CMakeLists.txt
source/blender/modifiers/intern/MOD_util.c