[Bf-blender-cvs] [3a566687e11] blender2.8: Merge branch 'master' into blender2.8

Bastien Montagne noreply at git.blender.org
Wed Apr 4 12:01:09 CEST 2018


Commit: 3a566687e1159904fee4ac7aef5daf38fb4e00ed
Author: Bastien Montagne
Date:   Wed Apr 4 12:00:57 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB3a566687e1159904fee4ac7aef5daf38fb4e00ed

Merge branch 'master' into blender2.8

Conflicts:
	source/blender/blenloader/intern/readfile.c

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index 1f37eaf390b,2b053b3fb45..4c212ecca01
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -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 *************** */



More information about the Bf-blender-cvs mailing list