Page MenuHome
Differential D8342 Diff 26950 source/blender/blenkernel/intern/collection.c

Changeset View

Standalone View

View Options

source/blender/blenkernel/intern/collection.c

Show All 24 Lines
#include "BLI_iterator.h" #include "BLI_iterator.h"
#include "BLI_listbase.h" #include "BLI_listbase.h"
#include "BLI_math_base.h" #include "BLI_math_base.h"
#include "BLI_threads.h" #include "BLI_threads.h"
#include "BLT_translation.h" #include "BLT_translation.h"
#include "BKE_anim_data.h" #include "BKE_anim_data.h"
#include "BKE_collection.h" #include "BKE_collection.h"
#include "BKE_icons.h" #include "BKE_icons.h"
ankitmUnsubmitted
Done
Inline Actions

Run make format or use extensions (VSCode, Sublime Text) for clang-format.
Alphabetical order for headers.
Same for

#include "DNA_windowmanager_types.h"

https://wiki.blender.org/wiki/Tools/ClangFormat

ankitm: Run `make format` or use extensions (VSCode, Sublime Text) for `clang-format`. Alphabetical…
#include "BKE_idprop.h" #include "BKE_idprop.h"
#include "BKE_idtype.h" #include "BKE_idtype.h"
#include "BKE_layer.h" #include "BKE_layer.h"
#include "BKE_lib_id.h" #include "BKE_lib_id.h"
#include "BKE_lib_query.h" #include "BKE_lib_query.h"
#include "BKE_lib_remap.h" #include "BKE_lib_remap.h"
#include "BKE_main.h" #include "BKE_main.h"
#include "BKE_object.h" #include "BKE_object.h"
▲ Show 20 Lines • Show All 1,035 Lines • ▼ Show 20 Lines if (collection_src != NULL) {
} }
} }
else { else {
/* Adding will fail if object is already in collection. /* Adding will fail if object is already in collection.
* However we still need to remove it from the other collections. */ * However we still need to remove it from the other collections. */
BKE_collection_object_add(bmain, collection_dst, ob); BKE_collection_object_add(bmain, collection_dst, ob);
scene_collections_object_remove(bmain, scene, ob, false, collection_dst); scene_collections_object_remove(bmain, scene, ob, false, collection_dst);
} }
/* Exclude and include the source and destination collections from/to the
dfelintoAuthorUnsubmitted
Done
Inline Actions

The first view layer is not special, it may not be the active one

dfelinto: The first view layer is not special, it may not be the active one
* view layer to trigger a refresh in all viewports using a local collection. */
ViewLayer *view_layer = scene->view_layers.first;
LayerCollection *lc_master = view_layer->layer_collections.first;
LISTBASE_FOREACH (LayerCollection *, lc_iter, &lc_master->layer_collections) {
ankitmUnsubmitted
Done
Inline Actions

Use LISTBASE_FOREACH.
Same for

wmWindow *window = wm->windows.first; window != NULL; window = window->next
ankitm: Use `LISTBASE_FOREACH`. Same for wmWindow *window = wm->windows.first; window != NULL…
if (lc_iter->collection == collection_src || lc_iter->collection == collection_dst) {
BKE_layer_collection_set_flag(lc_iter, LAYER_COLLECTION_EXCLUDE, true);
}
}
BKE_layer_collection_sync(scene, view_layer);
LISTBASE_FOREACH (LayerCollection *, lc_iter, &lc_master->layer_collections) {
if (lc_iter->collection == collection_src || lc_iter->collection == collection_dst) {
BKE_layer_collection_set_flag(lc_iter, LAYER_COLLECTION_EXCLUDE, false);
}
}
BKE_layer_collection_sync(scene, view_layer);
} }
/** \} */ /** \} */
/* -------------------------------------------------------------------- */ /* -------------------------------------------------------------------- */
/** \name Collection Scene Membership /** \name Collection Scene Membership
* \{ */ * \{ */
▲ Show 20 Lines • Show All 619 Lines • Show Last 20 Lines