diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-07-08 18:09:52 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-07-08 18:09:52 +0300 |
| commit | caae973b8ab0d092e2ed42bd0c164c4a76ffc14d (patch) | |
| tree | 68c75594733325a36f8282722457e3c6126a3020 /source/blender/blenkernel/intern/object.c | |
| parent | 5a1cae541a1c1f6a02b2e92643ae2c2c7a3a2e1c (diff) | |
Move Group and ParticleSettings to new copying system.
Also fix several mistakes from previous commits.
Diffstat (limited to 'source/blender/blenkernel/intern/object.c')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index f2b7a809f45..8a626b123d2 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1179,11 +1179,11 @@ void BKE_object_copy_data(Main *UNUSED(bmain), Object *ob_dst, const Object *ob_ ob_dst->curve_cache = NULL; /* Do not copy object's preview (mostly due to the fact renderers create temp copy of objects). */ - if ((flag & LIB_ID_COPY_NO_PREVIEW) == 1 || true) { /* XXX TODO temp hack */ - ob_dst->preview = NULL; + if ((flag & LIB_ID_COPY_NO_PREVIEW) == 0 && false) { /* XXX TODO temp hack */ + BKE_previewimg_id_copy(&ob_dst->id, &ob_src->id); } else { - BKE_previewimg_id_copy(&ob_dst->id, &ob_src->id); + ob_dst->preview = NULL; } } |