svn merge ^/trunk/blender -r42680:42722
authorCampbell Barton <ideasman42@gmail.com>
Mon, 19 Dec 2011 10:40:48 +0000 (10:40 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 19 Dec 2011 10:40:48 +0000 (10:40 +0000)
commit2457d4f5abd65095ae48be937ed43d026d47124a
tree79c9b666420fa06262c90fa8f9d11ec77e285719
parent5c6ee6b523c6a53c310683a9f7fbe5d730db6122
parent90ef435145416313596cafa6f8c4c6c6aebe4e44
svn merge ^/trunk/blender -r42680:42722
19 files changed:
CMakeLists.txt
source/blender/blenkernel/BKE_customdata.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/customdata.c
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_math_vector.h
source/blender/blenlib/intern/math_vector.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/modifiers/intern/MOD_solidify.c
source/blender/modifiers/intern/MOD_uvproject.c
source/blender/modifiers/intern/MOD_weightvgproximity.c
source/blender/windowmanager/intern/wm_init_exit.c