diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2019-02-21 18:14:34 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2019-02-21 18:14:34 +0300 |
| commit | 9e1f3421bbd7f30bbab000511be8805bd36bdb50 (patch) | |
| tree | 829c6dfbf1910848ff5e13f6fbd76438d1039260 /source/blender/editors/transform/transform_conversions.c | |
| parent | 63fd2c99e80d89805f0817b6ea9802f99d8271e7 (diff) | |
Fix for Fix (c) T61787: Duplicating a collection instance does not duplicate the dupli_group.
Wrong logic in bitflags handling in own previous commit...
Diffstat (limited to 'source/blender/editors/transform/transform_conversions.c')
| -rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 0c6377fea0a..9da07e0cd06 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -5804,7 +5804,8 @@ static void ObjectToTransData(TransInfo *t, TransData *td, Object *ob) /* Hack over hack, looks like in some cases eval object has not yet been fully flushed or so? * In some cases, macro operators starting transform just after creating a new object (OBJECT_OT_duplicate), * if dupli flags are not protected, they can be erased here (see T61787). */ - ob->transflag = (object_eval->transflag & ~(OB_DUPLI | OB_DUPLIFACES_SCALE | OB_DUPLIROT)); + ob->transflag = ((object_eval->transflag & ~(OB_DUPLI | OB_DUPLIFACES_SCALE | OB_DUPLIROT)) | + (ob->transflag & (OB_DUPLI | OB_DUPLIFACES_SCALE | OB_DUPLIROT))); td->ob = ob; |