Longer names support for all ID and other object names

This commit extends limit of ID and objects to 64 (it means 63 meaning
characters and 1 for zero-terminator). CustomData layers names are also
extended.
Changed DNA structures and all places where length constants were hardcoded.

All names which are "generating" from ID block should be limited by MAX_ID_NAME-2,
all non-id names now has got own define called MAX_NAME which should be used all
over for non-id names to make further name migration stuff easier.

All name fields in DNA now have comment with constant which corresponds to
hardcoded numeric value which should make it easier to further update this
limits or even switch to non-hardcoded values in DNA.

Special thanks to Campbell who helped figuring out some issues and helped a lot
in finding all cases where hardcoded valued were still used in code.

Both of forwards and backwards compatibility is stored with blender versions newer
than January 5, 2011. Older versions had issue with placing null-terminator to
DNA strings on file load which will lead to some unpredictable behavior or even
crashes.

13 files changed, 48 insertions, 43 deletions

diff --git a/source/blender/blenkernel/BKE_armature.h b/source/blender/blenkernel/BKE_armature.h
index 8836999bc9b..b301b7cf03b 100644
--- a/source/blender/blenkernel/BKE_armature.h
+++ b/source/blender/blenkernel/BKE_armature.h
@@ -82,7 +82,7 @@ void free_armature(struct bArmature *arm);
 void make_local_armature(struct bArmature *arm);
 struct bArmature *copy_armature(struct bArmature *arm);
 
-int bone_autoside_name (char name[32], int strip_number, short axis, float head, float tail);
+int bone_autoside_name (char name[64], int strip_number, short axis, float head, float tail);
 
 struct Bone *get_named_bone (struct bArmature *arm, const char *name);
 
diff --git a/source/blender/blenkernel/BKE_deform.h b/source/blender/blenkernel/BKE_deform.h
index 9a27f292f36..11747899aa9 100644
--- a/source/blender/blenkernel/BKE_deform.h
+++ b/source/blender/blenkernel/BKE_deform.h
@@ -69,7 +69,7 @@ void defvert_normalize_lock(struct MDeformVert *dvert, const int def_nr_lock);
 
 /* utility function, note that 32 chars is the maximum string length since its only
  * used with defgroups currently */
-void flip_side_name(char name[32], const char from_name[32], int strip_number);
+void flip_side_name(char name[64], const char from_name[64], int strip_number);
 
 #endif
 
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 8229978454f..67de699c7c4 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -76,7 +76,7 @@ struct Object;
  */
 typedef struct bNodeSocketTemplate {
 	int type, limit;
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	float val1, val2, val3, val4;   /* default alloc value for inputs */
 	float min, max;
 	PropertySubType subtype;
@@ -95,7 +95,7 @@ typedef void (*NodeSocketButtonFunction)(const struct bContext *C, struct uiBloc
  */
 typedef struct bNodeSocketType {
 	int type;
-	char ui_name[32];
+	char ui_name[64];	/* MAX_NAME */
 	char ui_description[128];
 	int ui_icon;
 	char ui_color[4];
@@ -125,7 +125,7 @@ typedef struct bNodeType {
 	short needs_free;		/* set for allocated types that need to be freed */
 	
 	int type;
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	float width, minwidth, maxwidth;
 	float height, minheight, maxheight;
 	short nclass, flag, compatibility;
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index 3a4ac279852..ed0730b7f09 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -306,7 +306,7 @@ typedef struct SeqLoadInfo {
 	int tot_error;
 	int len;		/* only for image strips */
 	char path[512];
-	char name[32];
+	char name[64];
 } SeqLoadInfo;
 
 /* SeqLoadInfo.flag */
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 35b2499bea5..f840774222a 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -1519,7 +1519,7 @@ static CustomDataLayer *customData_add_layer__internal(CustomData *data,
 	data->layers[index].data = newlayerdata;
 
 	if(name || (name=typeInfo->defaultname)) {
-		BLI_strncpy(data->layers[index].name, name, 32);
+		BLI_strncpy(data->layers[index].name, name, sizeof(data->layers[index].name));
 		CustomData_set_layer_unique_name(data, index);
 	}
 	else
diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 567cc5ce07f..fb114aa54c6 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -1323,7 +1323,7 @@ void dynamicPaint_setInitialColor(DynamicPaintSurface *surface)
 		MTFace *tface;
 		MFace *mface = dm->getFaceArray(dm);
 		int numOfFaces = dm->getNumFaces(dm);
-		char uvname[40];
+		char uvname[MAX_CUSTOMDATA_LAYER_NAME];
 
 		if (!tex) return;
 
@@ -2079,7 +2079,7 @@ int dynamicPaint_createUVSurface(DynamicPaintSurface *surface)
 	int ty;
 	int w,h;
 	int numOfFaces;
-	char uvname[32];
+	char uvname[MAX_CUSTOMDATA_LAYER_NAME];
 	int active_points = 0;
 	int error = 0;
 
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index cb1c7dbec5c..315f1e14e61 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1136,10 +1136,12 @@ static int check_for_dupid(ListBase *lb, ID *id, char *name)
 {
 	ID *idtest;
 	int nr= 0, nrtest, a, left_len;
-	char left[32], leftest[32], in_use[32];
+	char in_use[64]; /* use as a boolean array, unrelated to name length */
+
+	char left[MAX_ID_NAME + 8], leftest[MAX_ID_NAME + 8];
 
 	/* make sure input name is terminated properly */
-	/* if( strlen(name) > 21 ) name[21]= 0; */
+	/* if( strlen(name) > MAX_ID_NAME-3 ) name[MAX_ID_NAME-3]= 0; */
 	/* removed since this is only ever called from one place - campbell */
 
 	while (1) {
@@ -1151,20 +1153,20 @@ static int check_for_dupid(ListBase *lb, ID *id, char *name)
 		if( idtest == NULL ) return 0;
 
 		/* we have a dup; need to make a new name */
-		/* quick check so we can reuse one of first 32 ids if vacant */
+		/* quick check so we can reuse one of first 64 ids if vacant */
 		memset(in_use, 0, sizeof(in_use));
 
 		/* get name portion, number portion ("name.number") */
 		left_len= BLI_split_name_num(left, &nr, name, '.');
 
 		/* if new name will be too long, truncate it */
-		if(nr > 999 && left_len > 16) {
-			left[16]= 0;
-			left_len= 16;
+		if(nr > 999 && left_len > (MAX_ID_NAME - 8)) {
+			left[MAX_ID_NAME - 8]= 0;
+			left_len= MAX_ID_NAME - 8;
 		}
-		else if(left_len > 17) {
-			left[17]= 0;
-			left_len= 17;
+		else if(left_len > (MAX_ID_NAME - 7)) {
+			left[MAX_ID_NAME - 7]= 0;
+			left_len= MAX_ID_NAME - 7;
 		}
 
 		for(idtest= lb->first; idtest; idtest= idtest->next) {
@@ -1206,11 +1208,11 @@ static int check_for_dupid(ListBase *lb, ID *id, char *name)
 			/* otherwise just continue and use a number suffix */
 		}
 		
-		if(nr > 999 && left_len > 16) {
+		if(nr > 999 && left_len > (MAX_ID_NAME - 8)) {
 			/* this would overflow name buffer */
-			left[16] = 0;
-			/* left_len = 16; */ /* for now this isnt used again */
-			memcpy(name, left, sizeof(char) * 17);
+			left[MAX_ID_NAME - 8] = 0;
+			/* left_len = MAX_ID_NAME - 8; */ /* for now this isnt used again */
+			memcpy(name, left, sizeof(char) * (MAX_ID_NAME - 7));
 			continue;
 		}
 		/* this format specifier is from hell... */
@@ -1245,7 +1247,7 @@ int new_id(ListBase *lb, ID *id, const char *tname)
 
 	strncpy(name, tname, sizeof(name)-1);
 
-	/* if result > 21, strncpy don't put the final '\0' to name.
+	/* if result > MAX_ID_NAME-3, strncpy don't put the final '\0' to name.
 	 * easier to assign each time then to check if its needed */
 	name[sizeof(name)-1]= 0;
 
diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c
index 57fc7473860..fe2c10d7091 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -356,7 +356,7 @@ int is_basis_mball(Object *ob)
 int is_mball_basis_for(Object *ob1, Object *ob2)
 {
 	int basis1nr, basis2nr;
-	char basis1name[32], basis2name[32];
+	char basis1name[MAX_ID_NAME], basis2name[MAX_ID_NAME];
 
 	BLI_split_name_num(basis1name, &basis1nr, ob1->id.name+2, '.');
 	BLI_split_name_num(basis2name, &basis2nr, ob2->id.name+2, '.');
@@ -378,7 +378,7 @@ void copy_mball_properties(Scene *scene, Object *active_object)
 	Object *ob;
 	MetaBall *active_mball = (MetaBall*)active_object->data;
 	int basisnr, obnr;
-	char basisname[32], obname[32];
+	char basisname[MAX_ID_NAME], obname[MAX_ID_NAME];
 	
 	BLI_split_name_num(basisname, &basisnr, active_object->id.name+2, '.');
 
@@ -423,7 +423,7 @@ Object *find_basis_mball(Scene *scene, Object *basis)
 	Object *ob,*bob= basis;
 	MetaElem *ml=NULL;
 	int basisnr, obnr;
-	char basisname[32], obname[32];
+	char basisname[MAX_ID_NAME], obname[MAX_ID_NAME];
 
 	BLI_split_name_num(basisname, &basisnr, basis->id.name+2, '.');
 	totelem= 0;
@@ -1596,7 +1596,7 @@ float init_meta(Scene *scene, Object *ob)	/* return totsize */
 	float size, totsize, obinv[4][4], obmat[4][4], vec[3];
 	//float max=0.0;
 	int a, obnr, zero_size=0;
-	char obname[32];
+	char obname[MAX_ID_NAME];
 	
 	copy_m4_m4(obmat, ob->obmat);	/* to cope with duplicators from next_object */
 	invert_m4_m4(obinv, ob->obmat);
@@ -1619,7 +1619,7 @@ float init_meta(Scene *scene, Object *ob)	/* return totsize */
 				else ml= mb->elems.first;
 			}
 			else {
-				char name[32];
+				char name[MAX_ID_NAME];
 				int nr;
 				
 				BLI_split_name_num(name, &nr, bob->id.name+2, '.');
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index 8f00cdac0db..d2b81a345a7 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -830,7 +830,7 @@ Object *add_object(struct Scene *scene, int type)
 {
 	Object *ob;
 	Base *base;
-	char name[32];
+	char name[MAX_ID_NAME];
 
 	BLI_strncpy(name, get_obdata_defname(type), sizeof(name));
 	ob = add_only_object(type, name);
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c
index 731f82e1b80..b13e451b689 100644
--- a/source/blender/blenkernel/intern/seqeffects.c
+++ b/source/blender/blenkernel/intern/seqeffects.c
@@ -176,7 +176,7 @@ static void open_plugin_seq(PluginSeq *pis, const char *seqname)
 				MEM_freeN(info);
 
 				cp= BLI_dynlib_find_symbol(pis->handle, "seqname");
-				if(cp) BLI_strncpy(cp, seqname, 21);
+				if(cp) BLI_strncpy(cp, seqname, SEQ_NAME_MAXSTR);
 			} else {
 				printf ("Plugin returned unrecognized version number\n");
 				return;
@@ -303,7 +303,10 @@ static struct ImBuf * do_plugin_effect(
 		cp = BLI_dynlib_find_symbol(
 			seq->plugin->handle, "seqname");
 
-		if(cp) strncpy(cp, seq->name+2, 22);
+		/* XXX: it's crappy to limit copying buffer by it's lemgth,
+		 *      but assuming plugin stuff is using correct buffer size
+		 *      it should be fine */
+		if(cp) strncpy(cp, seq->name+2, sizeof(seq->name));
 
 		if (seq->plugin->current_private_data) {
 			*seq->plugin->current_private_data 
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 6da9199ddc4..fe99c76575d 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -833,8 +833,8 @@ void clear_scene_in_allseqs(Main *bmain, Scene *scene)
 
 typedef struct SeqUniqueInfo {
 	Sequence *seq;
-	char name_src[32];
-	char name_dest[32];
+	char name_src[SEQ_NAME_MAXSTR];
+	char name_dest[SEQ_NAME_MAXSTR];
 	int count;
 	int match;
 } SeqUniqueInfo;
@@ -3388,13 +3388,13 @@ int seq_swap(Sequence *seq_a, Sequence *seq_b, const char **error_str)
 /* XXX - hackish function needed for transforming strips! TODO - have some better solution */
 void seq_offset_animdata(Scene *scene, Sequence *seq, int ofs)
 {
-	char str[32];
+	char str[SEQ_NAME_MAXSTR+3];
 	FCurve *fcu;
 
 	if(scene->adt==NULL || ofs==0 || scene->adt->action==NULL)
 		return;
 
-	sprintf(str, "[\"%s\"]", seq->name+2);
+	BLI_snprintf(str, sizeof(str), "[\"%s\"]", seq->name+2);
 
 	for (fcu= scene->adt->action->curves.first; fcu; fcu= fcu->next) {
 		if(strstr(fcu->rna_path, "sequence_editor.sequences_all[") && strstr(fcu->rna_path, str)) {
@@ -3411,7 +3411,7 @@ void seq_offset_animdata(Scene *scene, Sequence *seq, int ofs)
 
 void seq_dupe_animdata(Scene *scene, const char *name_src, const char *name_dst)
 {
-	char str_from[32];
+	char str_from[SEQ_NAME_MAXSTR+3];
 	FCurve *fcu;
 	FCurve *fcu_last;
 	FCurve *fcu_cpy;
@@ -3420,7 +3420,7 @@ void seq_dupe_animdata(Scene *scene, const char *name_src, const char *name_dst)
 	if(scene->adt==NULL || scene->adt->action==NULL)
 		return;
 
-	sprintf(str_from, "[\"%s\"]", name_src);
+	BLI_snprintf(str_from, sizeof(str_from), "[\"%s\"]", name_src);
 
 	fcu_last= scene->adt->action->curves.last;
 
@@ -3441,13 +3441,13 @@ void seq_dupe_animdata(Scene *scene, const char *name_src, const char *name_dst)
 /* XXX - hackish function needed to remove all fcurves belonging to a sequencer strip */
 static void seq_free_animdata(Scene *scene, Sequence *seq)
 {
-	char str[32];
+	char str[SEQ_NAME_MAXSTR+3];
 	FCurve *fcu;
 
 	if(scene->adt==NULL || scene->adt->action==NULL)
 		return;
 
-	sprintf(str, "[\"%s\"]", seq->name+2);
+	BLI_snprintf(str, sizeof(str), "[\"%s\"]", seq->name+2);
 
 	fcu= scene->adt->action->curves.first; 
 
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 649984a7934..f5b677203f6 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -233,7 +233,7 @@ struct bSound* sound_new_buffer(struct Main *bmain, struct bSound *source)
 {
 	bSound* sound = NULL;
 
-	char name[25];
+	char name[MAX_ID_NAME+5];
 	strcpy(name, "buf_");
 	strcpy(name + 4, source->id.name);
 
@@ -257,7 +257,7 @@ struct bSound* sound_new_limiter(struct Main *bmain, struct bSound *source, floa
 {
 	bSound* sound = NULL;
 
-	char name[25];
+	char name[MAX_ID_NAME+5];
 	strcpy(name, "lim_");
 	strcpy(name + 4, source->id.name);
 
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c
index e55f4dfbf78..1957f20c8bf 100644
--- a/source/blender/blenkernel/intern/tracking.c
+++ b/source/blender/blenkernel/intern/tracking.c
@@ -651,7 +651,7 @@ void BKE_tracking_clipboard_paste_tracks(MovieTracking *tracking, MovieTrackingO
 /*********************** tracks map *************************/
 
 typedef struct TracksMap {
-	char object_name[32];
+	char object_name[MAX_NAME];
 	int is_camera;
 
 	int num_tracks;
@@ -1529,7 +1529,7 @@ typedef struct MovieReconstructContext {
 
 	struct libmv_Reconstruction *reconstruction;
 #endif
-	char object_name[32];
+	char object_name[MAX_NAME];
 	int is_camera;
 
 	float focal_length;