kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: indentation

Browse Source
This commit is contained in:
Campbell Barton 2017-12-02 22:35:09 +11:00
parent 0c37824bfa
commit c2d795ebf8
1 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
source/blender/blenloader/intern/versioning_280.c
View File

@ -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);