Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-08-07 19:23:09 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-08-07 19:23:09 +0400
commit438b50022e6693e397f82ed2f565b3231413276f (patch)
treea47c5cc4f37a66144eea8dd961f12b96fd9f623d /source/blender/blenkernel/intern/action.c
parent8d879829da9b82d285e94ee8e408cbc2550692ad (diff)
Fix #36391: removing an armature with a custom bone shape object would not
decrement the object user count when removing the armature. This could cause the object to stick when it shouldn't, in particular when that object is part of a group.
Diffstat (limited to 'source/blender/blenkernel/intern/action.c')
-rw-r--r--source/blender/blenkernel/intern/action.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 70fbf2d39e8..80e40efd1fb 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -616,6 +616,10 @@ void BKE_pose_channels_hash_free(bPose *pose)
void BKE_pose_channel_free(bPoseChannel *pchan)
{
+ if (pchan->custom) {
+ id_us_min(&pchan->custom->id);
+ pchan->custom = NULL;
+ }
if (pchan->mpath) {
animviz_free_motionpath(pchan->mpath);