diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-21 16:33:19 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-21 16:33:19 +0400 |
| commit | 2df82a2a2be909e0a1208ed2fe41637f24436414 (patch) | |
| tree | a89c92df23c951a8dc31cffd58b999545e058ac9 /source/blender/render | |
| parent | d6f38e4e018a75458290e3ed26dd80c2cf0af882 (diff) | |
Code cleanup: fix some vs2012 compiler warnings
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/initrender.c | 7 | ||||
| -rw-r--r-- | source/blender/render/intern/source/voxeldata.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/initrender.c b/source/blender/render/intern/source/initrender.c index 0d957f8019f..d4d4a703d6c 100644 --- a/source/blender/render/intern/source/initrender.c +++ b/source/blender/render/intern/source/initrender.c @@ -268,7 +268,7 @@ void make_sample_tables(Render *re) SampleTables *st; float flweight[32]; float weight[32], totw, val, *fpx1, *fpx2, *fpy1, *fpy2, *m3, *m4; - int i, j, a; + int i, j, a, centmasksize; /* optimization tables, only once */ if (firsttime) { @@ -303,7 +303,8 @@ void make_sample_tables(Render *re) if (a & 128) st->cmask[a]++; } - st->centmask = MEM_mallocN((1 << re->osa), "Initfilt3"); + centmasksize = (1 << re->osa); + st->centmask = MEM_mallocN(centmasksize, "Initfilt3"); for (a = 0; a < 16; a++) { st->centLut[a] = -0.45f + ((float)a) / 16.0f; @@ -425,7 +426,7 @@ void make_sample_tables(Render *re) } } - for (a = (1 << re->osa) - 1; a > 0; a--) { + for (a = centmasksize - 1; a > 0; a--) { val = st->cmask[a & 255] + st->cmask[a >> 8]; i = 8 + (15.9f * (fpy1[a & 255] + fpy2[a >> 8]) / val); CLAMP(i, 0, 15); diff --git a/source/blender/render/intern/source/voxeldata.c b/source/blender/render/intern/source/voxeldata.c index 1c76a228566..0aa1bcfef34 100644 --- a/source/blender/render/intern/source/voxeldata.c +++ b/source/blender/render/intern/source/voxeldata.c @@ -224,7 +224,7 @@ static int read_voxeldata_header(FILE *fp, struct VoxelData *vd) return 1; } -static void init_frame_smoke(VoxelData *vd, float cfra) +static void init_frame_smoke(VoxelData *vd, int cfra) { #ifdef WITH_SMOKE Object *ob; |