diff options
Diffstat (limited to 'source/blender/render')
6 files changed, 54 insertions, 61 deletions
diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c index 7b28728cfe7..188bdab316c 100644 --- a/source/blender/render/intern/source/imagetexture.c +++ b/source/blender/render/intern/source/imagetexture.c @@ -491,7 +491,7 @@ static float clipx_rctf(rctf *rf, float x1, float x2) rf->xmin = rf->xmax; return 0.0; } - else if (size != 0.0f) { + if (size != 0.0f) { return BLI_rctf_size_x(rf) / size; } return 1.0; @@ -514,7 +514,7 @@ static float clipy_rctf(rctf *rf, float y1, float y2) rf->ymin = rf->ymax; return 0.0; } - else if (size != 0.0f) { + if (size != 0.0f) { return BLI_rctf_size_y(rf) / size; } return 1.0; @@ -888,7 +888,7 @@ static void ewa_read_pixel_cb(void *userdata, int x, int y, float result[4]) static void ewa_eval(TexResult *texr, ImBuf *ibuf, float fx, float fy, afdata_t *AFD) { ReadEWAData data; - float uv[2] = {fx, fy}; + const float uv[2] = {fx, fy}; data.ibuf = ibuf; data.AFD = AFD; BLI_ewa_filter(ibuf->x, diff --git a/source/blender/render/intern/source/multires_bake.c b/source/blender/render/intern/source/multires_bake.c index b30821a1b73..f12b425ee8b 100644 --- a/source/blender/render/intern/source/multires_bake.c +++ b/source/blender/render/intern/source/multires_bake.c @@ -157,7 +157,7 @@ static void init_bake_rast(MBakeRast *bake_rast, static void flush_pixel(const MResolvePixelData *data, const int x, const int y) { - float st[2] = {(x + 0.5f) / data->w, (y + 0.5f) / data->h}; + const float st[2] = {(x + 0.5f) / data->w, (y + 0.5f) / data->h}; const float *st0, *st1, *st2; const float *tang0, *tang1, *tang2; float no0[3], no1[3], no2[3]; diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index ade80898131..3236026c69f 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -281,9 +281,8 @@ RenderLayer *RE_GetRenderLayer(RenderResult *rr, const char *name) if (rr == NULL) { return NULL; } - else { - return BLI_findstring(&rr->layers, name, offsetof(RenderLayer, name)); - } + + return BLI_findstring(&rr->layers, name, offsetof(RenderLayer, name)); } bool RE_HasSingleLayer(Render *re) @@ -1655,9 +1654,8 @@ static bool check_valid_compositing_camera(Scene *scene, Object *camera_override return true; } - else { - return (camera_override != NULL || scene->camera != NULL); - } + + return (camera_override != NULL || scene->camera != NULL); } static bool check_valid_camera_multiview(Scene *scene, Object *camera, ReportList *reports) @@ -1755,7 +1753,7 @@ static bool node_tree_has_composite_output(bNodeTree *ntree) if (ELEM(node->type, CMP_NODE_COMPOSITE, CMP_NODE_OUTPUT_FILE)) { return true; } - else if (ELEM(node->type, NODE_GROUP, NODE_CUSTOM_GROUP)) { + if (ELEM(node->type, NODE_GROUP, NODE_CUSTOM_GROUP)) { if (node->id) { if (node_tree_has_composite_output((bNodeTree *)node->id)) { return true; @@ -1879,14 +1877,14 @@ const char *RE_GetActiveRenderView(Render *re) } /* evaluating scene options for general Blender render */ -static int render_initialize_from_main(Render *re, - const RenderData *rd, - Main *bmain, - Scene *scene, - ViewLayer *single_layer, - Object *camera_override, - int anim, - int anim_init) +static int render_init_from_main(Render *re, + const RenderData *rd, + Main *bmain, + Scene *scene, + ViewLayer *single_layer, + Object *camera_override, + int anim, + int anim_init) { int winx, winy; rcti disprect; @@ -2004,8 +2002,7 @@ void RE_RenderFrame(Render *re, scene->r.cfra = frame; - if (render_initialize_from_main( - re, &scene->r, bmain, scene, single_layer, camera_override, 0, 0)) { + if (render_init_from_main(re, &scene->r, bmain, scene, single_layer, camera_override, 0, 0)) { const RenderData rd = scene->r; MEM_reset_peak_memory(); @@ -2058,7 +2055,7 @@ void RE_RenderFrame(Render *re, void RE_RenderFreestyleStrokes(Render *re, Main *bmain, Scene *scene, int render) { re->result_ok = 0; - if (render_initialize_from_main(re, &scene->r, bmain, scene, NULL, NULL, 0, 0)) { + if (render_init_from_main(re, &scene->r, bmain, scene, NULL, NULL, 0, 0)) { if (render) { do_render_3d(re); } @@ -2422,7 +2419,7 @@ void RE_RenderAnim(Render *re, (rd.im_format.views_format == R_IMF_VIEWS_INDIVIDUAL)); /* do not fully call for each frame, it initializes & pops output window */ - if (!render_initialize_from_main(re, &rd, bmain, scene, single_layer, camera_override, 0, 1)) { + if (!render_init_from_main(re, &rd, bmain, scene, single_layer, camera_override, 0, 1)) { return; } @@ -2501,15 +2498,14 @@ void RE_RenderAnim(Render *re, render_update_depsgraph(re); /* only border now, todo: camera lens. (ton) */ - render_initialize_from_main(re, &rd, bmain, scene, single_layer, camera_override, 1, 0); + render_init_from_main(re, &rd, bmain, scene, single_layer, camera_override, 1, 0); if (nfra != scene->r.cfra) { /* Skip this frame, but could update for physics and particles system. */ continue; } - else { - nfra += tfra; - } + + nfra += tfra; /* Touch/NoOverwrite options are only valid for image's */ if (is_movie == false) { @@ -2783,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)) { @@ -2798,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 { @@ -2864,7 +2860,7 @@ RenderPass *RE_pass_find_by_name(volatile RenderLayer *rl, const char *name, con if (viewname == NULL || viewname[0] == '\0') { break; } - else if (STREQ(rp->view, viewname)) { + if (STREQ(rp->view, viewname)) { break; } } diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c index 8daad33b477..12b80da9f59 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -557,7 +557,7 @@ static float density_falloff(PointDensityRangeData *pdr, int index, float square } if (pdr->density_curve && dist != 0.0f) { - BKE_curvemapping_initialize(pdr->density_curve); + BKE_curvemapping_init(pdr->density_curve); density = BKE_curvemapping_evaluateF(pdr->density_curve, 0, density / dist) * dist; } @@ -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, @@ -868,7 +868,7 @@ void RE_point_density_minmax(struct Depsgraph *depsgraph, particle_system_minmax(depsgraph, scene, object, psys, pd->radius, r_min, r_max); } else { - float radius[3] = {pd->radius, pd->radius, pd->radius}; + const float radius[3] = {pd->radius, pd->radius, pd->radius}; BoundBox *bb = BKE_object_boundbox_get(object); if (bb != NULL) { diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c index 4b74bfb3e5c..ef44c896a25 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -475,7 +475,7 @@ RenderResult *render_result_new(Render *re, const char *view = rv->name; if (viewname && viewname[0]) { - if (strcmp(view, viewname) != 0) { + if (!STREQ(view, viewname)) { continue; } } @@ -709,7 +709,7 @@ static int order_render_passes(const void *a, const void *b) if (passtype_a > passtype_b) { return 1; } - else if (passtype_a < passtype_b) { + if (passtype_a < passtype_b) { return 0; } } @@ -728,7 +728,7 @@ static int order_render_passes(const void *a, const void *b) if (STREQ(rpa->view, STEREO_LEFT_NAME)) { return 0; } - else if (STREQ(rpb->view, STEREO_LEFT_NAME)) { + if (STREQ(rpb->view, STEREO_LEFT_NAME)) { return 1; } @@ -736,7 +736,7 @@ static int order_render_passes(const void *a, const void *b) if (STREQ(rpa->view, STEREO_RIGHT_NAME)) { return 0; } - else if (STREQ(rpb->view, STEREO_RIGHT_NAME)) { + if (STREQ(rpb->view, STEREO_RIGHT_NAME)) { return 1; } @@ -877,7 +877,7 @@ void render_result_merge(RenderResult *rr, RenderResult *rrpart) continue; } /* Renderresult have all passes, renderpart only the active view's passes. */ - if (strcmp(rpassp->fullname, rpass->fullname) != 0) { + if (!STREQ(rpassp->fullname, rpass->fullname)) { continue; } @@ -930,9 +930,8 @@ bool RE_WriteRenderResult(ReportList *reports, if (!STREQ(view, viewname)) { continue; } - else { - viewname = ""; - } + + viewname = ""; } /* Skip compositing if only a single other layer is requested. */ @@ -993,9 +992,8 @@ bool RE_WriteRenderResult(ReportList *reports, if (!STREQ(view, viewname)) { continue; } - else { - viewname = ""; - } + + viewname = ""; } /* We only store RGBA passes as half float, for @@ -1509,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 */ @@ -1537,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); diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index b37eeed3681..e5c62dbd784 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -1381,20 +1381,19 @@ static int multitex_nodes_intern(Tex *tex, return rgbnor; } - else { - return multitex(tex, - texvec, - dxt, - dyt, - osatex, - texres, - thread, - which_output, - pool, - skip_load_image, - texnode_preview, - use_nodes); - } + + return multitex(tex, + texvec, + dxt, + dyt, + osatex, + texres, + thread, + which_output, + pool, + skip_load_image, + texnode_preview, + use_nodes); } /* this is called from the shader and texture nodes |