diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-07-12 17:09:22 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-07-12 17:09:22 +0400 |
| commit | d9cf98573050fa10f586ed121f514986e688e609 (patch) | |
| tree | 6916742b8cb0b67387198592414d52860bf000cf /source/blender/editors/armature/poseUtils.c | |
| parent | 9132754dc1ed77429a6e870c479b69ac8829d845 (diff) | |
| parent | b90535cc334bb8ae3a51f8023732b8c786019ac7 (diff) | |
Merging trunk up to r38329.
Diffstat (limited to 'source/blender/editors/armature/poseUtils.c')
| -rw-r--r-- | source/blender/editors/armature/poseUtils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/armature/poseUtils.c b/source/blender/editors/armature/poseUtils.c index 0f001751a96..e1e346ab920 100644 --- a/source/blender/editors/armature/poseUtils.c +++ b/source/blender/editors/armature/poseUtils.c @@ -121,7 +121,7 @@ static void fcurves_to_pchan_links_get (ListBase *pfLinks, Object *ob, bAction * pfl->oldangle = pchan->rotAngle; /* make copy of custom properties */ - if (transFlags & ACT_TRANS_PROP) + if (pchan->prop && (transFlags & ACT_TRANS_PROP)) pfl->oldprops = IDP_CopyProperty(pchan->prop); } } |