blender
/
blender
126
393
Fork 565
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

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

Wrong logic in bitflags handling in own previous commit...
This commit is contained in:
Bastien Montagne 2019-02-21 16:14:34 +01:00
parent 63fd2c99e8
commit 9e1f3421bb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/transform/transform_conversions.c
View File

@ -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;