[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19758] branches/blender2.5/blender/source /blender: 2.5:
Joshua Leung
aligorith at gmail.com
Thu Apr 16 15:10:10 CEST 2009
Revision: 19758
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19758
Author: aligorith
Date: 2009-04-16 15:10:08 +0200 (Thu, 16 Apr 2009)
Log Message:
-----------
2.5:
* Added extra parameter to generic unique name finding function BLI_uniquename() for specifying the delimeter between non-unique parts of the name and digits.
* Driver target variables now get unique names by default.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c
branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
branches/blender2.5/blender/source/blender/blenlib/BLI_util.h
branches/blender2.5/blender/source/blender/blenlib/intern/util.c
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
branches/blender2.5/blender/source/blender/editors/armature/poselib.c
branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
branches/blender2.5/blender/source/blender/editors/gpencil/drawgpencil.c
branches/blender2.5/blender/source/blender/editors/gpencil/gpencil.c
branches/blender2.5/blender/source/blender/editors/space_graph/graph_buttons.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c 2009-04-16 13:01:50 UTC (rev 19757)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/anim_sys.c 2009-04-16 13:10:08 UTC (rev 19758)
@@ -240,7 +240,7 @@
BLI_addtail(list, ks);
/* make sure KeyingSet has a unique name (this helps with identification) */
- BLI_uniquename(list, ks, "Keying Set", offsetof(KeyingSet, name), 64);
+ BLI_uniquename(list, ks, "Keying Set", ' ', offsetof(KeyingSet, name), 64);
/* return new KeyingSet for further editing */
return ks;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c 2009-04-16 13:01:50 UTC (rev 19757)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c 2009-04-16 13:10:08 UTC (rev 19758)
@@ -93,7 +93,7 @@
/* Find the first available, non-duplicate name for a given constraint */
void unique_constraint_name (bConstraint *con, ListBase *list)
{
- BLI_uniquename(list, con, "Const", offsetof(bConstraint, name), 32);
+ BLI_uniquename(list, con, "Const", '.', offsetof(bConstraint, name), 32);
}
/* ----------------- Evaluation Loop Preparation --------------- */
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c 2009-04-16 13:01:50 UTC (rev 19757)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/fcurve.c 2009-04-16 13:10:08 UTC (rev 19758)
@@ -5,6 +5,7 @@
#include <math.h>
#include <stdio.h>
+#include <stddef.h>
#include <string.h>
#include <float.h>
@@ -589,8 +590,9 @@
dtar= MEM_callocN(sizeof(DriverTarget), "DriverTarget");
BLI_addtail(&driver->targets, dtar);
- /* give the target a name */
- strcpy(dtar->name, "a"); // XXX fimxe... this needs more work to get unique names without dots...
+ /* give the target a 'unique' name */
+ strcpy(dtar->name, "var");
+ BLI_uniquename(&driver->targets, dtar, "var", '_', offsetof(DriverTarget, name), 64);
/* return the target */
return dtar;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c 2009-04-16 13:01:50 UTC (rev 19757)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c 2009-04-16 13:10:08 UTC (rev 19758)
@@ -1082,7 +1082,7 @@
BLI_snprintf(agrp->name, 64, grpname);
BLI_addtail(&tmp_act.groups, agrp);
- BLI_uniquename(&tmp_act.groups, agrp, "Group", offsetof(bActionGroup, name), 64);
+ BLI_uniquename(&tmp_act.groups, agrp, "Group", '.', offsetof(bActionGroup, name), 64);
}
}
Modified: branches/blender2.5/blender/source/blender/blenlib/BLI_util.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/BLI_util.h 2009-04-16 13:01:50 UTC (rev 19757)
+++ branches/blender2.5/blender/source/blender/blenlib/BLI_util.h 2009-04-16 13:10:08 UTC (rev 19758)
@@ -51,7 +51,7 @@
void BLI_split_dirfile_basic(const char *string, char *dir, char *file);
void BLI_join_dirfile(char *string, const char *dir, const char *file);
int BLI_testextensie(const char *str, const char *ext);
-void BLI_uniquename(struct ListBase *list, void *vlink, char defname[], short name_offs, short len);
+void BLI_uniquename(struct ListBase *list, void *vlink, char defname[], char delim, short name_offs, short len);
void BLI_newname(char * name, int add);
int BLI_stringdec(char *string, char *kop, char *start, unsigned short *numlen);
void BLI_stringenc(char *string, char *kop, char *start, unsigned short numlen, int pic);
Modified: branches/blender2.5/blender/source/blender/blenlib/intern/util.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/intern/util.c 2009-04-16 13:01:50 UTC (rev 19757)
+++ branches/blender2.5/blender/source/blender/blenlib/intern/util.c 2009-04-16 13:10:08 UTC (rev 19758)
@@ -224,8 +224,9 @@
* name_offs: should be calculated using offsetof(structname, membername) macro from stddef.h
* len: maximum length of string (to prevent overflows, etc.)
* defname: the name that should be used by default if none is specified already
+ * delim: the character which acts as a delimeter between parts of the name
*/
-void BLI_uniquename(ListBase *list, void *vlink, char defname[], short name_offs, short len)
+void BLI_uniquename(ListBase *list, void *vlink, char defname[], char delim, short name_offs, short len)
{
Link *link;
char tempname[128];
@@ -261,12 +262,12 @@
return;
/* Strip off the suffix */
- dot = strchr(GIVE_STRADDR(vlink, name_offs), '.');
+ dot = strchr(GIVE_STRADDR(vlink, name_offs), delim);
if (dot)
*dot=0;
for (number = 1; number <= 999; number++) {
- BLI_snprintf(tempname, 128, "%s.%03d", GIVE_STRADDR(vlink, name_offs), number);
+ BLI_snprintf(tempname, 128, "%s%c%03d", GIVE_STRADDR(vlink, name_offs), delim, number);
exists = 0;
for (link= list->first; link; link= link->next) {
Modified: branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/keyframing.c 2009-04-16 13:01:50 UTC (rev 19757)
+++ branches/blender2.5/blender/source/blender/editors/animation/keyframing.c 2009-04-16 13:10:08 UTC (rev 19758)
@@ -127,7 +127,7 @@
BLI_snprintf(grp->name, 64, group);
BLI_addtail(&act->groups, grp);
- BLI_uniquename(&act->groups, grp, "Group", offsetof(bActionGroup, name), 64);
+ BLI_uniquename(&act->groups, grp, "Group", '.', offsetof(bActionGroup, name), 64);
}
/* add F-Curve to group */
Modified: branches/blender2.5/blender/source/blender/editors/armature/poselib.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/poselib.c 2009-04-16 13:01:50 UTC (rev 19757)
+++ branches/blender2.5/blender/source/blender/editors/armature/poselib.c 2009-04-16 13:10:08 UTC (rev 19758)
@@ -388,7 +388,7 @@
}
/* validate name */
- BLI_uniquename(&act->markers, marker, "Pose", offsetof(TimeMarker, name), 64);
+ BLI_uniquename(&act->markers, marker, "Pose", '.', offsetof(TimeMarker, name), 64);
/* make sure we've got KeyingSets to use */
poselib_get_builtin_keyingsets();
@@ -562,7 +562,7 @@
/* copy name and validate it */
BLI_strncpy(marker->name, newname, sizeof(marker->name));
- BLI_uniquename(&act->markers, marker, "Pose", offsetof(TimeMarker, name), 64);
+ BLI_uniquename(&act->markers, marker, "Pose", '.', offsetof(TimeMarker, name), 64);
/* done */
return OPERATOR_FINISHED;
Modified: branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/poseobject.c 2009-04-16 13:01:50 UTC (rev 19757)
+++ branches/blender2.5/blender/source/blender/editors/armature/poseobject.c 2009-04-16 13:10:08 UTC (rev 19758)
@@ -970,7 +970,7 @@
grp= MEM_callocN(sizeof(bActionGroup), "PoseGroup");
strcpy(grp->name, "Group");
BLI_addtail(&pose->agroups, grp);
- BLI_uniquename(&pose->agroups, grp, "Group", offsetof(bActionGroup, name), 32);
+ BLI_uniquename(&pose->agroups, grp, "Group", '.', offsetof(bActionGroup, name), 32);
pose->active_group= BLI_countlist(&pose->agroups);
Modified: branches/blender2.5/blender/source/blender/editors/gpencil/drawgpencil.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/gpencil/drawgpencil.c 2009-04-16 13:01:50 UTC (rev 19757)
+++ branches/blender2.5/blender/source/blender/editors/gpencil/drawgpencil.c 2009-04-16 13:10:08 UTC (rev 19758)
@@ -102,7 +102,7 @@
bGPdata *gpd= (bGPdata *)gpd_arg;
bGPDlayer *gpl= (bGPDlayer *)gpl_arg;
- BLI_uniquename(&gpd->layers, gpl, "GP_Layer", offsetof(bGPDlayer, info[0]), 128);
+ BLI_uniquename(&gpd->layers, gpl, "GP_Layer", '.', offsetof(bGPDlayer, info[0]), 128);
gpencil_layer_setactive(gpd, gpl);
scrarea_queue_winredraw(curarea);
Modified: branches/blender2.5/blender/source/blender/editors/gpencil/gpencil.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/gpencil/gpencil.c 2009-04-16 13:01:50 UTC (rev 19757)
+++ branches/blender2.5/blender/source/blender/editors/gpencil/gpencil.c 2009-04-16 13:10:08 UTC (rev 19758)
@@ -226,7 +226,7 @@
/* auto-name */
sprintf(gpl->info, "GP_Layer");
- BLI_uniquename(&gpd->layers, gpl, "GP_Layer", offsetof(bGPDlayer, info[0]), 128);
+ BLI_uniquename(&gpd->layers, gpl, "GP_Layer", '.', offsetof(bGPDlayer, info[0]), 128);
/* make this one the active one */
gpencil_layer_setactive(gpd, gpl);
Modified: branches/blender2.5/blender/source/blender/editors/space_graph/graph_buttons.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_graph/graph_buttons.c 2009-04-16 13:01:50 UTC (rev 19757)
+++ branches/blender2.5/blender/source/blender/editors/space_graph/graph_buttons.c 2009-04-16 13:10:08 UTC (rev 19758)
@@ -275,7 +275,7 @@
short height = 60;
/* variable name */
- uiDefButC(block, TEX, B_REDR, "Name: ", 10,yco,280,20, dtar->name, 0, 63, 0, 0, "Name of target variable.");
+ uiDefButC(block, TEX, B_REDR, "Name: ", 10,yco,280,20, dtar->name, 0, 63, 0, 0, "Name of target variable (No spaces or dots are allowed. Also, must not start with a symbol or digit).");
/* remove button */
but= uiDefIconBut(block, BUT, B_REDR, ICON_X, 290, yco, 20, 20, NULL, 0.0, 0.0, 0.0, 0.0, "Delete target variable.");
Modified: branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list