diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-12-28 14:27:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-28 14:27:25 +0400 |
commit | ff2eb8d72f5cad83e16edcc22c6d4340e3ad72c9 (patch) | |
tree | 7731c6131c654dbc422b5ff701f12c0d1a1a6d74 /source/blender/blenkernel/intern | |
parent | 2da527b0179b70d9831fd76adc74c7df0f229c8f (diff) | |
parent | 2e92b14bc6c9280b488061b9f4a4326d4ae69c10 (diff) |
svn merge ^/trunk/blender -r42914:42918
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 1678642a248..ae3bbfc333d 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -1138,7 +1138,6 @@ const CustomDataMask CD_MASK_FACECORNERS = CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_MTEXPOLY | CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL; - static const LayerTypeInfo *layerType_getInfo(int type) { if(type < 0 || type >= CD_NUMTYPES) return NULL; |