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/gpencil/gpencil_convert.c | |
| parent | 1882dfc47c18c9b715c36eb7a76d01a306a10580 (diff) | |
| parent | dbd79c097c14d486fe79b91b916a9f854587b27e (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/gpencil/gpencil_convert.c')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_convert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/gpencil/gpencil_convert.c b/source/blender/editors/gpencil/gpencil_convert.c index ccdbcba71f9..c97c72e17c5 100644 --- a/source/blender/editors/gpencil/gpencil_convert.c +++ b/source/blender/editors/gpencil/gpencil_convert.c @@ -1382,7 +1382,7 @@ static int gp_convert_layer_exec(bContext *C, wmOperator *op) return OPERATOR_FINISHED; } -static bool gp_convert_draw_check_prop(PointerRNA *ptr, PropertyRNA *prop) +static bool gp_convert_draw_check_prop(PointerRNA *ptr, PropertyRNA *prop, void *UNUSED(user_data)) { const char *prop_id = RNA_property_identifier(prop); const bool link_strokes = RNA_boolean_get(ptr, "use_link_strokes"); @@ -1455,7 +1455,7 @@ static void gp_convert_ui(bContext *C, wmOperator *op) RNA_pointer_create(&wm->id, op->type->srna, op->properties, &ptr); /* Main auto-draw call */ - uiDefAutoButsRNA(layout, &ptr, gp_convert_draw_check_prop, UI_BUT_LABEL_ALIGN_NONE, false); + uiDefAutoButsRNA(layout, &ptr, gp_convert_draw_check_prop, NULL, '\0', false); } void GPENCIL_OT_convert(wmOperatorType *ot) |