diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-08-08 12:16:43 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-08 12:16:43 +0300 |
| commit | bc63d6f39ade353610669e97bdbcbbb184ef48c8 (patch) | |
| tree | 95ac63a55f735b63a0d22784743c8d1ba31af78c /source/blender/blenkernel/intern/undo_system.c | |
| parent | 697d4b227e71a6e90329e2cb4e83dafcddb4af72 (diff) | |
Fix T55095: Undo crash w/ linked library data
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 2231f43c9c3..0ebfb4065e4 100644 --- a/source/blender/blenkernel/intern/undo_system.c +++ b/source/blender/blenkernel/intern/undo_system.c @@ -864,7 +864,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; |