[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26050] trunk/blender/source/blender/ blenkernel/intern/deform.c: fix for own bug in name flipping, was modifying the original name (very bad!).

Campbell Barton ideasman42 at gmail.com
Sun Jan 17 17:00:54 CET 2010


Revision: 26050
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26050
Author:   campbellbarton
Date:     2010-01-17 17:00:54 +0100 (Sun, 17 Jan 2010)

Log Message:
-----------
fix for own bug in name flipping, was modifying the original name (very bad!).

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

Modified: trunk/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/deform.c	2010-01-17 14:47:14 UTC (rev 26049)
+++ trunk/blender/source/blender/blenkernel/intern/deform.c	2010-01-17 16:00:54 UTC (rev 26050)
@@ -285,7 +285,7 @@
 
 /* finds the best possible flipped name. For renaming; check for unique names afterwards */
 /* if strip_number: removes number extensions */
-void flip_vertexgroup_name (char *name_r, const char *name, int strip_number)
+void flip_vertexgroup_name (char *name, const char *from_name, int strip_number)
 {
 	int     len;
 	char    prefix[sizeof((bDeformGroup *)NULL)->name]={""};   /* The part before the facing */
@@ -294,9 +294,11 @@
 	char    number[sizeof((bDeformGroup *)NULL)->name]={""};   /* The number extension string */
 	char    *index=NULL;
 
-	len= strlen(name);
+	len= strlen(from_name);
 	if(len<3) return; // we don't do names like .R or .L
 
+	strcpy(name, from_name);
+
 	/* We first check the case with a .### extension, let's find the last period */
 	if(isdigit(name[len-1])) {
 		index= strrchr(name, '.'); // last occurrence
@@ -392,7 +394,7 @@
 
 #undef IS_SEPARATOR
 
-	sprintf (name_r, "%s%s%s%s", prefix, replace, suffix, number);
+	sprintf (name, "%s%s%s%s", prefix, replace, suffix, number);
 }
 
 





More information about the Bf-blender-cvs mailing list