diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-08-25 11:33:04 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-08-25 11:34:44 +0300 |
commit | 51d969c6a9a663dd1c833c2cacf7457afb10a4b4 (patch) | |
tree | 9772a77e68d73262d13817cdb3c89a9de1556eb7 /source/blender | |
parent | c6d75628968818aa38b881d0bcaca7c07fc6492a (diff) |
Fix T45891: Crash generating previews
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/group.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/object.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index ae99ff1bbf3..3f68339be11 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -156,6 +156,7 @@ Group *BKE_group_copy(Group *group) BLI_duplicatelist(&groupn->gobject, &group->gobject); /* Do not copy group's preview (same behavior as for objects). */ + groupn->preview = NULL; if (group->id.lib) { BKE_id_lib_local_paths(G.main, group->id.lib, &groupn->id); diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index c7bcc499985..0af7a3215a8 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1562,6 +1562,7 @@ Object *BKE_object_copy_ex(Main *bmain, Object *ob, bool copy_caches) } /* Do not copy object's preview (mostly due to the fact renderers create temp copy of objects). */ + obn->preview = NULL; return obn; } |