diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-07-26 06:50:56 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-07-26 07:45:14 +0300 |
| commit | 2e12114f3b9f3ac94a0a8fe7a184524f4593ddf9 (patch) | |
| tree | df7a5362dfd1adce1ca6aba950bb1d6919e47601 /source/blender/editors/object/object_data_transfer.c | |
| parent | 1882dfc47c18c9b715c36eb7a76d01a306a10580 (diff) | |
| parent | dbd79c097c14d486fe79b91b916a9f854587b27e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/object/object_data_transfer.c')
| -rw-r--r-- | source/blender/editors/object/object_data_transfer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/object/object_data_transfer.c b/source/blender/editors/object/object_data_transfer.c index f56fd560946..0667a8d9676 100644 --- a/source/blender/editors/object/object_data_transfer.c +++ b/source/blender/editors/object/object_data_transfer.c @@ -450,7 +450,7 @@ static bool data_transfer_poll(bContext *C) } /* Used by both OBJECT_OT_data_transfer and OBJECT_OT_datalayout_transfer */ -static bool data_transfer_draw_check_prop(PointerRNA *ptr, PropertyRNA *prop) +static bool data_transfer_draw_check_prop(PointerRNA *ptr, PropertyRNA *prop, void *UNUSED(user_data)) { PropertyRNA *prop_other; @@ -522,7 +522,7 @@ static void data_transfer_ui(bContext *C, wmOperator *op) RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr); /* Main auto-draw call */ - uiDefAutoButsRNA(layout, &ptr, data_transfer_draw_check_prop, UI_BUT_LABEL_ALIGN_NONE, false); + uiDefAutoButsRNA(layout, &ptr, data_transfer_draw_check_prop, NULL, '\0', false); } /* transfers weight from active to selected */ |