svn merge ^/trunk/blender -r44189:44204
authorCampbell Barton <ideasman42@gmail.com>
Fri, 17 Feb 2012 20:56:25 +0000 (20:56 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 17 Feb 2012 20:56:25 +0000 (20:56 +0000)
commit48006292d8b3c6c8dd4bfe87bdbe271db93cffff
treeca98c07367717703c5a8801063cc42e0aff5b855
parent4c66e696fbcaefe40f0394fea8fc4a55bb7d6994
parent61596d5bb365a96b4b19adf0ef72ec1ea47212aa
svn merge ^/trunk/blender -r44189:44204
44 files changed:
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_bmesh.h
source/blender/blenkernel/BKE_cdderivedmesh.h
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/BKE_key.h
source/blender/blenkernel/BKE_mesh.h
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/BKE_multires.h
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/BKE_subsurf.h
source/blender/blenkernel/intern/bmesh_private.h
source/blender/blenlib/BLI_editVert.h
source/blender/blenlib/BLI_scanfill.h
source/blender/blenlib/BLI_threads.h
source/blender/blenloader/intern/readfile.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/include/ED_object.h
source/blender/editors/include/ED_util.h
source/blender/editors/include/ED_uvedit.h
source/blender/editors/include/ED_view3d.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/mesh/mesh_intern.h
source/blender/editors/object/object_intern.h
source/blender/editors/sculpt_paint/sculpt_intern.h
source/blender/editors/space_image/space_image.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/transform/transform.h
source/blender/editors/uvedit/uvedit_intern.h
source/blender/editors/uvedit/uvedit_parametrizer.h
source/blender/makesdna/DNA_customdata_types.h
source/blender/makesdna/DNA_defs.h
source/blender/makesdna/DNA_key_types.h
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_meshdata_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_vec_types.h
source/blender/makesrna/RNA_access.h
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.h
source/creator/CMakeLists.txt