[Bf-blender-cvs] [84076260da2] master: Merge branch 'blender-v2.90-release' into master

[Bastien Montagne]

Commit: 84076260da267a7537398a71f2ef3a2b0cf2e23f
Author: Bastien Montagne
Date:   Wed Aug 12 16:25:18 2020 +0200
Branches: master
https://developer.blender.org/rB84076260da267a7537398a71f2ef3a2b0cf2e23f

Merge branch 'blender-v2.90-release' into master

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



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

diff --cc source/blender/editors/object/object_modifier.c
index 749034acd85,8b48406bce8..ceb6553bdf6
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@@ -889,12 -888,15 +889,14 @@@ int ED_object_modifier_copy
      BLI_insertlinkafter(&ob->modifiers, md, nmd);
      return true;
    }
 -  else {
 -    nmd = BKE_modifier_new(md->type);
 -    BKE_modifier_copydata(md, nmd);
 -    BLI_insertlinkafter(&ob->modifiers, md, nmd);
 -    BKE_modifier_unique_name(&ob->modifiers, nmd);
 -  }
 +
 +  nmd = BKE_modifier_new(md->type);
 +  BKE_modifier_copydata(md, nmd);
 +  BLI_insertlinkafter(&ob->modifiers, md, nmd);
 +  BKE_modifier_unique_name(&ob->modifiers, nmd);
  
+   nmd->flag |= eModifierFlag_OverrideLibrary_Local;
+ 
    return 1;
  }