archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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

Browse Source 
Mismatch in poll and exec funcs when getting active (source) object...
This commit is contained in:
Bastien Montagne
2015-05-04 14:28:52 +02:00
parent 5a8629c0d7
commit e560bbe1d5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/object/object_data_transfer.c
View File

@@ -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);
}