archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: Depsgraph, Clang-Tidy else-after-return fixes

Browse Source 
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/depsgraph` module.

No functional changes.
This commit is contained in:
Sybren A. Stüvel
2020-08-07 12:38:42 +02:00
parent f453ee7d3a
commit 94eaaf097c
9 changed files with 51 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/depsgraph/intern/eval/deg_eval.cc
View File

@@ -353,9 +353,8 @@ static TaskPool *deg_evaluate_task_pool_create(DepsgraphEvalState *state)
if (G.debug & G_DEBUG_DEPSGRAPH_NO_THREADS) {
return BLI_task_pool_create_no_threads(state);
}
else {
return BLI_task_pool_create_suspended(state, TASK_PRIORITY_HIGH);
}
return BLI_task_pool_create_suspended(state, TASK_PRIORITY_HIGH);
}
/**

4
source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
View File

@@ -348,7 +348,7 @@ ViewLayer *get_original_view_layer(const Depsgraph *depsgraph, const IDNode *id_
if (id_node->linked_state == DEG_ID_LINKED_DIRECTLY) {
return depsgraph->view_layer;
}
else if (id_node->linked_state == DEG_ID_LINKED_VIA_SET) {
if (id_node->linked_state == DEG_ID_LINKED_VIA_SET) {
Scene *scene_orig = reinterpret_cast<Scene *>(id_node->id_orig);
return BKE_view_layer_default_render(scene_orig);
}
@@ -382,7 +382,7 @@ void scene_remove_unused_view_layers(const Depsgraph *depsgraph,
}
return;
}
else if (id_node->linked_state == DEG_ID_LINKED_INDIRECTLY) {
if (id_node->linked_state == DEG_ID_LINKED_INDIRECTLY) {
/* Indirectly linked scenes means it's not an input scene and not a set scene, and is pulled
* via some driver. Such scenes should not have view layers after copy. */
view_layer_input = nullptr;