[Bf-blender-cvs] [0393e6b08de] custom-manipulators: Merge branch 'blender2.8' into custom-manipulators

[Campbell Barton]

Commit: 0393e6b08dead096ef47a87d2c2fe5bed9cb8d44
Author: Campbell Barton
Date:   Fri Apr 14 17:21:26 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB0393e6b08dead096ef47a87d2c2fe5bed9cb8d44

Merge branch 'blender2.8' into custom-manipulators

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



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

diff --cc source/blender/blenkernel/intern/library_query.c
index f136ae484a7,c6cb336382e..3732c0d92c8
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@@ -535,7 -585,7 +585,8 @@@ void BKE_library_foreach_ID_link(Main *
  
  					data.cb_flag |= proxy_cb_flag;
  					for (pchan = object->pose->chanbase.first; pchan; pchan = pchan->next) {
+ 						library_foreach_idproperty_ID_link(&data, pchan->prop, IDWALK_CB_USER);
 +						CALLBACK_INVOKE(pchan->fmap_object, IDWALK_CB_USER);
  						CALLBACK_INVOKE(pchan->custom, IDWALK_CB_USER);
  						BKE_constraints_id_loop(&pchan->constraints, library_foreach_constraintObjectLooper, &data);
  					}
diff --cc source/blender/blenloader/intern/readfile.c
index 05ae43225c4,a1718b5d84d..df9b40fbad8
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -3296,14 -3314,8 +3315,16 @@@ static void lib_link_pose(FileData *fd
  
  		pchan->bone = BLI_ghash_lookup(bone_hash, pchan->name);
  		
+ 		IDP_LibLinkProperty(pchan->prop, fd);
+ 
 +		pchan->fmap_object = newlibadr_us(fd, arm->id.lib, pchan->fmap_object);
 +		if (pchan->fmap_object) {
 +			bFaceMap *fmap = fmap_find_name(pchan->fmap_object, pchan->fmap->name);
 +			/* fix fmap pointer now that we've got updated fmap_object */
 +			MEM_freeN(pchan->fmap);
 +			pchan->fmap = fmap;
 +		}
 +
  		pchan->custom = newlibadr_us(fd, arm->id.lib, pchan->custom);
  		if (UNLIKELY(pchan->bone == NULL)) {
  			rebuild = true;
@@@ -9446,7 -9499,7 +9510,8 @@@ static void expand_pose(FileData *fd, M
  	
  	for (chan = pose->chanbase.first; chan; chan = chan->next) {
  		expand_constraints(fd, mainvar, &chan->constraints);
+ 		expand_idprops(fd, mainvar, chan->prop);
 +		expand_doit(fd, mainvar, chan->fmap_object);
  		expand_doit(fd, mainvar, chan->custom);
  	}
  }