diff options
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/source/imagetexture.c | 4 | ||||
-rw-r--r-- | source/blender/render/intern/source/pipeline.c | 19 | ||||
-rw-r--r-- | source/blender/render/intern/source/render_result.c | 16 | ||||
-rw-r--r-- | source/blender/render/intern/source/render_texture.c | 27 |
4 files changed, 30 insertions, 36 deletions
diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c index 7b28728cfe7..f7ae51dd141 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; diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index fa53ad522a6..0fc389ecd93 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; @@ -2506,9 +2504,8 @@ void RE_RenderAnim(Render *re, /* 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) { @@ -2863,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/render_result.c b/source/blender/render/intern/source/render_result.c index 4b74bfb3e5c..6299a86e25f 100644 --- a/source/blender/render/intern/source/render_result.c +++ b/source/blender/render/intern/source/render_result.c @@ -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; } @@ -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 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 |