diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-27 07:12:31 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-27 07:12:31 +0400 |
| commit | effea8c29b9862e2526f2cf64811952a2971f5d6 (patch) | |
| tree | 72eb6486b146967e6533e8a18bc3735607f4ac16 /source/blender/editors/util | |
| parent | 4d1e122d7becb573fea254474b349021e5293910 (diff) | |
| parent | f4dec97cef4b320c6f3ffd2ddc39d429da4fd4d5 (diff) | |
svn merge ^/trunk/blender -r40511:40587
Diffstat (limited to 'source/blender/editors/util')
| -rw-r--r-- | source/blender/editors/util/editmode_undo.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/util/undo.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/util/editmode_undo.c b/source/blender/editors/util/editmode_undo.c index f2ab43c281b..9b938c44a5f 100644 --- a/source/blender/editors/util/editmode_undo.c +++ b/source/blender/editors/util/editmode_undo.c @@ -142,7 +142,7 @@ void undo_editmode_push(bContext *C, const char *name, /* make new */ curundo= uel= MEM_callocN(sizeof(UndoElem), "undo editmode"); - strncpy(uel->name, name, MAXUNDONAME-1); + BLI_strncpy(uel->name, name, sizeof(uel->name)); BLI_addtail(&undobase, uel); uel->getdata= getdata; diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index c1aca61f795..55fda84874d 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -471,7 +471,7 @@ static int undo_history_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(even if(totitem > 0) { uiPopupMenu *pup= uiPupMenuBegin(C, op->type->name, ICON_NONE); uiLayout *layout= uiPupMenuLayout(pup); - uiLayout *split= uiLayoutSplit(layout, 0, 0), *column; + uiLayout *split= uiLayoutSplit(layout, 0, 0), *column = NULL; int i, c; for(c=0, i=totitem-1; i >= 0; i--, c++) { |