diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-01-08 18:25:17 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-08 18:25:17 +0400 |
commit | e62bc29a9b5a4bb69547bb565e9793fca6df5b76 (patch) | |
tree | be930627645be7deca26d46f33f54758143b8dbb /source/blender/blenkernel/BKE_customdata.h | |
parent | 5042a0a8ef8bb4a3247b924bd1f34710d0a9fa0f (diff) |
fix [#33792] Accessing a bmesh object created by from_object crashes blender
Issue was customdata wasnt being initialized for layers in the destination BMesh but not in the source data.
Diffstat (limited to 'source/blender/blenkernel/BKE_customdata.h')
-rw-r--r-- | source/blender/blenkernel/BKE_customdata.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_customdata.h b/source/blender/blenkernel/BKE_customdata.h index 4736e7b7312..70532384643 100644 --- a/source/blender/blenkernel/BKE_customdata.h +++ b/source/blender/blenkernel/BKE_customdata.h @@ -39,6 +39,7 @@ extern "C" { #endif #include "../blenloader/BLO_sys_types.h" /* XXX, should have a more generic include for this */ +#include "BLI_utildefines.h" struct BMesh; struct ID; @@ -304,7 +305,7 @@ void CustomData_bmesh_free_block(struct CustomData *data, void **block); /* copy custom data to/from layers as in mesh/derivedmesh, to editmesh * blocks of data. the CustomData's must not be compatible */ void CustomData_to_bmesh_block(const struct CustomData *source, - struct CustomData *dest, int src_index, void **dest_block); + struct CustomData *dest, int src_index, void **dest_block, bool use_default_init); void CustomData_from_bmesh_block(const struct CustomData *source, struct CustomData *dest, void *src_block, int dest_index); |