[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54351] trunk/blender/source/blender/ blenkernel/intern/armature.c: Bugfix #34046

[Ton Roosendaal]

Revision: 54351
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54351
Author:   ton
Date:     2013-02-06 12:16:53 +0000 (Wed, 06 Feb 2013)
Log Message:
-----------
Bugfix #34046

Linked Armature with local proxy, using feature "Custom shape at other bone" stopped working
on undo/redo.

It was actually a bug in the original commit (r26600, april 2010), storing a pointer from 
the library bone into the local proxy bone.
That's strictly forbidden in Blender, but it never showed up because on every undo-redo a 
complete proxy-sync was called again. To allow undo/redo I had to disable this syncing, 
except for file load. Hence the feature got lost :)

The fix is simple; just store the pointer to its own local bone instead.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=26600

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	2013-02-06 11:24:13 UTC (rev 54350)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c	2013-02-06 12:16:53 UTC (rev 54351)
@@ -1655,7 +1655,8 @@
 		else {
 			/* always copy custom shape */
 			pchan->custom = pchanp->custom;
-			pchan->custom_tx = pchanp->custom_tx;
+			if (pchanp->custom_tx)
+				pchan->custom_tx = BKE_pose_channel_find_name(pose, pchanp->custom_tx->name);
 
 			/* ID-Property Syncing */
 			{