svn merge -r39878:39890 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorCampbell Barton <ideasman42@gmail.com>
Sat, 3 Sep 2011 12:57:33 +0000 (12:57 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 3 Sep 2011 12:57:33 +0000 (12:57 +0000)
commit58227c1016061f90efcab0d00de912e9d9bd315b
tree7db7fe33b3d39f55a8a3e3a82714d24067318e16
parent5c22d9f916ae8ec4a2df2aee23fa962739ecdebc
parenta01ffbbddb40c8f14f10aa5edf0cd1ba5dcc6942
svn merge -r39878:39890 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenkernel/intern/customdata.c
source/blender/editors/object/object_edit.c