diff options
| author | Mitchell Stokes <mogurijin@gmail.com> | 2011-07-29 10:32:30 +0400 |
|---|---|---|
| committer | Mitchell Stokes <mogurijin@gmail.com> | 2011-07-29 10:32:30 +0400 |
| commit | b46d8955509e805f06b76a6fd800ecb4edee113b (patch) | |
| tree | 7ed0b1a3b5d04ab48d3e9062ff02ce54961ecb06 /source/blender/editors/armature/poseUtils.c | |
| parent | 6960127d2609620d52620539388ada5cb466bab2 (diff) | |
| parent | 26589497529ca3c8da85391d4976d286a371e258 (diff) | |
Merging r36529-38806bge_components
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 7ade93076e5..3c74a816fdb 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); } } |