diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 17:04:01 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-23 17:04:01 +0400 |
commit | 9494340dae7dd5e3ee070d8e550596a440648870 (patch) | |
tree | e73e1b3ede7373db7b8e26db687941b4669b9244 /source/blender/editors/uvedit | |
parent | 74e21161e327a0f91ecef0f8dd1bce65c9e2ef4b (diff) | |
parent | a7891da84bfad1f0cd0f3fc825e7f4dedf469a00 (diff) |
svn merge ^/trunk/blender -r40432:40491
Diffstat (limited to 'source/blender/editors/uvedit')
-rw-r--r-- | source/blender/editors/uvedit/uvedit_ops.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c index 1579a05eac3..f7746816c38 100644 --- a/source/blender/editors/uvedit/uvedit_ops.c +++ b/source/blender/editors/uvedit/uvedit_ops.c @@ -1311,7 +1311,7 @@ static void weld_align_uv(bContext *C, int tool) int itmpl, jtmpl; EditVert *eve; int pass; /* first 2 passes find endpoints, 3rd pass moves middle points, 4th pass is fail-on-face-selected */ - EditFace *startefa, *endefa; + EditFace *startefa, *endefa= NULL; /* endefa shouldnt need to be initialized but just incase */ /* pass 3 variables */ float startx, starty, firstm, firstb, midx, midy; |