[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26382] trunk/blender/source/blender/ editors: * More tweaks to previous cleaning

[Matt Ebb]

Revision: 26382
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26382
Author:   broken
Date:     2010-01-29 00:45:12 +0100 (Fri, 29 Jan 2010)

Log Message:
-----------
* More tweaks to previous cleaning

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/editors/object/object_constraint.c

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2010-01-28 23:41:34 UTC (rev 26381)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2010-01-28 23:45:12 UTC (rev 26382)
@@ -1062,7 +1062,7 @@
 	rb_col= (con->flag & CONSTRAINT_ACTIVE)?50:20;
 	
 	/* open/close */
-	uiItemR(subrow, NULL, 0, &ptr, "expand", UI_ITEM_R_ICON_ONLY);
+	uiItemR(subrow, "", 0, &ptr, "expanded", UI_ITEM_R_ICON_ONLY);
 	
 	/* name */	
 	uiBlockSetEmboss(block, UI_EMBOSS);

Modified: trunk/blender/source/blender/editors/object/object_constraint.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_constraint.c	2010-01-28 23:41:34 UTC (rev 26381)
+++ trunk/blender/source/blender/editors/object/object_constraint.c	2010-01-28 23:45:12 UTC (rev 26382)
@@ -624,52 +624,7 @@
 
 /***************************** BUTTONS ****************************/
 
-/* Rename the given constraint, con already has the new name */
-void ED_object_constraint_rename(Object *ob, bConstraint *con, char *oldname)
-{
-	bConstraint *tcon;
-	ListBase *conlist= NULL;
-	int from_object= 0;
-	
-	/* get context by searching for con (primitive...) */
-	for (tcon= ob->constraints.first; tcon; tcon= tcon->next) {
-		if (tcon==con)
-			break;
-	}
-	
-	if (tcon) {
-		conlist= &ob->constraints;
-		from_object= 1;
-	}
-	else if (ob->pose) {
-		bPoseChannel *pchan;
-		
-		for (pchan=ob->pose->chanbase.first; pchan; pchan=pchan->next) {
-			for (tcon= pchan->constraints.first; tcon; tcon= tcon->next) {
-				if (tcon==con)
-					break;
-			}
-			if (tcon) 
-				break;
-		}
-		
-		if (tcon) {
-			conlist= &pchan->constraints;
-		}
-	}
-	
-	if (conlist==NULL) {
-		printf("rename constraint failed\n");	/* should not happen in UI */
-		return;
-	}
-	
-	/* first make sure it's a unique name within context */
-	unique_constraint_name(con, conlist);
-}
 
-
-
-
 void ED_object_constraint_set_active(Object *ob, bConstraint *con)
 {	
 	/* lets be nice and escape if its active already */