diff options
Diffstat (limited to 'source/blender/render/intern/source/pipeline.c')
| -rw-r--r-- | source/blender/render/intern/source/pipeline.c | 19 |
1 files changed, 8 insertions, 11 deletions
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; } } |