[Bf-blender-cvs] [7520672] mesh-transfer-data: Fix crash when no src object specified in modifier.

Bastien Montagne noreply at git.blender.org
Mon Dec 1 17:14:08 CET 2014


Commit: 7520672b818736bf9d909169382cdb81ffc9e2e4
Author: Bastien Montagne
Date:   Mon Dec 1 10:24:46 2014 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB7520672b818736bf9d909169382cdb81ffc9e2e4

Fix crash when no src object specified in modifier.

===================================================================

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 7d057c7..f7f4018 100644
--- a/source/blender/editors/object/object_data_transfer.c
+++ b/source/blender/editors/object/object_data_transfer.c
@@ -554,6 +554,10 @@ static int datalayout_transfer_exec(bContext *C, wmOperator *op)
 
 		const bool use_delete = false;  /* Never when used from modifier, for now. */
 
+		if (!ob_src) {
+			return OPERATOR_CANCELLED;
+		}
+
 		BKE_object_data_transfer_layout(scene, ob_src, ob_dst, dtmd->data_types, use_delete,
 		                                dtmd->layers_select_src, dtmd->layers_select_dst);
 	}




More information about the Bf-blender-cvs mailing list