diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-16 14:50:11 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-16 14:50:11 +0300 |
| commit | 6cd3ebfc9fa4838a74192f2e5cc82b5d5d2e6fe7 (patch) | |
| tree | 546c8e187f3b5185f019153ee083fa246b698436 /source/blender/editors/mesh/editmesh_tools.c | |
| parent | 97a50e78ca88b4ffe180bc6567e5ed0358239efe (diff) | |
| parent | 5684ad80723454f0d910aad3fa48240da19c4e3b (diff) | |
Merge branch 'master' into alembic_pointcache
Conflicts:
release/scripts/addons
source/blender/blenkernel/intern/pointcache.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/MOD_modifiertypes.h
source/blender/modifiers/intern/MOD_collision.c
source/blender/modifiers/intern/MOD_util.c
Diffstat (limited to 'source/blender/editors/mesh/editmesh_tools.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_tools.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c index a136bc5e0c5..a480b2051cc 100644 --- a/source/blender/editors/mesh/editmesh_tools.c +++ b/source/blender/editors/mesh/editmesh_tools.c @@ -878,7 +878,7 @@ static int edbm_vert_connect_exec(bContext *C, wmOperator *op) BMesh *bm = em->bm; BMOperator bmop; bool is_pair = (bm->totvertsel == 2); - int len; + int len = 0; bool check_degenerate = true; const int verts_len = bm->totvertsel; BMVert **verts; |