Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc')
-rw-r--r--source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc138
1 files changed, 69 insertions, 69 deletions
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
index 622bb4a8a02..a325544e046 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations_view_layer.cc
@@ -27,7 +27,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <cstring> /* required for STREQ later on. */
+#include <cstring> /* required for STREQ later on. */
#include "MEM_guardedalloc.h"
@@ -61,78 +61,78 @@ namespace DEG {
void DepsgraphRelationBuilder::build_layer_collections(ListBase *lb)
{
- const int restrict_flag = (graph_->mode == DAG_EVAL_VIEWPORT) ?
- COLLECTION_RESTRICT_VIEW : COLLECTION_RESTRICT_RENDER;
-
- for (LayerCollection *lc = (LayerCollection *)lb->first; lc; lc = lc->next) {
- if ((lc->collection->flag & restrict_flag)) {
- continue;
- }
- if ((lc->flag & LAYER_COLLECTION_EXCLUDE) == 0) {
- build_collection(lc, NULL, lc->collection);
- }
- build_layer_collections(&lc->layer_collections);
- }
+ const int restrict_flag = (graph_->mode == DAG_EVAL_VIEWPORT) ? COLLECTION_RESTRICT_VIEW :
+ COLLECTION_RESTRICT_RENDER;
+
+ for (LayerCollection *lc = (LayerCollection *)lb->first; lc; lc = lc->next) {
+ if ((lc->collection->flag & restrict_flag)) {
+ continue;
+ }
+ if ((lc->flag & LAYER_COLLECTION_EXCLUDE) == 0) {
+ build_collection(lc, NULL, lc->collection);
+ }
+ build_layer_collections(&lc->layer_collections);
+ }
}
void DepsgraphRelationBuilder::build_view_layer(Scene *scene, ViewLayer *view_layer)
{
- /* Setup currently building context. */
- scene_ = scene;
- /* Scene objects. */
- /* NOTE: Nodes builder requires us to pass CoW base because it's being
- * passed to the evaluation functions. During relations builder we only
- * do NULL-pointer check of the base, so it's fine to pass original one. */
- LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) {
- if (need_pull_base_into_graph(base)) {
- build_object(base, base->object);
- }
- }
-
- build_layer_collections(&view_layer->layer_collections);
-
- if (scene->camera != NULL) {
- build_object(NULL, scene->camera);
- }
- /* Rigidbody. */
- if (scene->rigidbody_world != NULL) {
- build_rigidbody(scene);
- }
- /* Scene's animation and drivers. */
- if (scene->adt != NULL) {
- build_animdata(&scene->id);
- }
- /* World. */
- if (scene->world != NULL) {
- build_world(scene->world);
- }
- /* Compositor nodes. */
- if (scene->nodetree != NULL) {
- build_compositor(scene);
- }
- /* Masks. */
- LISTBASE_FOREACH (Mask *, mask, &bmain_->masks) {
- build_mask(mask);
- }
- /* Movie clips. */
- LISTBASE_FOREACH (MovieClip *, clip, &bmain_->movieclips) {
- build_movieclip(clip);
- }
- /* Material override. */
- if (view_layer->mat_override != NULL) {
- build_material(view_layer->mat_override);
- }
- /* Freestyle collections. */
- LISTBASE_FOREACH (FreestyleLineSet *, fls, &view_layer->freestyle_config.linesets) {
- if (fls->group != NULL) {
- build_collection(NULL, NULL, fls->group);
- }
- }
- /* Build all set scenes. */
- if (scene->set != NULL) {
- ViewLayer *set_view_layer = BKE_view_layer_default_render(scene->set);
- build_view_layer(scene->set, set_view_layer);
- }
+ /* Setup currently building context. */
+ scene_ = scene;
+ /* Scene objects. */
+ /* NOTE: Nodes builder requires us to pass CoW base because it's being
+ * passed to the evaluation functions. During relations builder we only
+ * do NULL-pointer check of the base, so it's fine to pass original one. */
+ LISTBASE_FOREACH (Base *, base, &view_layer->object_bases) {
+ if (need_pull_base_into_graph(base)) {
+ build_object(base, base->object);
+ }
+ }
+
+ build_layer_collections(&view_layer->layer_collections);
+
+ if (scene->camera != NULL) {
+ build_object(NULL, scene->camera);
+ }
+ /* Rigidbody. */
+ if (scene->rigidbody_world != NULL) {
+ build_rigidbody(scene);
+ }
+ /* Scene's animation and drivers. */
+ if (scene->adt != NULL) {
+ build_animdata(&scene->id);
+ }
+ /* World. */
+ if (scene->world != NULL) {
+ build_world(scene->world);
+ }
+ /* Compositor nodes. */
+ if (scene->nodetree != NULL) {
+ build_compositor(scene);
+ }
+ /* Masks. */
+ LISTBASE_FOREACH (Mask *, mask, &bmain_->masks) {
+ build_mask(mask);
+ }
+ /* Movie clips. */
+ LISTBASE_FOREACH (MovieClip *, clip, &bmain_->movieclips) {
+ build_movieclip(clip);
+ }
+ /* Material override. */
+ if (view_layer->mat_override != NULL) {
+ build_material(view_layer->mat_override);
+ }
+ /* Freestyle collections. */
+ LISTBASE_FOREACH (FreestyleLineSet *, fls, &view_layer->freestyle_config.linesets) {
+ if (fls->group != NULL) {
+ build_collection(NULL, NULL, fls->group);
+ }
+ }
+ /* Build all set scenes. */
+ if (scene->set != NULL) {
+ ViewLayer *set_view_layer = BKE_view_layer_default_render(scene->set);
+ build_view_layer(scene->set, set_view_layer);
+ }
}
} // namespace DEG