diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-11 19:04:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-11 19:04:54 +0400 |
commit | a7b0a11811ccdbf83301891c03a50c1d5daf4776 (patch) | |
tree | 165521a6533e9069c455dbccda87b944ae7a1c25 /source/blender/editors/mesh/mesh_data.c | |
parent | b308e613126f8c89e954705aa512a3ef6a1f551d (diff) | |
parent | 6ce92d09f77351b3ad882e8d8f6d6b1511e91844 (diff) |
svn merge ^/trunk/blender -r43278:43294
Diffstat (limited to 'source/blender/editors/mesh/mesh_data.c')
-rw-r--r-- | source/blender/editors/mesh/mesh_data.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c index 93ea76db569..8ba4bb15849 100644 --- a/source/blender/editors/mesh/mesh_data.c +++ b/source/blender/editors/mesh/mesh_data.c @@ -524,7 +524,7 @@ static int drop_named_image_invoke(bContext *C, wmOperator *op, wmEvent *event) Mesh *me; Object *obedit; int exitmode= 0; - char name[32]; + char name[MAX_ID_NAME-2]; /* Check context */ if(base==NULL || base->object->type!=OB_MESH) { @@ -593,7 +593,7 @@ void MESH_OT_drop_named_image(wmOperatorType *ot) ot->flag= OPTYPE_UNDO; /* properties */ - RNA_def_string(ot->srna, "name", "Image", 24, "Name", "Image name to assign"); + RNA_def_string(ot->srna, "name", "Image", MAX_ID_NAME-2, "Name", "Image name to assign"); RNA_def_string(ot->srna, "filepath", "Path", FILE_MAX, "Filepath", "Path to image file"); } |