[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25934] trunk/blender/source/blender/ blenkernel/intern/armature.c: Fix for custom shapes getting lost on proxy armature bones.

[Brecht Van Lommel]

Revision: 25934
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25934
Author:   blendix
Date:     2010-01-12 19:56:39 +0100 (Tue, 12 Jan 2010)

Log Message:
-----------
Fix for custom shapes getting lost on proxy armature bones.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/armature.c

Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c	2010-01-12 18:33:21 UTC (rev 25933)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c	2010-01-12 18:56:39 UTC (rev 25934)
@@ -1515,9 +1515,10 @@
 	pose->active_group= frompose->active_group;
 	
 	for (pchan= pose->chanbase.first; pchan; pchan= pchan->next) {
+		pchanp= get_pose_channel(frompose, pchan->name);
+
 		if (pchan->bone->layer & layer_protected) {
 			ListBase proxylocal_constraints = {NULL, NULL};
-			pchanp= get_pose_channel(frompose, pchan->name);
 			
 			/* copy posechannel to temp, but restore important pointers */
 			pchanw= *pchanp;
@@ -1565,6 +1566,10 @@
 			/* the final copy */
 			*pchan= pchanw;
 		}
+		else {
+			/* always copy custom shape */
+			pchan->custom= pchanp->custom;
+		}
 	}
 }