diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-06 20:59:58 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-06 20:59:58 +0400 |
commit | 8695bedda2cb57490bcea957b0a25eb85cb4c9a5 (patch) | |
tree | 4355e0c4f0e9492c53c7a9abf424748141ec320c /source/blender/blenkernel/intern/multires.c | |
parent | 757f177d9d294451441c95f03dcf8327f59a4b98 (diff) | |
parent | 2bb59bc2734ac682208419e42aebf27285a88d22 (diff) |
svn merge ^/trunk/blender -r40644:40720
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
-rw-r--r-- | source/blender/blenkernel/intern/multires.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 5df07246b73..48995572117 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -1177,7 +1177,7 @@ static void old_mdisps_convert(MFace *mface, MDisps *mdisp) int nvert = (mface->v4)? 4: 3; int newtotdisp = multires_grid_tot[newlvl]*nvert; int x, y, S; - float (*disps)[3], (*out)[3], u, v; + float (*disps)[3], (*out)[3], u = 0.0f, v = 0.0f; /* Quite gcc barking. */ disps = BLI_cellalloc_calloc(sizeof(float) * 3 * newtotdisp, "multires disps"); |