[Bf-blender-cvs] [9e1f3421bbd] master: Fix for Fix (c) T61787: Duplicating a collection instance does not duplicate the dupli_group.

[Bastien Montagne]

Commit: 9e1f3421bbd7f30bbab000511be8805bd36bdb50
Author: Bastien Montagne
Date:   Thu Feb 21 16:14:34 2019 +0100
Branches: master
https://developer.blender.org/rB9e1f3421bbd7f30bbab000511be8805bd36bdb50

Fix for Fix (c) T61787: Duplicating a collection instance does not duplicate the dupli_group.

Wrong logic in bitflags handling in own previous commit...

===================================================================

M	source/blender/editors/transform/transform_conversions.c

===================================================================

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;