svn merge ^/trunk/blender -r42914:42918
authorCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 10:27:25 +0000 (10:27 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 28 Dec 2011 10:27:25 +0000 (10:27 +0000)
commitff2eb8d72f5cad83e16edcc22c6d4340e3ad72c9
tree7731c6131c654dbc422b5ff701f12c0d1a1a6d74
parent2da527b0179b70d9831fd76adc74c7df0f229c8f
parent2e92b14bc6c9280b488061b9f4a4326d4ae69c10
svn merge ^/trunk/blender -r42914:42918
source/blender/blenkernel/intern/customdata.c
source/blender/modifiers/intern/MOD_explode.c