diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-03 12:59:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-03 12:59:15 +0300 |
| commit | cd4f925f564a01d96038c83a9d39396e275f71a4 (patch) | |
| tree | e72edf52555925e6373a8831e97c5e78294e0f2a /source/blender | |
| parent | 4c53f2000f603e13c091c533bccc0e694b5d34ad (diff) | |
| parent | d19d094ca9bb4f05b0f95c9f168340050864f103 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/external_engine.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 81a7640610d..c541d9590f9 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -2971,7 +2971,7 @@ uiPieMenu *UI_pie_menu_begin(struct bContext *C, const char *title, int icon, co wmWindow *win = CTX_wm_window(C); style = UI_style_get_dpi(); - pie = MEM_callocN(sizeof(uiPopupMenu), "pie menu"); + pie = MEM_callocN(sizeof(*pie), "pie menu"); pie->block_radial = UI_block_begin(C, NULL, __func__, UI_EMBOSS); /* may be useful later to allow spawning pies diff --git a/source/blender/render/intern/source/external_engine.c b/source/blender/render/intern/source/external_engine.c index 960bdf57b09..15a49480d1a 100644 --- a/source/blender/render/intern/source/external_engine.c +++ b/source/blender/render/intern/source/external_engine.c @@ -300,7 +300,7 @@ void RE_engine_end_result(RenderEngine *engine, RenderResult *result, int cancel RenderPart *pa = get_part_from_result(re, result); if (pa) { - pa->status = (merge_results)? PART_STATUS_MERGED: PART_STATUS_RENDERED; + pa->status = (!cancel && merge_results)? PART_STATUS_MERGED: PART_STATUS_RENDERED; } else if (re->result->do_exr_tile) { /* if written result does not match any tile and we are using save |