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:41:53 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-12-02 14:42:14 +0300
commit9f12eb087fec1a0f9fb997be41e82de6d488d983 (patch)
treedacd0a9920e45f3ebac31810507fef05a4f5a8f4 /source/blender/blenloader
parentc2d795ebf8f1c25e20fa56e377d4da3e021c051f (diff)
Cleanup: minor change to API use
Diffstat (limited to 'source/blender/blenloader')
-rw-r--r--source/blender/blenloader/intern/versioning_280.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 84216619b24..93fe634fe52 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -440,7 +440,8 @@ void do_versions_after_linking_280(Main *main)
/* If layer was not set, disable it. */
LayerCollection *layer_collection_parent;
- layer_collection_parent = ((LayerCollection *)view_layer->layer_collections.first)->layer_collections.first;
+ layer_collection_parent =
+ ((LayerCollection *)view_layer->layer_collections.first)->layer_collections.first;
for (int layer = 0; layer < 20; layer++) {
if (collections[DO_VERSION_COLLECTION_VISIBLE].created & (1 << layer)) {
@@ -486,7 +487,7 @@ void do_versions_after_linking_280(Main *main)
}
/* Fallback name if only one layer was found in the original file */
- if (BLI_listbase_count_ex(&sc_master->scene_collections, 2) == 1) {
+ if (BLI_listbase_is_single(&sc_master->scene_collections)) {
BKE_collection_rename(scene, sc_master->scene_collections.first, "Default Collection");
}
@@ -560,7 +561,7 @@ void do_versions_after_linking_280(Main *main)
/* During 2.8 work we temporarly stored view-layer in the
* workspace directly, but should be stored there per-scene. */
for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
- if (BLI_findindex(&scene->view_layers, workspace->view_layer) > -1) {
+ if (BLI_findindex(&scene->view_layers, workspace->view_layer) != -1) {
BKE_workspace_view_layer_set(workspace, workspace->view_layer, scene);
workspace->view_layer = NULL;
}