diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-04-09 06:14:55 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-04-09 06:14:55 +0400 |
| commit | b7113002dbea417617e3ef655d42732ade16577e (patch) | |
| tree | 0d79ad2a8a783482058ae5038c4b9b2b04bc5cf0 /source/blender/blenkernel/BKE_customdata.h | |
| parent | bcd6c84a66280c5eeed363c91638deeecbcb91f1 (diff) | |
Fix bug [#30863] Array Modifier Start and End Cap cause crash when the Cap Object has vertex group
Another crash with array caps, was caused by not making a deep enough
copy of CD field.
Also fixed the type of the 'mask' parameter, was int where it should
be 64-bit.
Diffstat (limited to 'source/blender/blenkernel/BKE_customdata.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_customdata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 9797aa1201f..6a3625e2133 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -111,7 +111,7 @@ void CustomData_merge(const struct CustomData *source, struct CustomData *dest, * then goes through the mesh and makes sure all the customdata blocks are * consistent with the new layout.*/ void CustomData_bmesh_merge(struct CustomData *source, struct CustomData *dest, - int mask, int alloctype, struct BMesh *bm, const char htype); + CustomDataMask mask, int alloctype, struct BMesh *bm, const char htype); /* frees data associated with a CustomData object (doesn't free the object * itself, though) |