svn merge ^/trunk/blender -r40367:40368 --- raddish weight paint merge
authorCampbell Barton <ideasman42@gmail.com>
Thu, 22 Sep 2011 16:09:27 +0000 (16:09 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 22 Sep 2011 16:09:27 +0000 (16:09 +0000)
commit7126a4699e3b85f47cd2cc84bdb6a511e9a17f69
tree74af0d993321a75c5a3fb61e6fbeca2011784b24
parent52a131b6006e131b02225040d0c9e48f5fd8efac
parent535668eef01b29b18b71022d1d8f04962251e34c
svn merge ^/trunk/blender -r40367:40368  --- raddish weight paint merge
25 files changed:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_paint.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/meshlaplacian.c
source/blender/editors/include/ED_mesh.h
source/blender/editors/include/ED_view3d.h
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/editface.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_ops.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/sculpt_paint/paint_utils.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/editors/space_view3d/space_view3d.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_scene.c