[Bf-blender-cvs] [f1b37ac] wiggly-widgets: Another fix for Face Maps on file read

[Julian Eisel]

Commit: f1b37ac7e602af00536765d6c0ef8ecedadcf9d4
Author: Julian Eisel
Date:   Fri Nov 13 00:47:18 2015 +0100
Branches: wiggly-widgets
https://developer.blender.org/rBf1b37ac7e602af00536765d6c0ef8ecedadcf9d4

Another fix for Face Maps on file read

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

M	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 4b26d47..1677bb1 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -120,6 +120,7 @@
 #include "BKE_curve.h"
 #include "BKE_depsgraph.h"
 #include "BKE_effect.h"
+#include "BKE_facemap.h"
 #include "BKE_fcurve.h"
 #include "BKE_global.h" // for G
 #include "BKE_group.h"
@@ -3217,6 +3218,8 @@ static void lib_link_pose(FileData *fd, Main *bmain, Object *ob, bPose *pose)
 		pchan->bone = BKE_armature_find_bone_name(arm, pchan->name);
 
 		pchan->fmap_object = newlibadr_us(fd, arm->id.lib, pchan->fmap_object);
+		/* fix fmap pointer now that we've got updated fmap_object */
+		pchan->fmap = fmap_find_name(pchan->fmap_object, pchan->fmap->name);
 
 		pchan->custom = newlibadr_us(fd, arm->id.lib, pchan->custom);
 		if (pchan->bone == NULL)