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:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-08-12 17:52:13 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-08-12 17:52:13 +0400
commit3497b2241e793764c2d57f7b26984957f2300d60 (patch)
treecff657183ce7fec560c361e05935f8fe435926db /source/blender/blenkernel/intern/action.c
parent004fa8e72973efab77a849fbd44bc46079b7e7aa (diff)
Followup for r58992, fixing user decrement error
Some places like proxy rebuild didn't increent custom shape user counter which lead to user decrement errors later when freeing pose channels. Try to keep custom object counter relevent, but some corner cases might still be missing.
Diffstat (limited to 'source/blender/blenkernel/intern/action.c')
-rw-r--r--source/blender/blenkernel/intern/action.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 80e40efd1fb..bfef3542c45 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -613,7 +613,6 @@ void BKE_pose_channels_hash_free(bPose *pose)
}
}
-
void BKE_pose_channel_free(bPoseChannel *pchan)
{
if (pchan->custom) {
@@ -731,6 +730,9 @@ void BKE_pose_channel_copy_data(bPoseChannel *pchan, const bPoseChannel *pchan_f
/* custom shape */
pchan->custom = pchan_from->custom;
+ if (pchan->custom) {
+ id_us_plus(&pchan->custom->id);
+ }
}