[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58992] trunk/blender/source/blender/ blenkernel/intern/action.c: Fix #36391: removing an armature with a custom bone shape object would not

[Brecht Van Lommel]

Revision: 58992
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58992
Author:   blendix
Date:     2013-08-07 15:23:09 +0000 (Wed, 07 Aug 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/action.c

Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c     2013-08-07 
13:14:50 UTC (rev 58991)
+++ trunk/blender/source/blender/blenkernel/intern/action.c     2013-08-07 
15:23:09 UTC (rev 58992)
@@ -616,6 +616,10 @@
 
 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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs