diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-01-01 15:26:03 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-01 15:42:28 +0300 |
commit | aab4f2b76253936d1ba09562f1b1a21661860bf7 (patch) | |
tree | e558b355cd2fc153c8e5d1ef94963eb1f18454f7 /source/blender/render | |
parent | 4bdd4aa63371bdd73f3a9484f92348f1bf13b4e5 (diff) |
cleanup: redundant casts & const cast correctness
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/bake.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/sunsky.c | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/render/intern/source/bake.c b/source/blender/render/intern/source/bake.c index dfec286e4ab..4aa2f4e919e 100644 --- a/source/blender/render/intern/source/bake.c +++ b/source/blender/render/intern/source/bake.c @@ -372,8 +372,8 @@ static void bake_displacement(void *handle, ShadeInput *UNUSED(shi), float dist, bs->vcol->b = col[2]; } else { - const char *imcol = (char *)(bs->rect + bs->rectx * y + x); - copy_v4_v4_char((char *)imcol, (char *)col); + char *imcol = (char *)(bs->rect + bs->rectx * y + x); + copy_v4_v4_char(imcol, (char *)col); } } if (bs->rect_mask) { diff --git a/source/blender/render/intern/source/sunsky.c b/source/blender/render/intern/source/sunsky.c index 1836b3f48a7..6078989f9f6 100644 --- a/source/blender/render/intern/source/sunsky.c +++ b/source/blender/render/intern/source/sunsky.c @@ -299,8 +299,7 @@ void GetSkyXYZRadiancef(struct SunSky *sunsky, const float varg[3], float color_ float theta, phi; float v[3]; - copy_v3_v3(v, (float *)varg); - normalize_v3(v); + normalize_v3_v3(v, varg); if (v[2] < 0.001f) { v[2] = 0.001f; |