[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25225] trunk/blender/source/blender/ makesrna/intern/rna_armature.c: setting and editbone parent to NULL wasnt working

Campbell Barton ideasman42 at gmail.com
Tue Dec 8 21:58:24 CET 2009


Revision: 25225
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25225
Author:   campbellbarton
Date:     2009-12-08 21:58:23 +0100 (Tue, 08 Dec 2009)

Log Message:
-----------
setting and editbone parent to NULL wasnt working

Modified Paths:
--------------
    trunk/blender/source/blender/makesrna/intern/rna_armature.c

Modified: trunk/blender/source/blender/makesrna/intern/rna_armature.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_armature.c	2009-12-08 19:27:30 UTC (rev 25224)
+++ trunk/blender/source/blender/makesrna/intern/rna_armature.c	2009-12-08 20:58:23 UTC (rev 25225)
@@ -279,10 +279,6 @@
 	EditBone *ebone= (EditBone*)(ptr->data);
 	EditBone *pbone, *parbone= (EditBone*)value.data;
 
-	/* within same armature */
-	if(value.id.data != ptr->id.data)
-		return;
-
 	if(parbone == NULL) {
 		if(ebone->parent && !(ebone->parent->flag & BONE_ROOTSEL))
 			ebone->parent->flag &= ~BONE_TIPSEL;
@@ -291,6 +287,10 @@
 		ebone->flag &= ~BONE_CONNECTED;
 	}
 	else {
+		/* within same armature */
+		if(value.id.data != ptr->id.data)
+			return;
+
 		/* make sure this is a valid child */
 		if(parbone == ebone)
 			return;





More information about the Bf-blender-cvs mailing list