diff options
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/pointdensity.c | 2 | ||||
-rw-r--r-- | source/blender/render/intern/source/render_result.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 0fc389ecd93..3236026c69f 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -2779,7 +2779,7 @@ void RE_layer_load_from_file( IMB_float_from_rect(ibuf); } - memcpy(rpass->rect, ibuf->rect_float, sizeof(float) * 4 * layer->rectx * layer->recty); + memcpy(rpass->rect, ibuf->rect_float, sizeof(float[4]) * layer->rectx * layer->recty); } else { if ((ibuf->x - x >= layer->rectx) && (ibuf->y - y >= layer->recty)) { @@ -2794,7 +2794,7 @@ void RE_layer_load_from_file( IMB_rectcpy(ibuf_clip, ibuf, 0, 0, x, y, layer->rectx, layer->recty); memcpy( - rpass->rect, ibuf_clip->rect_float, sizeof(float) * 4 * layer->rectx * layer->recty); + rpass->rect, ibuf_clip->rect_float, sizeof(float[4]) * layer->rectx * layer->recty); IMB_freeImBuf(ibuf_clip); } else { diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index db3ae8d8b5e..12b80da9f59 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -770,7 +770,7 @@ static void pointdensity_color( static void sample_dummy_point_density(int resolution, float *values) { - memset(values, 0, sizeof(float) * 4 * resolution * resolution * resolution); + memset(values, 0, sizeof(float[4]) * resolution * resolution * resolution); } static void particle_system_minmax(Depsgraph *depsgraph, diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 8b5f2778728..ef44c896a25 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -1507,10 +1507,10 @@ void RE_render_result_rect_from_ibuf(RenderResult *rr, rr->have_combined = true; if (!rv->rectf) { - rv->rectf = MEM_mallocN(4 * sizeof(float) * rr->rectx * rr->recty, "render_seq rectf"); + rv->rectf = MEM_mallocN(sizeof(float[4]) * rr->rectx * rr->recty, "render_seq rectf"); } - memcpy(rv->rectf, ibuf->rect_float, 4 * sizeof(float) * rr->rectx * rr->recty); + memcpy(rv->rectf, ibuf->rect_float, sizeof(float[4]) * rr->rectx * rr->recty); /* TSK! Since sequence render doesn't free the *rr render result, the old rect32 * can hang around when sequence render has rendered a 32 bits one before */ @@ -1535,7 +1535,7 @@ void render_result_rect_fill_zero(RenderResult *rr, const int view_id) RenderView *rv = RE_RenderViewGetById(rr, view_id); if (rv->rectf) { - memset(rv->rectf, 0, 4 * sizeof(float) * rr->rectx * rr->recty); + memset(rv->rectf, 0, sizeof(float[4]) * rr->rectx * rr->recty); } else if (rv->rect32) { memset(rv->rect32, 0, 4 * rr->rectx * rr->recty); |