[Bf-blender-cvs] [54004f5dfad] undo-experiments: Merge branch 'master' into undo-experiments

[Bastien Montagne]

Commit: 54004f5dfada83f01824da4086f497481c6dadef
Author: Bastien Montagne
Date:   Thu Feb 6 14:08:54 2020 +0100
Branches: undo-experiments
https://developer.blender.org/rB54004f5dfada83f01824da4086f497481c6dadef

Merge branch 'master' into undo-experiments

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 21c9d422e9c,651f390d23e..eaf7f4a6d94
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -9565,20 -9074,8 +9220,8 @@@ static BHead *read_libblock(FileData *f
    id->newid = NULL; /* Needed because .blend may have been saved with crap value here... */
    id->orig_id = NULL;
  
-   /* NOTE: It is important to not clear the recalc flags for undo/redo.
-    * Preserving recalc flags on redo/undo is the only way to make dependency graph detect
-    * that animation is to be evaluated on undo/redo. If this is not enforced by the recalc
-    * flags dependency graph does not do animation update to avoid loss of unkeyed changes.,
-    * which conflicts with undo/redo of changes to animation data itself.
-    *
-    * But for regular file load we clear the flag, since the flags might have been changed since
-    * the version the file has been saved with. */
-   if (!fd->memfile) {
-     id->recalc = 0;
-   }
- 
    /* this case cannot be direct_linked: it's just the ID part */
 -  if (bhead->code == ID_LINK_PLACEHOLDER) {
 +  if (id_bhead->code == ID_LINK_PLACEHOLDER) {
      /* That way, we know which data-lock needs do_versions (required currently for linking). */
      id->tag = tag | LIB_TAG_ID_LINK_PLACEHOLDER | LIB_TAG_NEED_LINK | LIB_TAG_NEW;