Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 4 Apr 2018 10:00:57 +0000 (12:00 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 4 Apr 2018 10:00:57 +0000 (12:00 +0200)
Conflicts:
source/blender/blenloader/intern/readfile.c

1  2 
source/blender/blenloader/intern/readfile.c

index 1f37eaf390be213f0bf6d0094b61f027c975e958,2b053b3fb451a36f90eebcbbee4baeab29018d27..4c212ecca01574c048f80dcea485121fb4a1ef83
@@@ -2287,11 -2236,9 +2287,15 @@@ static void direct_link_id(FileData *fd
        }
        id->py_instance = NULL;
  
+       /* That way datablock reading not going through main read_libblock() function are still in a clear tag state.
+        * (glowering at certain nodetree fake datablock here...). */
+       id->tag = 0;
++
 +      /* Link direct data of overrides. */
 +      if (id->override_static) {
 +              id->override_static = newdataadr(fd, id->override_static);
 +              link_list_ex(fd, &id->override_static->properties, direct_link_id_override_property_cb);
 +      }
  }
  
  /* ************ READ CurveMapping *************** */