[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51932] trunk/blender/source/blender/ blenkernel/intern/anim_sys.c: Harmless formatting tweaks

Joshua Leung aligorith at gmail.com
Tue Nov 6 07:29:45 CET 2012


Revision: 51932
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51932
Author:   aligorith
Date:     2012-11-06 06:29:40 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
Harmless formatting tweaks

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

Modified: trunk/blender/source/blender/blenkernel/intern/anim_sys.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2012-11-06 05:25:55 UTC (rev 51931)
+++ trunk/blender/source/blender/blenkernel/intern/anim_sys.c	2012-11-06 06:29:40 UTC (rev 51932)
@@ -973,20 +973,19 @@
 	/* allocate new KeyingSet */
 	ks = MEM_callocN(sizeof(KeyingSet), "KeyingSet");
 
-	BLI_strncpy(ks->idname, idname ? idname : name ? name : "KeyingSet", sizeof(ks->idname));
+	BLI_strncpy(ks->idname, (idname) ? idname : (name) ? name     : "KeyingSet",  sizeof(ks->idname));
+	BLI_strncpy(ks->name,   (name) ? name     : (idname) ? idname : "Keying Set", sizeof(ks->name));
 
-	BLI_strncpy(ks->name, name ? name : idname ? idname : "Keying Set", sizeof(ks->name));
-
 	ks->flag = flag;
 	ks->keyingflag = keyingflag;
 	
 	/* add KeyingSet to list */
 	BLI_addtail(list, ks);
 	
-	/* Make sure KeyingSet has a unique idname. */
+	/* Make sure KeyingSet has a unique idname */
 	BLI_uniquename(list, ks, "KeyingSet", '.', offsetof(KeyingSet, idname), sizeof(ks->idname));
 	
-	/* Make sure KeyingSet has a unique label (this helps with identification). */
+	/* Make sure KeyingSet has a unique label (this helps with identification) */
 	BLI_uniquename(list, ks, "Keying Set", '.', offsetof(KeyingSet, name), sizeof(ks->name));
 	
 	/* return new KeyingSet for further editing */




More information about the Bf-blender-cvs mailing list