diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-03-10 11:46:24 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-03-10 11:46:24 +0300 |
| commit | 8a551394e50a96d3a78f37525df0825e11ba9fd8 (patch) | |
| tree | 351fb31ab25f273c5121b1d28bd4487cdf73faa4 | |
| parent | 95a1cc20dcfaa3d8c16bd0e6481e65c825f3d982 (diff) | |
Fix crash in mesh data transfer
| -rw-r--r-- | source/blender/editors/object/object_data_transfer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c index c57cae41bf4..b39e8470a95 100644 --- a/source/blender/editors/object/object_data_transfer.c +++ b/source/blender/editors/object/object_data_transfer.c @@ -299,7 +299,7 @@ static bool data_transfer_exec_is_object_valid( wmOperator *op, Object *ob_src, Object *ob_dst, const bool reverse_transfer) { Mesh *me; - if ((ob_dst == ob_src) || !ELEM(OB_MESH, ob_src->type, ob_dst->type)) { + if ((ob_dst == ob_src) || (ob_src->type != OB_MESH) || (ob_dst->type != OB_MESH)) { return false; } |