diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-18 06:35:26 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-18 06:35:26 +0400 |
| commit | 96ada15d7940a72744dc1a63f13dbd9383b42a11 (patch) | |
| tree | 4e5527c0be1706fa28f715305d7f5b8eea4379ae /source/blender/blenkernel/intern/armature.c | |
| parent | 1b5d16f1bf80f2da8d3d4da5bbfaf4819c14a225 (diff) | |
| parent | 5db33d11bd569f4040fd58e4f39cf97ed94fec29 (diff) | |
svn merge -r40197:40311 ^/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/intern/armature.c')
| -rw-r--r-- | source/blender/blenkernel/intern/armature.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 3a14074d55b..4682c4ceee2 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -1483,7 +1483,6 @@ static void pose_proxy_synchronize(Object *ob, Object *from, int layer_protected pchanw.next= pchan->next; pchanw.parent= pchan->parent; pchanw.child= pchan->child; - pchanw.path= NULL; /* this is freed so copy a copy, else undo crashes */ if(pchanw.prop) { |