diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-08 21:31:08 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-08 21:31:08 +0300 |
| commit | a2726e80d1ddc8f4c92eaeaeaf33d1e59b06392a (patch) | |
| tree | dd8ffc109b4afa85b8f44bb6eba8a2e4624bcc1d /source/blender/blenkernel/intern/undo_system.c | |
| parent | aaac963dfa74cda9b46f440e1d73c52636ad6b4a (diff) | |
| parent | 440ef4235ff0b7a67de978d790bf923c04badabe (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/undo_system.c')
| -rw-r--r-- | source/blender/blenkernel/intern/undo_system.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/undo_system.c b/source/blender/blenkernel/intern/undo_system.c index d6d0a3f911f..0eb209cabeb 100644 --- a/source/blender/blenkernel/intern/undo_system.c +++ b/source/blender/blenkernel/intern/undo_system.c @@ -872,7 +872,7 @@ ID *BKE_undosys_ID_map_lookup_with_prev(const UndoIDPtrMap *map, ID *id_src, ID return id_prev_match[1]; } else { - ID *id_dst = BKE_undosys_ID_map_lookup(map, id_src); + ID *id_dst = (id_src->lib == NULL) ? BKE_undosys_ID_map_lookup(map, id_src) : id_src; id_prev_match[0] = id_src; id_prev_match[1] = id_dst; return id_dst; |