[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50762] trunk/blender/source/blender/ editors/object/object_modifier.c: Fix #32596: bones in armature created from skin modifier have wrong envelope

[Brecht Van Lommel]

Revision: 50762
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50762
Author:   blendix
Date:     2012-09-20 00:53:25 +0000 (Thu, 20 Sep 2012)
Log Message:
-----------
Fix #32596: bones in armature created from skin modifier have wrong envelope
values.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/object/object_modifier.c

Modified: trunk/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_modifier.c	2012-09-20 00:39:27 UTC (rev 50761)
+++ trunk/blender/source/blender/editors/object/object_modifier.c	2012-09-20 00:53:25 UTC (rev 50762)
@@ -1692,11 +1692,9 @@
 
 		v = (e->v1 == parent_v ? e->v2 : e->v1);
 
-		bone = MEM_callocN(sizeof(EditBone),
-		                   "skin_armature_bone_create EditBone");
+		bone = ED_armature_edit_bone_add(arm, "Bone");
 
 		bone->parent = parent_bone;
-		bone->layer = 1;
 		bone->flag |= BONE_CONNECTED;
 
 		copy_v3_v3(bone->head, mvert[parent_v].co);
@@ -1704,8 +1702,6 @@
 		bone->rad_head = bone->rad_tail = 0.25;
 		BLI_snprintf(bone->name, sizeof(bone->name), "Bone.%.2d", endx);
 
-		BLI_addtail(arm->edbo, bone);
-
 		/* add bDeformGroup */
 		if ((dg = ED_vgroup_add_name(skin_ob, bone->name))) {
 			ED_vgroup_vert_add(skin_ob, dg, parent_v, 1, WEIGHT_REPLACE);
@@ -1770,16 +1766,13 @@
 			 * a fake root bone (have it going off in the Y direction
 			 * (arbitrary) */
 			if (emap[v].count > 1) {
-				bone = MEM_callocN(sizeof(EditBone), "EditBone");
+				bone = ED_armature_edit_bone_add(arm, "Bone");
 
 				copy_v3_v3(bone->head, me->mvert[v].co);
 				copy_v3_v3(bone->tail, me->mvert[v].co);
-				bone->layer = 1;
 
 				bone->head[1] = 1.0f;
 				bone->rad_head = bone->rad_tail = 0.25;
-
-				BLI_addtail(arm->edbo, bone);
 			}
 			
 			if (emap[v].count >= 1) {