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>2017-12-02 14:35:09 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-12-02 14:35:09 +0300
commitc2d795ebf8f1c25e20fa56e377d4da3e021c051f (patch)
tree22f6c7d8afc3608e1027e97a9b4d840e8e3d49de /source/blender/blenloader
parent0c37824bfa091f091f58a522f17b5b4dfe06a633 (diff)
Cleanup: indentation
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/versioning_280.c65
1 files changed, 35 insertions, 30 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index f500e64d3f9..84216619b24 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -257,15 +257,16 @@ void do_versions_after_linking_280(Main *main)
layer + 1,
collections[collection_index].suffix);
collections[collection_index].collections[layer] = BKE_collection_add(
- &scene->id,
- sc_parent,
- COLLECTION_TYPE_NONE,
- name);
+ &scene->id,
+ sc_parent,
+ COLLECTION_TYPE_NONE,
+ name);
collections[collection_index].created |= (1 << layer);
}
}
- BKE_collection_object_add(&scene->id, collections[collection_index].collections[layer], base->object);
+ BKE_collection_object_add(
+ &scene->id, collections[collection_index].collections[layer], base->object);
}
if (base->flag & SELECT) {
@@ -287,18 +288,20 @@ void do_versions_after_linking_280(Main *main)
(collections[DO_VERSION_COLLECTION_HIDE].collections[layer] !=
scene_collection_parent->scene_collections.first))
{
- BLI_listbase_swaplinks(&scene_collection_parent->scene_collections,
- collections[DO_VERSION_COLLECTION_HIDE].collections[layer],
- scene_collection_parent->scene_collections.first);
+ BLI_listbase_swaplinks(
+ &scene_collection_parent->scene_collections,
+ collections[DO_VERSION_COLLECTION_HIDE].collections[layer],
+ scene_collection_parent->scene_collections.first);
}
if ((collections[DO_VERSION_COLLECTION_HIDE_ALL].created & (1 << layer)) &&
(collections[DO_VERSION_COLLECTION_HIDE_ALL].collections[layer] !=
scene_collection_parent->scene_collections.last))
{
- BLI_listbase_swaplinks(&scene_collection_parent->scene_collections,
- collections[DO_VERSION_COLLECTION_HIDE_ALL].collections[layer],
- scene_collection_parent->scene_collections.last);
+ BLI_listbase_swaplinks(
+ &scene_collection_parent->scene_collections,
+ collections[DO_VERSION_COLLECTION_HIDE_ALL].collections[layer],
+ scene_collection_parent->scene_collections.last);
}
scene_collection_parent = scene_collection_parent->next;
@@ -318,18 +321,18 @@ void do_versions_after_linking_280(Main *main)
/* It is up to the external engine to handle
* its own doversion in this case. */
BKE_override_view_layer_int_add(
- view_layer,
- ID_SCE,
- "samples",
- srl->samples);
+ view_layer,
+ ID_SCE,
+ "samples",
+ srl->samples);
}
if (srl->mat_override) {
BKE_override_view_layer_datablock_add(
- view_layer,
- ID_MA,
- "self",
- (ID *)srl->mat_override);
+ view_layer,
+ ID_MA,
+ "self",
+ (ID *)srl->mat_override);
}
if (srl->layflag & SCE_LAY_DISABLE) {
@@ -362,23 +365,24 @@ void do_versions_after_linking_280(Main *main)
if (collections[DO_VERSION_COLLECTION_VISIBLE].created & (1 << layer)) {
LayerCollection *layer_collection_parent;
- layer_collection_parent = BKE_collection_link(view_layer,
- collections[DO_VERSION_COLLECTION_VISIBLE].collections[layer]);
+ layer_collection_parent = BKE_collection_link(
+ view_layer,
+ collections[DO_VERSION_COLLECTION_VISIBLE].collections[layer]);
if (srl->lay_zmask & (1 << layer)) {
BKE_override_layer_collection_boolean_add(
- layer_collection_parent,
- ID_OB,
- "cycles.is_holdout",
- true);
+ layer_collection_parent,
+ ID_OB,
+ "cycles.is_holdout",
+ true);
}
if ((srl->lay & (1 << layer)) == 0) {
BKE_override_layer_collection_boolean_add(
- layer_collection_parent,
- ID_OB,
- "cycles_visibility.camera",
- false);
+ layer_collection_parent,
+ ID_OB,
+ "cycles_visibility.camera",
+ false);
}
LayerCollection *layer_collection_child;
@@ -386,7 +390,8 @@ void do_versions_after_linking_280(Main *main)
for (int j = 1; j < 4; j++) {
if (collections[j].created & (1 << layer)) {
- layer_collection_child->flag = collections[j].flag_render & (~COLLECTION_DISABLED);
+ layer_collection_child->flag =
+ collections[j].flag_render & (~COLLECTION_DISABLED);
if (collections[j].flag_render & COLLECTION_DISABLED) {
BKE_collection_disable(view_layer, layer_collection_child);