svn merge ^/trunk/blender -r42245:42261
authorCampbell Barton <ideasman42@gmail.com>
Tue, 29 Nov 2011 18:18:56 +0000 (18:18 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 29 Nov 2011 18:18:56 +0000 (18:18 +0000)
commitfaa022563d90a2542409dd43f5baa3f1280f44a0
tree20dfab2000f4181464b2dce5f9fcedec862f5db3
parent198113b232a407a1fcd5282b998564f656df9680
parent1ec4ceac7e203dd5fbb162933134d4c352cea5f7
svn merge ^/trunk/blender -r42245:42261
source/blender/blenkernel/BKE_bmesh.h
source/blender/blenkernel/intern/BME_Customdata.c
source/blender/blenlib/intern/scanfill.c
source/blender/editors/armature/reeb.c
source/blender/editors/object/object_bake.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_util.c
source/blender/modifiers/intern/MOD_util.h
source/blender/render/intern/source/convertblender.c