diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2021-04-22 12:09:49 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2021-04-22 12:09:49 +0300 |
| commit | fc4ac7d2577c661860163b747c981d3ad856f9f9 (patch) | |
| tree | e561b8b999942d2ecac978983daad34aa8cf4413 /source/blender/editors/screen | |
| parent | 4588609fc3eebf77700475ae32af53b7fb60dc81 (diff) | |
| parent | 7192ab614b49258cdbd70a9f020f3566a4e0c0a6 (diff) | |
Merge remote-tracking branch 'origin/master' into asset-browser-poselib
I had to manually add a `bContext *` parameter to a
`node_geometry_add_attribute_search_button()` call to fix a compiler
error.
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/screendump.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/editors/screen/screendump.c b/source/blender/editors/screen/screendump.c index ff0dab7f1c7..6df96b1e30f 100644 --- a/source/blender/editors/screen/screendump.c +++ b/source/blender/editors/screen/screendump.c @@ -213,9 +213,8 @@ static void screenshot_draw(bContext *UNUSED(C), wmOperator *op) uiTemplateImageSettings(layout, &ptr, false); /* main draw call */ - RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr); uiDefAutoButsRNA( - layout, &ptr, screenshot_draw_check_prop, NULL, NULL, UI_BUT_LABEL_ALIGN_NONE, false); + layout, op->ptr, screenshot_draw_check_prop, NULL, NULL, UI_BUT_LABEL_ALIGN_NONE, false); } static bool screenshot_poll(bContext *C) |