diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-13 09:46:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-13 09:46:48 +0400 |
| commit | eedd5419290261b9e7a48cea61563183ff14aff0 (patch) | |
| tree | ed6ac803e2a867545281b54aa4e1e2c66f91fc40 /source/blender/editors | |
| parent | 8a40444d6bedb6d725c0f84d2088ae0791dafebb (diff) | |
fix for misc errors
- reference to out of scope stack var
- freeing fixes size array (never allocated)
- add matching va_end for va_start
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 1 | ||||
| -rw-r--r-- | source/blender/editors/object/object_add.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 898e653d562..097f042d6c9 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -4142,6 +4142,7 @@ void uiButGetStrInfo(bContext *C, uiBut *but, ...) si->strinfo = tmp; } + va_end(args); if (free_items && items) MEM_freeN(items); diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 63172ea99d2..f563451f641 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -265,6 +265,7 @@ int ED_object_add_generic_get_opts(bContext *C, wmOperator *op, float loc[3], fl bool *enter_editmode, unsigned int *layer, bool *is_view_aligned) { View3D *v3d = CTX_wm_view3d(C); + unsigned int _layer; /* Switch to Edit mode? */ if (RNA_struct_find_property(op->ptr, "enter_editmode")) { /* optional */ @@ -283,7 +284,6 @@ int ED_object_add_generic_get_opts(bContext *C, wmOperator *op, float loc[3], fl /* Get layers! */ { int a, layer_values[20]; - unsigned int _layer; if (!layer) layer = &_layer; |