[Bf-blender-cvs] [e560bbe] master: Fix possible crash with datatransfer operator when source object was hidden.

[Bastien Montagne]

Commit: e560bbe1d584871ffda3569ac3b4ac1129389e6e
Author: Bastien Montagne
Date:   Mon May 4 14:28:52 2015 +0200
Branches: master
https://developer.blender.org/rBe560bbe1d584871ffda3569ac3b4ac1129389e6e

Fix possible crash with datatransfer operator when source object was hidden.

Mismatch in poll and exec funcs when getting active (source) object...

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

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 b39e847..a7802b6 100644
--- a/source/blender/editors/object/object_data_transfer.c
+++ b/source/blender/editors/object/object_data_transfer.c
@@ -325,7 +325,7 @@ static bool data_transfer_exec_is_object_valid(
 static int data_transfer_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene = CTX_data_scene(C);
-	Object *ob_src = CTX_data_active_object(C);
+	Object *ob_src = ED_object_active_context(C);
 
 	ListBase ctx_objects;
 	CollectionPointerLink *ctx_ob_dst;
@@ -419,7 +419,7 @@ static int data_transfer_exec(bContext *C, wmOperator *op)
 /* Note this context poll is only really partial, it cannot check for all possible invalid cases. */
 static int data_transfer_poll(bContext *C)
 {
-	Object *ob = ED_object_context(C);
+	Object *ob = ED_object_active_context(C);
 	ID *data = (ob) ? ob->data : NULL;
 	return (ob && ob->type == OB_MESH && data);
 }