diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 12:08:02 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-05-31 12:08:02 +0300 |
| commit | 17f458ff320c5c0a0c5cdaeb5da60926d3e03d68 (patch) | |
| tree | a67031752a7f2011e5cd4ee6b761eb0ad1a274e8 /source/blender/editors/space_image/image_ops.c | |
| parent | fcfe1963a622fed257b8b9597424bf11edb19c52 (diff) | |
| parent | 24d1829243c6e41c639c1d0722a13599a7c1927c (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/space_image/image_ops.c')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index a2afb5cb5c5..9b146644894 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -2828,7 +2828,7 @@ static int image_unpack_exec(bContext *C, wmOperator *op) /* XXX unpackImage frees image buffers */ ED_preview_kill_jobs(CTX_wm_manager(C), CTX_data_main(C)); - unpackImage(op->reports, ima, method); + unpackImage(CTX_data_main(C), op->reports, ima, method); WM_event_add_notifier(C, NC_IMAGE | NA_EDITED, ima); |