Commit: 8a551394e50a96d3a78f37525df0825e11ba9fd8
Author: Campbell Barton
Date: Tue Mar 10 19:46:24 2015 +1100
Branches: master
https://developer.blender.org/rB8a551394e50a96d3a78f37525df0825e11ba9fd8
Fix crash in mesh data transfer
===================================================================
M source/blender/editors/object/object_data_transfer.c
===================================================================
diff --git a/source/blender/editors/object/object_data_transfer.c
b/source/blender/editors/object/object_data_transfer.c
index c57cae4..b39e847 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;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
