[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27919] trunk/blender/source/blender: allow action groups with "" name, (just uses "Group" instead)

Campbell Barton ideasman42 at gmail.com
Thu Apr 1 10:39:09 CEST 2010


Revision: 27919
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27919
Author:   campbellbarton
Date:     2010-04-01 10:39:08 +0200 (Thu, 01 Apr 2010)

Log Message:
-----------
allow action groups with "" name, (just uses "Group" instead)

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/action.c
    trunk/blender/source/blender/makesrna/intern/rna_fcurve.c

Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c	2010-04-01 06:37:35 UTC (rev 27918)
+++ trunk/blender/source/blender/blenkernel/intern/action.c	2010-04-01 08:39:08 UTC (rev 27919)
@@ -244,7 +244,7 @@
 	bActionGroup *agrp;
 	
 	/* sanity check: must have action and name */
-	if (ELEM(NULL, act, name) || (name[0] == 0))
+	if (ELEM(NULL, act, name))
 		return NULL;
 	
 	/* allocate a new one */
@@ -252,7 +252,7 @@
 	
 	/* make it selected, with default name */
 	agrp->flag = AGRP_SELECTED;
-	strncpy(agrp->name, name, sizeof(agrp->name));
+	strncpy(agrp->name, name[0] ? name : "Group", sizeof(agrp->name));
 	
 	/* add to action, and validate */
 	BLI_addtail(&act->groups, agrp);

Modified: trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_fcurve.c	2010-04-01 06:37:35 UTC (rev 27918)
+++ trunk/blender/source/blender/makesrna/intern/rna_fcurve.c	2010-04-01 08:39:08 UTC (rev 27919)
@@ -38,6 +38,8 @@
 
 #include "BLI_math.h"
 
+#include "BKE_action.h"
+
 #include "WM_types.h"
 
 #include "ED_keyframing.h"





More information about the Bf-blender-cvs mailing list