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.

26 files changed, 148 insertions, 140 deletions

diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index f0e126db813..f311d94703f 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -53,7 +53,7 @@ typedef struct IDProperty {
 	struct IDProperty *next, *prev;
 	char type, subtype;
 	short flag;
-	char name[32];
+	char name[64];	/* MAX_IDPROP_NAME */
 	int saved; /*saved is used to indicate if this struct has been saved yet.
 				seemed like a good idea as a pad var was needed anyway :)*/
 	IDPropertyData data;	/* note, alignment for 64 bits */
@@ -65,7 +65,7 @@ typedef struct IDProperty {
 					saved.*/
 } IDProperty;
 
-#define MAX_IDPROP_NAME	32
+#define MAX_IDPROP_NAME	64
 #define DEFAULT_ALLOC_FOR_NULL_STRINGS	64
 
 /*->type*/
@@ -96,7 +96,8 @@ typedef struct IDProperty {
  * provides a common handle to place all data in double-linked lists.
  * */
 
-#define MAX_ID_NAME	24
+/* 2 characters for ID code and 64 for actual name */
+#define MAX_ID_NAME	66
 
 /* There's a nasty circular dependency here.... void* to the rescue! I
  * really wonder why this is needed. */
@@ -104,14 +105,14 @@ typedef struct ID {
 	void *next, *prev;
 	struct ID *newid;
 	struct Library *lib;
-	char name[24];
-	short us;
+	char name[66];
+	short pad, us;
 	/**
 	 * LIB_... flags report on status of the datablock this ID belongs
 	 * to.
 	 */
 	short flag;
-	int icon_id;
+	int icon_id, pad2;
 	IDProperty *properties;
 } ID;
 
diff --git a/source/blender/makesdna/DNA_action_types.h b/source/blender/makesdna/DNA_action_types.h
index 9cee4e188ff..7df4ebd3c55 100644
--- a/source/blender/makesdna/DNA_action_types.h
+++ b/source/blender/makesdna/DNA_action_types.h
@@ -184,7 +184,7 @@ typedef struct bPoseChannel {
 	IDProperty 			*prop;		/* User-Defined Properties on this PoseChannel */			
 	
 	ListBase			constraints;/* Constraints that act on this PoseChannel */
-	char				name[32];	/* Channels need longer names than normal blender objects */
+	char				name[72];	/* Channels need longer names than normal blender objects */
 	
 	short				flag;		/* dynamic, for detecting transform changes */
 	short				ikflag;		/* settings for IK bones */
@@ -345,7 +345,7 @@ typedef struct bPose {
 	void *ikparam;				/* IK solver parameters, structure depends on iksolver */ 
 	
 	bAnimVizSettings avs;		/* settings for visualization of bone animation */
-	char proxy_act_bone[32];    /* proxy active bone name*/
+	char proxy_act_bone[64];    /* proxy active bone name, MAXBONENAME */
 } bPose;
 
 
@@ -669,7 +669,7 @@ typedef struct bActionChannel {
 	ListBase				constraintChannels;		/* Constraint Channels (when Action Channel represents an Object or Bone) */
 	
 	int		flag;			/* settings accessed via bitmapping */
-	char	name[32];		/* channel name */
+	char	name[64];		/* channel name, MAX_NAME */
 	int		temp;			/* temporary setting - may be used to indicate group that channel belongs to during syncing  */
 } bActionChannel;
 
diff --git a/source/blender/makesdna/DNA_actuator_types.h b/source/blender/makesdna/DNA_actuator_types.h
index 076910ade1f..3be46538c22 100644
--- a/source/blender/makesdna/DNA_actuator_types.h
+++ b/source/blender/makesdna/DNA_actuator_types.h
@@ -50,8 +50,8 @@ typedef struct bActionActuator {
 	struct bAction *act;	/* Pointer to action */				
 	short	type, flag;		/* Playback type */  // not in use
 	float	sta, end;		/* Start & End frames */			
-	char	name[32];		/* For property-driven playback */	
-	char	frameProp[32];	/* Set this property to the actions current frame */
+	char	name[64];		/* For property-driven playback, MAX_NAME */	
+	char	frameProp[64];	/* Set this property to the actions current frame, MAX_NAME */
 	short	blendin;		/* Number of frames of blending */
 	short	priority;		/* Execution priority */
 	short	layer;			/* Animation layer */
@@ -90,7 +90,7 @@ typedef struct bEditObjectActuator {
 	short type, flag;
 	struct Object *ob;
 	struct Mesh *me;
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	float linVelocity[3]; /* initial lin. velocity on creation */
 	float angVelocity[3]; /* initial ang. velocity on creation */
 	float mass;
@@ -107,7 +107,7 @@ typedef struct bSceneActuator {
 
 typedef struct bPropertyActuator {
 	int pad, type;
-	char name[32], value[32];
+	char name[64], value[64];	/* MAX_NAME */
 	struct Object *ob;
 } bPropertyActuator;
 
@@ -125,8 +125,8 @@ typedef struct bObjectActuator {
 typedef struct bIpoActuator {
 	short flag, type;
 	float sta, end;
-	char name[32];
-	char frameProp[32];	/* Set this property to the actions current frame */
+	char name[64];		/* MAX_NAME */
+	char frameProp[64];	/* Set this property to the actions current frame, MAX_NAME */
 	
 	short pad1, pad2, pad3, pad4;
 	
@@ -147,13 +147,13 @@ typedef struct bConstraintActuator {
 	int pad;
 	float minloc[3], maxloc[3];
 	float minrot[3], maxrot[3];
-	char matprop[32];
+	char matprop[64];	/* MAX_NAME */
 } bConstraintActuator;
 
 typedef struct bGroupActuator {
 	short flag, type;
 	int sta, end;
-	char name[32];		/* property or groupkey */
+	char name[64];		/* property or groupkey, MAX_NAME */
 	
 	short pad[3], cur, butsta, butend;/* not referenced, can remove? */
 	/* struct Group *group;		not used, remove */
@@ -168,16 +168,16 @@ typedef struct bRandomActuator {
 	int int_arg_2;
 	float float_arg_1;
 	float float_arg_2;
-	char  propname[32];
+	char  propname[64];	/* MAX_NAME */
 } bRandomActuator;
 
 typedef struct bMessageActuator {
-	char toPropName[32];	/* Send to all objects with this propertyname. Empty to broadcast. */
+	char toPropName[64];	/* Send to all objects with this propertyname. Empty to broadcast. MAX_NAME. */
 	struct Object *toObject;/* (Possible future use) pointer to a single destination object. */
-	char subject[32];		/* Message Subject to send. */
+	char subject[64];		/* Message Subject to send. MAX_NAME. */
 	short bodyType, pad1;	/* bodyType is either 'User defined text' or PropName */
 	int pad2;
-	char body[32];			/* Either User Defined Text or our PropName to send value of */
+	char body[64];			/* Either User Defined Text or our PropName to send value of, MAX_NAME */
 } bMessageActuator;
 
 typedef struct bGameActuator {
@@ -220,8 +220,8 @@ typedef struct bStateActuator {
 } bStateActuator;
 
 typedef struct bArmatureActuator {
-	char posechannel[32];
-	char constraint[32];
+	char posechannel[64];	/* MAX_NAME */
+	char constraint[64];	/* MAX_NAME */
 	int type;		/* 0=run, 1=enable, 2=disable, 3=set target, 4=set weight */
 	float weight;
 	struct Object *target;
@@ -250,7 +250,7 @@ typedef struct bActuator {
 	 */
 	short flag;
 	short otype, go;
-	char name[32];
+	char name[64];	/* MAX_NAME */
 
 	/**
 	 * data must point to an object actuator type struct.
diff --git a/source/blender/makesdna/DNA_armature_types.h b/source/blender/makesdna/DNA_armature_types.h
index 45c30315575..33f965663de 100644
--- a/source/blender/makesdna/DNA_armature_types.h
+++ b/source/blender/makesdna/DNA_armature_types.h
@@ -49,7 +49,7 @@ typedef struct Bone {
 	IDProperty 		*prop;			/* User-Defined Properties on this Bone */
 	struct Bone		*parent;		/*	Parent (ik parent if appropriate flag is set		*/
 	ListBase		childbase;		/*	Children	*/
-	char			name[32];		/*  Name of the bone - must be unique within the armature */
+	char			name[64];		/*  Name of the bone - must be unique within the armature, MAXBONENAME */
 
 	float			roll;   /*  roll is input for editmode, length calculated */
 	float			head[3];		
@@ -200,6 +200,6 @@ typedef enum eBone_Flag {
 	BONE_NO_LOCAL_LOCATION		= (1<<22)	/* bone location is in armature space */
 } eBone_Flag;
 
-#define MAXBONENAME 32
+#define MAXBONENAME 64
 
 #endif
diff --git a/source/blender/makesdna/DNA_constraint_types.h b/source/blender/makesdna/DNA_constraint_types.h
index c829d5be294..fdc493ddfd3 100644
--- a/source/blender/makesdna/DNA_constraint_types.h
+++ b/source/blender/makesdna/DNA_constraint_types.h
@@ -61,11 +61,12 @@ typedef struct bConstraint {
 	char 		ownspace;	/* 	Space that owner should be evaluated in 	*/
 	char		tarspace;	/* 	Space that target should be evaluated in (only used if 1 target) */
 	
-	char		name[30];	/*	Constraint name */
+	char		name[64];	/*	Constraint name, MAX_NAME */
+	
+	short		pad;
 	
 	float		enforce;	/* 	Amount of influence exherted by constraint (0.0-1.0) */
 	float		headtail;	/*	Point along subtarget bone where the actual target is. 0=head (default for all), 1=tail*/
-	int			pad;
 	
 	struct Ipo *ipo    DNA_DEPRECATED;		/* local influence ipo or driver */  /* old animation system, deprecated for 2.5 */
 	
@@ -85,7 +86,7 @@ typedef struct bConstraintTarget {
 	struct bConstraintTarget *next, *prev;
 
 	struct Object *tar;			/* object to use as target */
-	char subtarget[32];		/* subtarget - pchan or vgroup name */
+	char subtarget[64];		/* subtarget - pchan or vgroup name, MAX_ID_NAME-2 */
 	
 	float matrix[4][4];		/* matrix used during constraint solving - should be cleared before each use */
 	
@@ -121,7 +122,7 @@ typedef struct bPythonConstraint {
 	ListBase targets;		/* a list of targets that this constraint has (bConstraintTarget-s) */
 	
 	struct Object *tar;		/* target from previous implementation (version-patch sets this to NULL on file-load) */
-	char subtarget[32];		/* subtarger from previous implentation (version-patch sets this to "" on file-load) */
+	char subtarget[64];		/* subtarger from previous implentation (version-patch sets this to "" on file-load), MAX_ID_NAME-2 */
 } bPythonConstraint;
 
 
@@ -137,9 +138,9 @@ typedef struct bKinematicConstraint {
 	short		flag;			/* All & CopyPose: some options Like CONSTRAINT_IK_TIP */
 	short		rootbone;		/* All: index to rootbone, if zero go all the way to mother bone */
 	short		max_rootbone;	/* CopyPose: for auto-ik, maximum length of chain */
-	char		subtarget[32];	/* All: String to specify sub-object target */
+	char		subtarget[64];	/* All: String to specify sub-object target, MAX_ID_NAME-2 */
 	struct Object		*poletar;			/* All: Pole vector target */
-	char		polesubtarget[32];	/* All: Pole vector sub-object target */
+	char		polesubtarget[64];	/* All: Pole vector sub-object target, MAX_ID_NAME-2 */
 	float		poleangle;			/* All: Pole vector rest angle */
 	float		weight;			/* All: Weight of constraint in IK tree */
 	float		orientweight;	/* CopyPose: Amount of rotation a target applies on chain */
@@ -187,7 +188,7 @@ typedef struct bTrackToConstraint {
 	int			reserved2;
 	int			flags;
 	int			pad;
-	char		subtarget[32];
+	char		subtarget[64];	/* MAX_ID_NAME-2 */
 } bTrackToConstraint;
 
 /* Copy Rotation Constraint */
@@ -195,7 +196,7 @@ typedef struct bRotateLikeConstraint {
 	struct Object		*tar;
 	int			flag;
 	int			reserved1;
-	char		subtarget[32];
+	char		subtarget[64];	/* MAX_ID_NAME-2 */
 } bRotateLikeConstraint;
 
 /* Copy Location Constraint */
@@ -203,7 +204,7 @@ typedef struct bLocateLikeConstraint {
 	struct Object		*tar;
 	int			flag;
 	int			reserved1;
-	char		subtarget[32];
+	char		subtarget[64];	/* MAX_ID_NAME-2 */
 } bLocateLikeConstraint;
 
 /* Copy Scale Constraint */
@@ -211,7 +212,7 @@ typedef struct bSizeLikeConstraint {
 	struct Object		*tar;
 	int			flag;
 	int			reserved1;
-	char		subtarget[32];
+	char		subtarget[64];	/* MAX_ID_NAME-2 */
 } bSizeLikeConstraint;
 
 /* Maintain Volume Constraint */
@@ -223,7 +224,7 @@ typedef struct bSameVolumeConstraint {
 /* Copy Transform Constraint */
 typedef struct bTransLikeConstraint {
 	struct Object *tar;
-	char 		subtarget[32];
+	char 		subtarget[64];	/* MAX_ID_NAME-2 */
 } bTransLikeConstraint;
 
 /* Floor Constraint */
@@ -234,7 +235,7 @@ typedef struct bMinMaxConstraint {
 	int			flag;
 	short		sticky, stuck, pad1, pad2; /* for backward compatibility */
 	float		cache[3];
-	char		subtarget[32];
+	char		subtarget[64];	/* MAX_ID_NAME-2 */
 } bMinMaxConstraint;
 
 /* Action Constraint */
@@ -248,7 +249,7 @@ typedef struct bActionConstraint {
 	float		max;
 	int         pad;
 	struct bAction	*act;
-	char		subtarget[32];
+	char		subtarget[64];	/* MAX_ID_NAME-2 */
 } bActionConstraint;
 
 /* Locked Axis Tracking constraint */
@@ -256,7 +257,7 @@ typedef struct bLockTrackConstraint {
 	struct Object		*tar;
 	int			trackflag;
 	int			lockflag;
-	char		subtarget[32];
+	char		subtarget[64];	/* MAX_ID_NAME-2 */
 } bLockTrackConstraint;
 
 /* Damped Tracking constraint */
@@ -264,7 +265,7 @@ typedef struct bDampTrackConstraint {
 	struct Object		*tar;
 	int			trackflag;
 	int			pad;
-	char		subtarget[32];
+	char		subtarget[64];	/* MAX_ID_NAME-2 */
 } bDampTrackConstraint;
 
 /* Follow Path constraints */
@@ -287,7 +288,7 @@ typedef struct bStretchToConstraint {
 	int         plane;
 	float		orglength;
 	float		bulge;
-	char		subtarget[32];
+	char		subtarget[64];	/* MAX_ID_NAME-2 */
 } bStretchToConstraint;
 
 /* Rigid Body constraint */
@@ -323,13 +324,13 @@ typedef struct bChildOfConstraint {
 	int 		flag;			/* settings */
 	int			pad;
 	float		invmat[4][4];	/* parent-inverse matrix to use */
-	char 		subtarget[32];	/* string to specify a subobject target */
+	char 		subtarget[64];	/* string to specify a subobject target, MAX_ID_NAME-2 */
 } bChildOfConstraint;
 
 /* Generic Transform->Transform Constraint */
 typedef struct bTransformConstraint {
 	struct Object 		*tar;			/* target (i.e. 'driver' object/bone) */
-	char 		subtarget[32];	
+	char 		subtarget[64];		/* MAX_ID_NAME-2 */
 	
 	short		from, to;		/* can be loc(0) , rot(1),  or size(2) */
 	char		map[3];			/* defines which target-axis deform is copied by each owner-axis */
@@ -348,7 +349,7 @@ typedef struct bPivotConstraint {
 	 *	Either target object + offset, or just offset is used
 	 */
 	struct Object 		*tar;			/* target object (optional) */
-	char		subtarget[32];		/* subtarget name (optional) */
+	char		subtarget[64];		/* subtarget name (optional), MAX_ID_NAME-2 */
 	float 		offset[3];		/* offset from the target to use, regardless of whether it exists */
 	
 	/* Rotation-driven activation:
@@ -391,7 +392,7 @@ typedef struct bSizeLimitConstraint {
 /* Limit Distance Constraint */
 typedef struct bDistLimitConstraint {
 	struct Object 		*tar;
-	char 		subtarget[32];
+	char 		subtarget[64];		/* MAX_ID_NAME-2 */
 	
 	float 		dist;			/* distance (radius of clamping sphere) from target */
 	float		soft;			/* distance from clamping-sphere to start applying 'fade' */
@@ -413,9 +414,9 @@ typedef struct bShrinkwrapConstraint {
 /* Follow Track constraints */
 typedef struct bFollowTrackConstraint {
 	struct MovieClip	*clip;
-	char	track[24];
+	char	track[64];	/* MAX_NAME */
 	int		flag, pad;
-	char		object[24];
+	char		object[64];	/* MAX_NAME */
 	struct Object *camera;
 	struct Object *depth_ob;
 } bFollowTrackConstraint;
@@ -430,7 +431,7 @@ typedef struct bCameraSolverConstraint {
 typedef struct bObjectSolverConstraint {
 	struct MovieClip	*clip;
 	int		flag, pad;
-	char		object[24];
+	char		object[64];	/* MAX_NAME */
 	float		invmat[4][4];	/* parent-inverse matrix to use */
 	struct Object *camera;
 } bObjectSolverConstraint;
diff --git a/source/blender/makesdna/DNA_controller_types.h b/source/blender/makesdna/DNA_controller_types.h
index c8f4325d717..51ab29db7ae 100644
--- a/source/blender/makesdna/DNA_controller_types.h
+++ b/source/blender/makesdna/DNA_controller_types.h
@@ -54,7 +54,7 @@ typedef struct bController {
 	short type, flag, inputs, totlinks;
 	short otype, totslinks, pad2, pad3;
 	
-	char name[32];
+	char name[64];
 	void *data;
 	
 	struct bActuator **links;
diff --git a/source/blender/makesdna/DNA_customdata_types.h b/source/blender/makesdna/DNA_customdata_types.h
index 8259eea42ce..00a0cf8881f 100644
--- a/source/blender/makesdna/DNA_customdata_types.h
+++ b/source/blender/makesdna/DNA_customdata_types.h
@@ -48,10 +48,12 @@ typedef struct CustomDataLayer {
 	int active_clone; /* number of the layer to render*/
 	int active_mask; /* number of the layer to render*/
 	char pad[4];
-	char name[32];  /* layer name */
+	char name[64];  /* layer name, MAX_CUSTOMDATA_LAYER_AAME */
 	void *data;     /* layer data */
 } CustomDataLayer;
 
+#define MAX_CUSTOMDATA_LAYER_NAME 64
+
 typedef struct CustomDataExternal {
 	char filename[240]; /* FILE_MAX */
 } CustomDataExternal;
diff --git a/source/blender/makesdna/DNA_defs.h b/source/blender/makesdna/DNA_defs.h
index 575938da653..46d7fc2b009 100644
--- a/source/blender/makesdna/DNA_defs.h
+++ b/source/blender/makesdna/DNA_defs.h
@@ -47,4 +47,7 @@
 
 #define USE_BMESH_FORWARD_COMPAT
 
+/* non-id name variables should use this length */
+#define MAX_NAME 64
+
 #endif /* DNA_DEFS_H */
diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h
index d58e11d9640..5ea82709239 100644
--- a/source/blender/makesdna/DNA_dynamicpaint_types.h
+++ b/source/blender/makesdna/DNA_dynamicpaint_types.h
@@ -124,7 +124,7 @@ typedef struct DynamicPaintSurface {
 
 	int pad_;
 
-	char uvlayer_name[32];
+	char uvlayer_name[64];	/* MAX_CUSTOMDATA_LAYER_NAME */
 	char image_output_path[240];
 	char output_name[40];
 	char output_name2[40]; /* some surfaces have 2 outputs */
diff --git a/source/blender/makesdna/DNA_effect_types.h b/source/blender/makesdna/DNA_effect_types.h
index b7437b5e973..ddff22aae37 100644
--- a/source/blender/makesdna/DNA_effect_types.h
+++ b/source/blender/makesdna/DNA_effect_types.h
@@ -118,7 +118,7 @@ typedef struct PartEff {
 	short staticstep, omat, timetex, speedtex, flag2, flag2neg;
 	short disp, vertgroup_v;
 	
-	char vgroupname[32], vgroupname_v[32];
+	char vgroupname[64], vgroupname_v[64];	/* MAX_VGROUP_NAME */
 	float imat[4][4];	/* inverse matrix of parent Object */
 	
 	Particle *keys;
diff --git a/source/blender/makesdna/DNA_key_types.h b/source/blender/makesdna/DNA_key_types.h
index 12fb9b92602..b64389a365c 100644
--- a/source/blender/makesdna/DNA_key_types.h
+++ b/source/blender/makesdna/DNA_key_types.h
@@ -48,8 +48,8 @@ typedef struct KeyBlock {
 	
 	void *data;
 	float *weights;
-	char  name[32];
-	char vgroup[32];
+	char  name[64];	/* MAX_NAME */
+	char vgroup[64];	/* MAX_VGROUP_NAME */
 
 	float slidermin;
 	float slidermax;
@@ -61,7 +61,7 @@ typedef struct Key {
 	struct AnimData *adt;	/* animation data (must be immediately after id for utilities to use it) */ 
 	
 	KeyBlock *refkey;
-	char elemstr[32];
+	char elemstr[64];	/* MAX_NAME */
 	int elemsize;
 	float curval  DNA_DEPRECATED;
 	
diff --git a/source/blender/makesdna/DNA_lattice_types.h b/source/blender/makesdna/DNA_lattice_types.h
index 2a67afb5708..0a73ed5b24f 100644
--- a/source/blender/makesdna/DNA_lattice_types.h
+++ b/source/blender/makesdna/DNA_lattice_types.h
@@ -66,7 +66,7 @@ typedef struct Lattice {
 	struct Key *key;
 	
 	struct MDeformVert *dvert;
-	char vgroup[32]; /* multiply the influence */
+	char vgroup[64]; /* multiply the influence, MAX_VGROUP_NAME */
 	
 	/* used while deforming, always free and NULL after use */
 	float *latticedata;
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index 55e9328a72a..eacc1b222e4 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -121,7 +121,7 @@ typedef struct Material {
 	float hasize, flaresize, subsize, flareboost;
 	float strand_sta, strand_end, strand_ease, strand_surfnor;
 	float strand_min, strand_widthfade;
-	char strand_uvname[32];
+	char strand_uvname[64];	/* MAX_CUSTOMDATA_LAYER_NAME */
 	
 	float sbias;			/* shadow bias to prevent terminator prob */
 	float lbias;			/* factor to multiply lampbias with (0.0 = no mult) */
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 77fa03aeedc..e310f148110 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -96,7 +96,7 @@ typedef struct ModifierData {
 
 	int type, mode;
 	int stackindex, pad;
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	
 	/* XXX for timing info set by caller... solve later? (ton) */
 	struct Scene *scene;
@@ -117,7 +117,7 @@ typedef struct MappingInfoModifierData {
 
 	struct Tex *texture;
 	struct Object *map_object;
-	char uvlayer_name[32];
+	char uvlayer_name[64];	/* MAX_CUSTOMDATA_LAYER_NAME */
 	int uvlayer_tmp;
 	int texmapping;
 } MappingInfoModifierData;
@@ -134,14 +134,14 @@ typedef struct LatticeModifierData {
 	ModifierData modifier;
 
 	struct Object *object;
-	char name[32];			/* optional vertexgroup name */
+	char name[64];			/* optional vertexgroup name, MAX_VGROUP_NAME */
 } LatticeModifierData;
 
 typedef struct CurveModifierData {
 	ModifierData modifier;
 
 	struct Object *object;
-	char name[32];			/* optional vertexgroup name */
+	char name[64];			/* optional vertexgroup name, MAX_VGROUP_NAME */
 	short defaxis;			/* axis along which curve deforms */
 	char pad[6];
 } CurveModifierData;
@@ -166,7 +166,7 @@ typedef struct MaskModifierData {
 	ModifierData modifier;
 	
 	struct Object *ob_arm;	/* armature to use to in place of hardcoded vgroup */
-	char vgroup[32];		/* name of vertex group to use to mask */
+	char vgroup[64];		/* name of vertex group to use to mask, MAX_VGROUP_NAME */
 	
 	int mode;				/* using armature or hardcoded vgroup */
 	int flag;				/* flags for various things */
@@ -278,7 +278,7 @@ typedef struct BevelModifierData {
 	short lim_flags;      /* flags to tell the tool how to limit the bevel */
 	short e_flags;        /* flags to direct how edge weights are applied to verts */
 	float bevel_angle;    /* if the BME_BEVEL_ANGLE is set, this will be how "sharp" an edge must be before it gets beveled */
-	char defgrp_name[32]; /* if the BME_BEVEL_VWEIGHT option is set, this will be the name of the vert group */
+	char defgrp_name[64]; /* if the BME_BEVEL_VWEIGHT option is set, this will be the name of the vert group, MAX_VGROUP_NAME */
 } BevelModifierData;
 
 typedef struct BMeshModifierData {
@@ -310,14 +310,14 @@ typedef struct DisplaceModifierData {
 	/* keep in sync with MappingInfoModifierData */
 	struct Tex *texture;
 	struct Object *map_object;
-	char uvlayer_name[32];
+	char uvlayer_name[64];	/* MAX_CUSTOMDATA_LAYER_NAME */
 	int uvlayer_tmp;
 	int texmapping;
 	/* end MappingInfoModifierData */
 
 	float strength;
 	int direction;
-	char defgrp_name[32];
+	char defgrp_name[64];	/* MAX_VGROUP_NAME */
 	float midlevel;
 	int pad;
 } DisplaceModifierData;
@@ -349,7 +349,7 @@ typedef struct UVProjectModifierData {
 	int num_projectors;
 	float aspectx, aspecty;
 	float scalex, scaley;												
-	char uvlayer_name[32];
+	char uvlayer_name[64];	/* MAX_CUSTOMDATA_LAYER_NAME */
 	int uvlayer_tmp, pad;
 } UVProjectModifierData;
 
@@ -373,7 +373,7 @@ typedef struct DecimateModifierData {
 typedef struct SmoothModifierData {
 	ModifierData modifier;
 	float fac;
-	char defgrp_name[32];
+	char defgrp_name[64];	/* MAX_VGROUP_NAME */
 	short flag, repeat;
 
 } SmoothModifierData;
@@ -397,7 +397,7 @@ typedef struct CastModifierData {
 	float fac;
 	float radius;
 	float size;
-	char defgrp_name[32];
+	char defgrp_name[64];	/* MAX_VGROUP_NAME */
 	short flag, type;
 } CastModifierData;
 
@@ -416,13 +416,13 @@ typedef struct WaveModifierData {
 	/* keep in sync with MappingInfoModifierData */
 	struct Tex *texture;
 	struct Object *map_object;
-	char uvlayer_name[32];
+	char uvlayer_name[64];	/* MAX_CUSTOMDATA_LAYER_NAME */
 	int uvlayer_tmp;
 	int texmapping;
 	/* end MappingInfoModifierData */
 
 	struct Object *objectcenter;
-	char defgrp_name[32];
+	char defgrp_name[64];	/* MAX_VGROUP_NAME */
 
 	short flag, pad;
 
@@ -440,14 +440,14 @@ typedef struct ArmatureModifierData {
 	int pad2;
 	struct Object *object;
 	float *prevCos;		/* stored input of previous modifier, for vertexgroup blending */
-	char defgrp_name[32];
+	char defgrp_name[64];	/* MAX_VGROUP_NAME */
 } ArmatureModifierData;
 
 typedef struct HookModifierData {
 	ModifierData modifier;
 
 	struct Object *object;
-	char subtarget[32];		/* optional name of bone target */
+	char subtarget[64];		/* optional name of bone target, MAX_ID_NAME-2 */
 	
 	float parentinv[4][4];	/* matrix making current transform unmodified */
 	float cent[3];			/* visualization of hook */
@@ -456,7 +456,7 @@ typedef struct HookModifierData {
 	int *indexar;			/* if NULL, it's using vertexgroup */
 	int totindex;
 	float force;
-	char name[32];			/* optional vertexgroup name */
+	char name[64];			/* optional vertexgroup name, MAX_VGROUP_NAME */
 } HookModifierData;
 
 typedef struct SoftbodyModifierData {
@@ -537,7 +537,7 @@ typedef struct MeshDeformModifierData {
 	ModifierData modifier;
 
 	struct Object *object;			/* mesh object */
-	char defgrp_name[32];			/* optional vertexgroup name */
+	char defgrp_name[64];			/* optional vertexgroup name, MAX_VGROUP_NAME */
 
 	short gridsize, flag, mode, pad;
 
@@ -613,7 +613,7 @@ typedef struct ExplodeModifierData {
 	int *facepa;
 	short flag, vgroup;
 	float protect;
-	char uvname[32];
+	char uvname[64];	/* MAX_CUSTOMDATA_LAYER_NAME */
 } ExplodeModifierData;
 
 typedef struct MultiresModifierData {
@@ -640,7 +640,7 @@ typedef struct ShrinkwrapModifierData {
 
 	struct Object *target;	/* shrink target */
 	struct Object *auxTarget; /* additional shrink target */
-	char vgroup_name[32];	/* optional vertexgroup name */
+	char vgroup_name[64];	/* optional vertexgroup name, MAX_VGROUP_NAME */
 	float keepDist;			/* distance offset to keep from mesh/projection point */
 	short shrinkType;		/* shrink type projection */
 	short shrinkOpts;		/* shrink options */
@@ -680,7 +680,7 @@ typedef struct SimpleDeformModifierData {
 	ModifierData modifier;
 
 	struct Object *origin;	/* object to control the origin of modifier space coordinates */
-	char vgroup_name[32];	/* optional vertexgroup name */
+	char vgroup_name[64];	/* optional vertexgroup name, MAX_VGROUP_NAME */
 	float factor;			/* factors to control simple deforms */
 	float limit[2];			/* lower and upper limit */		
 
@@ -712,7 +712,7 @@ typedef struct ShapeKeyModifierData {
 typedef struct SolidifyModifierData {
 	ModifierData modifier;
 
-	char defgrp_name[32];	/* name of vertex group to use */
+	char defgrp_name[64];	/* name of vertex group to use, MAX_VGROUP_NAME */
 	float offset;			/* new surface offset level*/
 	float offset_fac;		/* midpoint of the offset  */
 	float offset_fac_vg;	/* factor for the minimum weight to use when vgroups are used, avoids 0.0 weights giving duplicate geometry */
@@ -774,7 +774,7 @@ typedef struct OceanModifierData {
 	int		bakeend;
 	
 	char	cachepath[240];	// FILE_MAX
-	char	foamlayername[32];
+	char	foamlayername[64];	/* MAX_CUSTOMDATA_LAYER_NAME */
 	char	cached;
 	char	geometry_mode;
 
@@ -814,7 +814,7 @@ typedef struct WarpModifierData {
 	/* keep in sync with MappingInfoModifierData */
 	struct Tex *texture;
 	struct Object *map_object;
-	char uvlayer_name[32];
+	char uvlayer_name[64];	/* MAX_CUSTOMDATA_LAYER_NAME */
 	int uvlayer_tmp;
 	int texmapping;
 	/* end MappingInfoModifierData */
@@ -822,7 +822,7 @@ typedef struct WarpModifierData {
 	struct Object *object_from;
 	struct Object *object_to;
 	struct CurveMapping *curfalloff;
-	char defgrp_name[32];			/* optional vertexgroup name */
+	char defgrp_name[64];			/* optional vertexgroup name, MAX_VGROUP_NAME */
 	float strength;
 	float falloff_radius;
 	char flag; /* not used yet */
@@ -850,7 +850,7 @@ typedef struct WeightVGEditModifierData {
 	/* Note: I tried to keep everything logically ordered - provided the
 	 * alignment constraints... */
 
-	char	defgrp_name[32];      /* Name of vertex group to edit. */
+	char	defgrp_name[64];      /* Name of vertex group to edit. MAX_VGROUP_NAME. */
 
 	short	edit_flags;     /* Using MOD_WVG_EDIT_* flags. */
 	short	falloff_type;   /* Using MOD_WVG_MAPPING_* defines. */
@@ -865,7 +865,7 @@ typedef struct WeightVGEditModifierData {
 	/* Masking options. */
 	float	mask_constant; /* The global "influence", if no vgroup nor tex is used as mask. */
 	/* Name of mask vertex group from which to get weight factors. */
-	char	mask_defgrp_name[32];
+	char	mask_defgrp_name[64];	/* MAX_VGROUP_NAME */
 
 	/* Texture masking. */
 	int		mask_tex_use_channel;      /* Which channel to use as weightf. */
@@ -873,7 +873,7 @@ typedef struct WeightVGEditModifierData {
 	struct Object *mask_tex_map_obj;   /* Name of the map object. */
 	/* How to map the texture (using MOD_DISP_MAP_* constants). */
 	int		mask_tex_mapping;
-	char	mask_tex_uvlayer_name[32]; /* Name of the UV map. */
+	char	mask_tex_uvlayer_name[64]; /* Name of the UV map. MAX_CUSTOMDATA_LAYER_NAME */
 
 	/* Padding... */
 	int pad_i1;
@@ -899,8 +899,8 @@ typedef struct WeightVGMixModifierData {
 	/* XXX Note: I tried to keep everything logically ordered – provided the
 	 *           alignment constraints... */
 
-	char	defgrp_name_a[32];      /* Name of vertex group to modify/weight. */
-	char	defgrp_name_b[32];     /* Name of other vertex group to mix in. */
+	char	defgrp_name_a[64];      /* Name of vertex group to modify/weight. MAX_VGROUP_NAME. */
+	char	defgrp_name_b[64];     /* Name of other vertex group to mix in. MAX_VGROUP_NAME. */
 	float	default_weight_a;       /* Default weight value for first vgroup. */
 	float	default_weight_b;      /* Default weight value to mix in. */
 	char	mix_mode;             /* How second vgroups weights affect first ones */
@@ -911,14 +911,14 @@ typedef struct WeightVGMixModifierData {
 	/* Masking options. */
 	float	mask_constant; /* The global "influence", if no vgroup nor tex is used as mask. */
 	/* Name of mask vertex group from which to get weight factors. */
-	char	mask_defgrp_name[32];
+	char	mask_defgrp_name[64];	/* MAX_VGROUP_NAME */
 
 	/* Texture masking. */
 	int		mask_tex_use_channel;      /* Which channel to use as weightf. */
 	struct Tex *mask_texture;          /* The texture. */
 	struct Object *mask_tex_map_obj;   /* Name of the map object. */
 	int		mask_tex_mapping;          /* How to map the texture! */
-	char	mask_tex_uvlayer_name[32]; /* Name of the UV map. */
+	char	mask_tex_uvlayer_name[64]; /* Name of the UV map. MAX_CUSTOMDATA_LAYER_NAME. */
 
 	/* Padding... */
 	int pad_i1;
@@ -946,7 +946,7 @@ typedef struct WeightVGProximityModifierData {
 	/* Note: I tried to keep everything logically ordered - provided the
 	 * alignment constraints... */
 
-	char	defgrp_name[32];      /* Name of vertex group to modify/weight. */
+	char	defgrp_name[64];      /* Name of vertex group to modify/weight. MAX_VGROUP_NAME. */
 
 	/* Proximity modes. */
 	int		proximity_mode;
@@ -958,14 +958,14 @@ typedef struct WeightVGProximityModifierData {
 	/* Masking options. */
 	float	mask_constant; /* The global "influence", if no vgroup nor tex is used as mask. */
 	/* Name of mask vertex group from which to get weight factors. */
-	char	mask_defgrp_name[32];
+	char	mask_defgrp_name[64];	/* MAX_VGROUP_NAME */
 
 	/* Texture masking. */
 	int		mask_tex_use_channel;      /* Which channel to use as weightf. */
 	struct Tex *mask_texture;          /* The texture. */
 	struct Object *mask_tex_map_obj;   /* Name of the map object. */
 	int		mask_tex_mapping;          /* How to map the texture! */
-	char	mask_tex_uvlayer_name[32]; /* Name of the UV Map. */
+	char	mask_tex_uvlayer_name[64]; /* Name of the UV Map. MAX_CUSTOMDATA_LAYER_NAME. */
 
 	float	min_dist, max_dist;        /* Distances mapping to 0.0/1.0 weights. */
 
diff --git a/source/blender/makesdna/DNA_node_types.h b/source/blender/makesdna/DNA_node_types.h
index 01ffbb44c13..fe4f6905f42 100644
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@ -49,7 +49,7 @@ struct bGPdata;
 struct uiBlock;
 struct Image;
 
-#define NODE_MAXSTR 32
+#define NODE_MAXSTR 64
 
 typedef struct bNodeStack {
 	float vec[4];
@@ -71,7 +71,7 @@ typedef struct bNodeStack {
 typedef struct bNodeSocket {
 	struct bNodeSocket *next, *prev, *new_sock;
 	
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	
 	void *storage;				/* custom storage */
 	
@@ -142,7 +142,7 @@ typedef struct bNodePreview {
 typedef struct bNode {
 	struct bNode *next, *prev, *new_node;
 	
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	short type, flag;
 	short done, level;		/* both for dependency and sorting */
 	short lasty, menunr;	/* lasty: check preview render status, menunr: browse ID blocks */
@@ -160,7 +160,7 @@ typedef struct bNode {
 	
 	int update;				/* update flags */
 	
-	char label[32];			/* custom user-defined label */
+	char label[64];			/* custom user-defined label, MAX_NAME */
 	short custom1, custom2;	/* to be abused for buttons */
 	float custom3, custom4;
 	
@@ -369,12 +369,12 @@ typedef struct NodeTwoFloats {
 } NodeTwoFloats;
 
 typedef struct NodeGeometry {
-	char uvname[32];
-	char colname[32];
+	char uvname[64];	/* MAX_CUSTOMDATA_LAYER_NAME */
+	char colname[64];
 } NodeGeometry;
 
 typedef struct NodeVertexCol {
-	char name[32];
+	char name[64];
 } NodeVertexCol;
 
 /* qdn: Defocus blur node */
@@ -497,7 +497,7 @@ typedef struct NodeShaderAttribute {
 
 /* TEX_output */
 typedef struct TexNodeOutput {
-	char name[32];
+	char name[64];
 } TexNodeOutput;
 
 /* comp channel matte */
diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h
index cb72e396356..28c28bbf329 100644
--- a/source/blender/makesdna/DNA_object_force.h
+++ b/source/blender/makesdna/DNA_object_force.h
@@ -274,7 +274,7 @@ typedef struct SoftBody {
 	
 	/* general options */
 	float nodemass;		/* softbody mass of *vertex* */
-	char  namedVG_Mass[32]; /* along with it introduce mass painting
+	char  namedVG_Mass[64]; /* MAX_VGROUP_NAME */ /* along with it introduce mass painting
 							starting to fix old bug .. nastyness that VG are indexes 
 								rather find them by name tag to find it -> jow20090613 */
 	float grav;			/* softbody amount of gravitaion to apply */
@@ -289,7 +289,7 @@ typedef struct SoftBody {
 	float maxgoal;
 	float defgoal;		/* default goal for vertices without vgroup */
 	short vertgroup;	/* index starting at 1 */
-	char  namedVG_Softgoal[32]; /* starting to fix old bug .. nastyness that VG are indexes 
+	char  namedVG_Softgoal[64]; /* MAX_VGROUP_NAME */ /* starting to fix old bug .. nastyness that VG are indexes 
 								rather find them by name tag to find it -> jow20090613 */
   
 	short fuzzyness;      /* */
@@ -297,7 +297,7 @@ typedef struct SoftBody {
 	/* springs */
 	float inspring;		/* softbody inner springs */
 	float infrict;		/* softbody inner springs friction */
-	char  namedVG_Spring_K[32]; /* along with it introduce Spring_K painting
+	char  namedVG_Spring_K[64]; /* MAX_VGROUP_NAME */ /* along with it introduce Spring_K painting
 	                               starting to fix old bug .. nastyness that VG are indexes
 	                               rather find them by name tag to find it -> jow20090613 */
 	
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 7f1239195ec..b8580b47269 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -61,11 +61,11 @@ struct bGPdata;
 /* Vertex Groups - Name Info */
 typedef struct bDeformGroup {
 	struct bDeformGroup *next, *prev;
-	char name[32];
+	char name[64];	/* MAX_VGROUP_NAME */
 	/* need this flag for locking weights */
 	char flag, pad[7];
 } bDeformGroup;
-#define MAX_VGROUP_NAME 32
+#define MAX_VGROUP_NAME 64
 
 /* bDeformGroup->flag */
 #define DG_LOCK_WEIGHT 1
@@ -107,7 +107,7 @@ typedef struct Object {
 	
 	short type, partype;
 	int par1, par2, par3;	/* can be vertexnrs */
-	char parsubstr[32];	/* String describing subobject info */
+	char parsubstr[64];	/* String describing subobject info, MAX_ID_NAME-2 */
 	struct Object *parent, *track;
 	/* if ob->proxy (or proxy_group), this object is proxy for object ob->proxy */
 	/* proxy_from is set in target back to the proxy. */
@@ -273,7 +273,7 @@ typedef struct ObHook {
 	float cent[3];			/* visualization of hook */
 	float falloff;			/* if not zero, falloff is distance where influence zero */
 	
-	char name[32];
+	char name[64];	/* MAX_NAME */
 
 	int *indexar;
 	int totindex, curindex; /* curindex is cache for fast lookup */
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h
index 07efd17df7f..4c3279c6527 100644
--- a/source/blender/makesdna/DNA_particle_types.h
+++ b/source/blender/makesdna/DNA_particle_types.h
@@ -261,7 +261,7 @@ typedef struct ParticleSystem
 
 	struct ListBase targets;				/* used for keyed and boid physics */
 
-	char name[32];							/* particle system name */
+	char name[64];							/* particle system name, MAX_NAME */
 	
 	float imat[4][4];	/* used for duplicators */
 	float cfra, tree_frame, bvhtree_frame;
@@ -269,7 +269,7 @@ typedef struct ParticleSystem
 	int flag, totpart, totunexist, totchild, totcached, totchildcache;
 	short recalc, target_psys, totkeyed, bakespace;
 
-	char bb_uvname[3][32];					/* billboard uv name */
+	char bb_uvname[3][64];					/* billboard uv name, MAX_CUSTOMDATA_LAYER_NAME */
 
 	/* if you change these remember to update array lengths to PSYS_TOT_VG! */
 	short vgroup[12], vg_neg, rt3;			/* vertex groups, 0==disable, 1==starting index */
diff --git a/source/blender/makesdna/DNA_property_types.h b/source/blender/makesdna/DNA_property_types.h
index e74ae41a421..a36e362632b 100644
--- a/source/blender/makesdna/DNA_property_types.h
+++ b/source/blender/makesdna/DNA_property_types.h
@@ -43,7 +43,7 @@
 
 typedef struct bProperty {
 	struct bProperty *next, *prev;
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	short type, flag;
 	int data;				/* data should be 4 bytes to store int,float stuff */
 	void *poin;				/* references data unless its a string which is malloc'd */
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 7d611acc551..d3eb4f12b2a 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -171,7 +171,7 @@ typedef struct AudioData {
 typedef struct SceneRenderLayer {
 	struct SceneRenderLayer *next, *prev;
 	
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	
 	struct Material *mat_override;
 	struct Group *light_override;
@@ -804,8 +804,9 @@ typedef struct VPaint {
 
 typedef struct TransformOrientation {
 	struct TransformOrientation *next, *prev;
-	char name[36];
+	char name[64];	/* MAX_NAME */
 	float mat[3][3];
+	int pad;
 } TransformOrientation;
 
 /* *************************************************************** */
diff --git a/source/blender/makesdna/DNA_sensor_types.h b/source/blender/makesdna/DNA_sensor_types.h
index e7444b06898..80f19b30079 100644
--- a/source/blender/makesdna/DNA_sensor_types.h
+++ b/source/blender/makesdna/DNA_sensor_types.h
@@ -40,7 +40,7 @@ struct Material;
 /* ****************** SENSORS ********************* */
 
 typedef struct bNearSensor {
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	float dist, resetdist;
 	int lastval, pad;
 } bNearSensor;
@@ -59,7 +59,7 @@ typedef struct bMouseSensor {
 } bMouseSensor;
 
 typedef struct bTouchSensor {
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	struct Material *ma;
 	float dist, pad;
 } bTouchSensor;
@@ -70,25 +70,25 @@ typedef struct bKeyboardSensor {
 	/**
 	 * Name of the target property
 	 */
-	char targetName[32];
+	char targetName[64];	/* MAX_NAME */
 	/**
 	 * Name of the toggle property
 	 */
-	char toggleName[32];
+	char toggleName[64];	/* MAX_NAME */
 } bKeyboardSensor;
 
 typedef struct bPropertySensor {
 	int type;
 	int pad;
-	char name[32];
-	char value[32];
-	char maxvalue[32];
+	char name[64];	/* MAX_NAME */
+	char value[64];
+	char maxvalue[64];
 } bPropertySensor;
 
 typedef struct bActuatorSensor {
 	int type;
 	int pad;
-	char name[32];
+	char name[64];	/* MAX_NAME */
 } bActuatorSensor;
 
 typedef struct bDelaySensor {
@@ -99,8 +99,8 @@ typedef struct bDelaySensor {
 } bDelaySensor;
 
 typedef struct bCollisionSensor {
-	char name[32];          /* property name */
-	char materialName[32];  /* material      */
+	char name[64];          /* property name. MAX_NAME */
+	char materialName[64];  /* material      */
 	// struct Material *ma; // XXX remove materialName
 	short damptimer, damp;
 	short mode;             /* flag to choose material or property */
@@ -108,23 +108,23 @@ typedef struct bCollisionSensor {
 } bCollisionSensor;
 
 typedef struct bRadarSensor {
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	float angle;
 	float range;
 	short flag, axis;
 } bRadarSensor;
 
 typedef struct bRandomSensor {
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	int seed;
 	int delay;
 } bRandomSensor;
 
 typedef struct bRaySensor {
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	float range;
-	char propname[32];
-	char matname[32];
+	char propname[64];
+	char matname[64];
 	//struct Material *ma; // XXX remove materialName
 	short mode;
 	short pad1;
@@ -132,8 +132,8 @@ typedef struct bRaySensor {
 } bRaySensor;
 
 typedef struct bArmatureSensor {
-	char posechannel[32];
-	char constraint[32];
+	char posechannel[64];	/* MAX_NAME */
+	char constraint[64];	/* MAX_NAME */
 	int  type;
 	float value;
 } bArmatureSensor;
@@ -147,12 +147,12 @@ typedef struct bMessageSensor {
 	/**
 	 * Can be used to filter on subjects like this
 	 */
-	char subject[32];
+	char subject[64];
 
 	/**
 	 * (Possible future use) body to filter on
 	 */
-	char body[32];
+	char body[64];
 } bMessageSensor;
 
 typedef struct bSensor {
@@ -160,7 +160,7 @@ typedef struct bSensor {
 	/* pulse and freq are the bool toggle and frame count for pulse mode */
 	short type, otype, flag, pulse;
 	short freq, totlinks, pad1, pad2;
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	void *data;
 	
 	struct bController **links;
@@ -175,7 +175,7 @@ typedef struct bSensor {
 } bSensor;
 
 typedef struct bJoystickSensor {
-	char name[32];
+	char name[64];	/* MAX_NAME */
 	char type;
 	char joyindex;
 	short flag;
diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h
index aab20dbeee1..fa501de8d6d 100644
--- a/source/blender/makesdna/DNA_sequence_types.h
+++ b/source/blender/makesdna/DNA_sequence_types.h
@@ -127,7 +127,7 @@ typedef struct Sequence {
 	struct Sequence *next, *prev;
 	void *tmp; /* tmp var for copying, and tagging for linked selection */
 	void *lib; /* needed (to be like ipo), else it will raise libdata warnings, this should never be used */
-	char name[24]; /* SEQ_NAME_MAXSTR - name, set by default and needs to be unique, for RNA paths */
+	char name[64]; /* SEQ_NAME_MAXSTR - name, set by default and needs to be unique, for RNA paths */
 
 	int flag, type;	/*flags bitmap (see below) and the type of sequence*/
 	int len; /* the length of the contense of this strip - before handles are applied */
@@ -255,7 +255,7 @@ typedef struct SpeedControlVars {
 #define SEQ_SPEED_COMPRESS_IPO_Y 4
 
 /* ***************** SEQUENCE ****************** */
-#define SEQ_NAME_MAXSTR			24
+#define SEQ_NAME_MAXSTR			64
 
 /* seq->flag */
 #define SEQ_LEFTSEL                 (1<<1)
diff --git a/source/blender/makesdna/DNA_texture_types.h b/source/blender/makesdna/DNA_texture_types.h
index 82ffa82cf60..e711124d39c 100644
--- a/source/blender/makesdna/DNA_texture_types.h
+++ b/source/blender/makesdna/DNA_texture_types.h
@@ -60,7 +60,7 @@ typedef struct MTex {
 	short texco, mapto, maptoneg, blendtype;
 	struct Object *object;
 	struct Tex *tex;
-	char uvname[32];
+	char uvname[64];	/* MAX_CUSTOMDATA_LAYER_NAME */
 	
 	char projx, projy, projz, mapping;
 	float ofs[3], size[3], rot;
diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h
index 131c540ac47..a8b3a7183cf 100644
--- a/source/blender/makesdna/DNA_tracking_types.h
+++ b/source/blender/makesdna/DNA_tracking_types.h
@@ -75,7 +75,7 @@ typedef struct MovieTrackingMarker {
 typedef struct MovieTrackingTrack {
 	struct MovieTrackingTrack *next, *prev;
 
-	char name[24];
+	char name[64];	/* MAX_NAME */
 
 	/* ** setings ** */
 	float pat_min[2], pat_max[2];		/* positions of left-bottom and right-top corners of pattern (in unified 0..1 space) */
@@ -178,7 +178,7 @@ typedef struct MovieTrackingReconstruction {
 typedef struct MovieTrackingObject {
 	struct MovieTrackingObject *next, *prev;
 
-	char name[24];			/* Name of tracking object */
+	char name[64];			/* Name of tracking object, MAX_NAME */
 	int flag;
 	float scale;			/* scale of object solution in amera space */
 
diff --git a/source/blender/makesdna/DNA_view3d_types.h b/source/blender/makesdna/DNA_view3d_types.h
index ae026b0bcc9..58c3f091d6d 100644
--- a/source/blender/makesdna/DNA_view3d_types.h
+++ b/source/blender/makesdna/DNA_view3d_types.h
@@ -173,7 +173,7 @@ typedef struct View3D {
 
 	struct View3D *localvd; /* allocated backup of its self while in localview */
 	
-	char ob_centre_bone[32];		/* optional string for armature bone to define center */
+	char ob_centre_bone[64];		/* optional string for armature bone to define center, MAXBONENAME */
 	
 	unsigned int lay;
 	int layact;
diff --git a/source/blender/makesdna/DNA_windowmanager_types.h b/source/blender/makesdna/DNA_windowmanager_types.h
index 57989424d4a..156d2ebbb20 100644
--- a/source/blender/makesdna/DNA_windowmanager_types.h
+++ b/source/blender/makesdna/DNA_windowmanager_types.h
@@ -168,7 +168,7 @@ typedef struct wmWindow {
 	
 	struct bScreen *screen;		/* active screen */
 	struct bScreen *newscreen;	/* temporary when switching */
-	char screenname[32];	/* MAX_ID_NAME for matching window with active screen after file read */
+	char screenname[64];	/* MAX_ID_NAME for matching window with active screen after file read */
 	
 	short posx, posy, sizex, sizey;	/* window coords */
 	short windowstate;	/* borderless, full */