diff options
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 | ||||
-rw-r--r-- | source/blender/editors/undo/ed_undo.c | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b251693a13b..9267e956642 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3923,10 +3923,9 @@ static void direct_link_image(FileData *fd, Image *ima) /* undo system, try to restore render buffers */ link_list(fd, &(ima->renderslots)); if (fd->imamap) { - int a; - - LISTBASE_FOREACH(RenderSlot *, slot, &ima->renderslots) + LISTBASE_FOREACH(RenderSlot *, slot, &ima->renderslots) { slot->render = newimaadr(fd, slot->render); + } } else { LISTBASE_FOREACH(RenderSlot *, slot, &ima->renderslots) diff --git a/source/blender/editors/undo/ed_undo.c b/source/blender/editors/undo/ed_undo.c index 102065f5295..a28e24bc0f7 100644 --- a/source/blender/editors/undo/ed_undo.c +++ b/source/blender/editors/undo/ed_undo.c @@ -319,7 +319,7 @@ int ED_undo_operator_repeat(bContext *C, wmOperator *op) /* keep in sync with logic in view3d_panel_operator_redo() */ ARegion *ar_orig = CTX_wm_region(C); ARegion *ar_win = BKE_area_find_region_active_win(CTX_wm_area(C)); - + if (ar_win) { CTX_wm_region_set(C, ar_win); } |