svn merge ^/trunk/blender -r43819:43830
authorCampbell Barton <ideasman42@gmail.com>
Thu, 2 Feb 2012 00:04:47 +0000 (00:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 2 Feb 2012 00:04:47 +0000 (00:04 +0000)
commit8926cbd0a78284c24622dafbcf084c2d4b2a1cf8
tree03332b4b83a793648d27b6d3014b71522f0f2ac1
parent4aa82806effa9e114f14f88d7b2da23b0a2bcca6
parentca927b5771aba924b6f13242b4483e9f861d3153
svn merge ^/trunk/blender -r43819:43830
source/blender/editors/mesh/mesh_data.c
source/blender/editors/object/object_bake.c
source/blender/makesrna/intern/rna_mesh.c
source/blender/makesrna/intern/rna_scene.c
source/blender/modifiers/intern/MOD_fluidsim_util.c