tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

Cleanup: Move `BKE_collection.h` to CPP header.

This commit is contained in:
Bastien Montagne 2024-02-09 19:42:38 +01:00
parent deab8c085a
commit e71ae3b16c
73 changed files with 176 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

242
source/blender/blenkernel/BKE_collection.h → source/blender/blenkernel/BKE_collection.hh
View File

@ -15,10 +15,6 @@
#include "DNA_listBase.h"
#ifdef __cplusplus
extern "C" {
#endif
/* Structs */
struct BLI_Iterator;
@ -35,10 +31,10 @@ struct Object;
struct Scene;
struct ViewLayer;
typedef struct CollectionParent {
struct CollectionParent {
struct CollectionParent *next, *prev;
struct Collection *collection;
} CollectionParent;
};
/* Collections */
@ -46,38 +42,36 @@ typedef struct CollectionParent {
* Add a collection to a collection ListBase and synchronize all render layers
* The ListBase is NULL when the collection is to be added to the master collection
*/
struct Collection *BKE_collection_add(struct Main *bmain,
struct Collection *parent,
const char *name);
Collection *BKE_collection_add(Main *bmain, Collection *parent, const char *name);
/**
* Add \a collection_dst to all scene collections that reference object \a ob_src is in.
* Used to replace an instance object with a collection (library override operator).
*
* Logic is very similar to #BKE_collection_object_add_from().
*/
void BKE_collection_add_from_object(struct Main *bmain,
struct Scene *scene,
const struct Object *ob_src,
struct Collection *collection_dst);
void BKE_collection_add_from_object(Main *bmain,
Scene *scene,
const Object *ob_src,
Collection *collection_dst);
/**
* Add \a collection_dst to all scene collections that reference collection \a collection_src is
* in.
*
* Logic is very similar to #BKE_collection_object_add_from().
*/
void BKE_collection_add_from_collection(struct Main *bmain,
struct Scene *scene,
struct Collection *collection_src,
struct Collection *collection_dst);
void BKE_collection_add_from_collection(Main *bmain,
Scene *scene,
Collection *collection_src,
Collection *collection_dst);
/**
* Free (or release) any data used by this collection (does not free the collection itself).
*/
void BKE_collection_free_data(struct Collection *collection);
void BKE_collection_free_data(Collection *collection);
/**
* Remove a collection, optionally removing its child objects or moving
* them to parent collections.
*/
bool BKE_collection_delete(struct Main *bmain, struct Collection *collection, bool hierarchy);
bool BKE_collection_delete(Main *bmain, Collection *collection, bool hierarchy);
/**
* Make a deep copy (aka duplicate) of the given collection and all of its children, recursively.
@ -87,36 +81,33 @@ bool BKE_collection_delete(struct Main *bmain, struct Collection *collection, bo
* responsible to reconstruct collection dependencies information's
* (i.e. call #BKE_main_collection_sync).
*/
struct Collection *BKE_collection_duplicate(struct Main *bmain,
struct Collection *parent,
struct Collection *collection,
uint duplicate_flags,
uint duplicate_options);
Collection *BKE_collection_duplicate(Main *bmain,
Collection *parent,
Collection *collection,
uint duplicate_flags,
uint duplicate_options);
/* Master Collection for Scene */
#define BKE_SCENE_COLLECTION_NAME "Scene Collection"
struct Collection *BKE_collection_master_add(struct Scene *scene);
Collection *BKE_collection_master_add(Scene *scene);
/* Collection Objects */
bool BKE_collection_has_object(struct Collection *collection, const struct Object *ob);
bool BKE_collection_has_object_recursive(struct Collection *collection, struct Object *ob);
bool BKE_collection_has_object_recursive_instanced(struct Collection *collection,
struct Object *ob);
struct Collection *BKE_collection_object_find(struct Main *bmain,
struct Scene *scene,
struct Collection *collection,
struct Object *ob);
bool BKE_collection_is_empty(const struct Collection *collection);
bool BKE_collection_has_object(Collection *collection, const Object *ob);
bool BKE_collection_has_object_recursive(Collection *collection, Object *ob);
bool BKE_collection_has_object_recursive_instanced(Collection *collection, Object *ob);
Collection *BKE_collection_object_find(Main *bmain,
Scene *scene,
Collection *collection,
Object *ob);
bool BKE_collection_is_empty(const Collection *collection);
/**
* Add object to given collection, ensuring this collection is 'editable' (i.e. local and not a
* liboverride), and finding a suitable parent one otherwise.
*/
bool BKE_collection_object_add(struct Main *bmain,
struct Collection *collection,
struct Object *ob);
bool BKE_collection_object_add(Main *bmain, Collection *collection, Object *ob);
/**
* Add object to given collection, similar to #BKE_collection_object_add.
@ -124,62 +115,51 @@ bool BKE_collection_object_add(struct Main *bmain,
* However, it additionally ensures that the selected collection is also part of the given
* `view_layer`, if non-NULL. Otherwise, the object is not added to any collection.
*/
bool BKE_collection_viewlayer_object_add(struct Main *bmain,
const struct ViewLayer *view_layer,
struct Collection *collection,
struct Object *ob);
bool BKE_collection_viewlayer_object_add(Main *bmain,
const ViewLayer *view_layer,
Collection *collection,
Object *ob);
/**
* Same as #BKE_collection_object_add, but unconditionally adds the object to the given collection.
*
* NOTE: required in certain cases, like do-versioning or complex ID management tasks.
*/
bool BKE_collection_object_add_notest(struct Main *bmain,
struct Collection *collection,
struct Object *ob);
bool BKE_collection_object_add_notest(Main *bmain, Collection *collection, Object *ob);
/**
* Add \a ob_dst to all scene collections that reference object \a ob_src is in.
* Used for copying objects.
*
* Logic is very similar to #BKE_collection_add_from_object()
*/
void BKE_collection_object_add_from(struct Main *bmain,
struct Scene *scene,
struct Object *ob_src,
struct Object *ob_dst);
void BKE_collection_object_add_from(Main *bmain, Scene *scene, Object *ob_src, Object *ob_dst);
/**
* Remove object from collection.
*/
bool BKE_collection_object_remove(struct Main *bmain,
struct Collection *collection,
struct Object *object,
bool BKE_collection_object_remove(Main *bmain,
Collection *collection,
Object *object,
bool free_us);
/**
* Replace one object with another in a collection (managing user counts).
*/
bool BKE_collection_object_replace(struct Main *bmain,
struct Collection *collection,
struct Object *ob_old,
struct Object *ob_new);
bool BKE_collection_object_replace(Main *bmain,
Collection *collection,
Object *ob_old,
Object *ob_new);
/**
* Move object from a collection into another
*
* If source collection is NULL move it from all the existing collections.
*/
void BKE_collection_object_move(struct Main *bmain,
struct Scene *scene,
struct Collection *collection_dst,
struct Collection *collection_src,
struct Object *ob);
void BKE_collection_object_move(
Main *bmain, Scene *scene, Collection *collection_dst, Collection *collection_src, Object *ob);
/**
* Remove object from all collections of scene
*/
bool BKE_scene_collections_object_remove(struct Main *bmain,
struct Scene *scene,
struct Object *object,
bool free_us);
bool BKE_scene_collections_object_remove(Main *bmain, Scene *scene, Object *object, bool free_us);
/**
* Check all collections in \a bmain (including embedded ones in scenes) for invalid
@ -188,7 +168,7 @@ bool BKE_scene_collections_object_remove(struct Main *bmain,
* \note In case of duplicates, the first CollectionObject in the list is kept, all others are
* removed.
*/
void BKE_collections_object_remove_invalids(struct Main *bmain);
void BKE_collections_object_remove_invalids(Main *bmain);
/**
* Remove all NULL children from parent collections of changed \a collection.
@ -202,22 +182,20 @@ void BKE_collections_object_remove_invalids(struct Main *bmain);
* \param child_collection: The collection that was remapped to another pointer. May be \a NULL,
* in which case whole \a bmain database of collections is checked.
*/
void BKE_collections_child_remove_nulls(struct Main *bmain,
struct Collection *parent_collection,
struct Collection *child_collection);
void BKE_collections_child_remove_nulls(Main *bmain,
Collection *parent_collection,
Collection *child_collection);
/* Dependencies. */
bool BKE_collection_is_in_scene(struct Collection *collection);
void BKE_collections_after_lib_link(struct Main *bmain);
bool BKE_collection_object_cyclic_check(struct Main *bmain,
struct Object *object,
struct Collection *collection);
bool BKE_collection_is_in_scene(Collection *collection);
void BKE_collections_after_lib_link(Main *bmain);
bool BKE_collection_object_cyclic_check(Main *bmain, Object *object, Collection *collection);
/* Object list cache. */
struct ListBase BKE_collection_object_cache_get(struct Collection *collection);
ListBase BKE_collection_object_cache_instanced_get(struct Collection *collection);
ListBase BKE_collection_object_cache_get(Collection *collection);
ListBase BKE_collection_object_cache_instanced_get(Collection *collection);
/** Free the object cache of given `collection` and all of its ancestors (recursively).
*
* \param bmain: The Main database owning the collection. May be `nullptr`, only used if doing
@ -225,18 +203,18 @@ ListBase BKE_collection_object_cache_instanced_get(struct Collection *collection
* \param id_create_flag: Flags controlling ID creation, used here to enable or
* not depsgraph tagging of affected IDs (e.g. #LIB_ID_CREATE_NO_DEG_TAG would prevent depsgraph
* tagging). */
void BKE_collection_object_cache_free(const struct Main *bmain,
struct Collection *collection,
void BKE_collection_object_cache_free(const Main *bmain,
Collection *collection,
const int id_create_flag);
/**
* Free the object cache of all collections in given `bmain`, including master collections of
* scenes.
*/
void BKE_main_collections_object_cache_free(const struct Main *bmain);
void BKE_main_collections_object_cache_free(const Main *bmain);
struct Base *BKE_collection_or_layer_objects(const struct Scene *scene,
struct ViewLayer *view_layer,
struct Collection *collection);
Base *BKE_collection_or_layer_objects(const Scene *scene,
ViewLayer *view_layer,
Collection *collection);
/* Editing. */
@ -245,44 +223,38 @@ struct Base *BKE_collection_or_layer_objects(const struct Scene *scene,
*
* The index is calculated from top to bottom counting the children before the siblings.
*/
struct Collection *BKE_collection_from_index(struct Scene *scene, int index);
Collection *BKE_collection_from_index(Scene *scene, int index);
/**
* The automatic/fallback name of a new collection.
*/
void BKE_collection_new_name_get(struct Collection *collection_parent, char *rname);
void BKE_collection_new_name_get(Collection *collection_parent, char *rname);
/**
* The name to show in the interface.
*/
const char *BKE_collection_ui_name_get(struct Collection *collection);
const char *BKE_collection_ui_name_get(Collection *collection);
/**
* Select all the objects in this Collection (and its nested collections) for this ViewLayer.
* Return true if any object was selected.
*/
bool BKE_collection_objects_select(const struct Scene *scene,
struct ViewLayer *view_layer,
struct Collection *collection,
bool BKE_collection_objects_select(const Scene *scene,
ViewLayer *view_layer,
Collection *collection,
bool deselect);
/* Collection children */
bool BKE_collection_child_add(struct Main *bmain,
struct Collection *parent,
struct Collection *child);
bool BKE_collection_child_add(Main *bmain, Collection *parent, Collection *child);
bool BKE_collection_child_add_no_sync(struct Main *bmain,
struct Collection *parent,
struct Collection *child);
bool BKE_collection_child_add_no_sync(Main *bmain, Collection *parent, Collection *child);
bool BKE_collection_child_remove(struct Main *bmain,
struct Collection *parent,
struct Collection *child);
bool BKE_collection_child_remove(Main *bmain, Collection *parent, Collection *child);
bool BKE_collection_move(struct Main *bmain,
struct Collection *to_parent,
struct Collection *from_parent,
struct Collection *relative,
bool BKE_collection_move(Main *bmain,
Collection *to_parent,
Collection *from_parent,
Collection *relative,
bool relative_after,
struct Collection *collection);
Collection *collection);
/**
* Find potential cycles in collections.
@ -293,34 +265,33 @@ bool BKE_collection_move(struct Main *bmain,
* may be NULL if we just want to ensure \a new_ancestor does not already have cycles.
* \return true if a cycle is found.
*/
bool BKE_collection_cycle_find(struct Collection *new_ancestor, struct Collection *collection);
bool BKE_collection_cycle_find(Collection *new_ancestor, Collection *collection);
/**
* Find and fix potential cycles in collections.
*
* \param collection: The collection to check for existing cycles.
* \return true if cycles are found and fixed.
*/
bool BKE_collection_cycles_fix(struct Main *bmain, struct Collection *collection);
bool BKE_collection_cycles_fix(Main *bmain, Collection *collection);
bool BKE_collection_has_collection(const struct Collection *parent,
const struct Collection *collection);
bool BKE_collection_has_collection(const Collection *parent, const Collection *collection);
/**
* Rebuild parent relationships from child ones, for all children of given \a collection.
*
* \note Given collection is assumed to already have valid parents.
*/
void BKE_collection_parent_relations_rebuild(struct Collection *collection);
void BKE_collection_parent_relations_rebuild(Collection *collection);
/**
* Rebuild parent relationships from child ones, for all collections in given \a bmain.
*/
void BKE_main_collections_parent_relations_rebuild(struct Main *bmain);
void BKE_main_collections_parent_relations_rebuild(Main *bmain);
/**
* Perform some validation on integrity of the data of this collection.
*
* \return `true` if everything is OK, false if some errors are detected. */
bool BKE_collection_validate(struct Collection *collection);
bool BKE_collection_validate(Collection *collection);
/* .blend file I/O */
@ -328,17 +299,14 @@ bool BKE_collection_validate(struct Collection *collection);
* Perform some pre-writing cleanup on the COllection data itself (_not_ in any sub-data
* referenced by pointers). To be called before writing the Collection struct itself.
*/
void BKE_collection_blend_write_prepare_nolib(struct BlendWriter *writer,
struct Collection *collection);
void BKE_collection_blend_write_nolib(struct BlendWriter *writer, struct Collection *collection);
void BKE_collection_blend_read_data(struct BlendDataReader *reader,
struct Collection *collection,
struct ID *owner_id);
void BKE_collection_blend_write_prepare_nolib(BlendWriter *writer, Collection *collection);
void BKE_collection_blend_write_nolib(BlendWriter *writer, Collection *collection);
void BKE_collection_blend_read_data(BlendDataReader *reader, Collection *collection, ID *owner_id);
/* Iteration callbacks. */
typedef void (*BKE_scene_objects_Cb)(struct Object *ob, void *data);
typedef void (*BKE_scene_collections_Cb)(struct Collection *ob, void *data);
typedef void (*BKE_scene_objects_Cb)(Object *ob, void *data);
typedef void (*BKE_scene_collections_Cb)(Collection *ob, void *data);
/* Iteration over objects in collection. */
@ -348,7 +316,8 @@ typedef void (*BKE_scene_collections_Cb)(struct Collection *ob, void *data);
int _object_visibility_flag = (_mode == DAG_EVAL_VIEWPORT) ? OB_HIDE_VIEWPORT : \
OB_HIDE_RENDER; \
int _base_id = 0; \
for (Base *_base = (Base *)BKE_collection_object_cache_get(_collection).first; _base; \
for (Base *_base = static_cast<Base *>(BKE_collection_object_cache_get(_collection).first); \
_base; \
_base = _base->next, _base_id++) \
{ \
Object *_object = _base->object; \
@ -362,7 +331,8 @@ typedef void (*BKE_scene_collections_Cb)(struct Collection *ob, void *data);
((void)0)
#define FOREACH_COLLECTION_OBJECT_RECURSIVE_BEGIN(_collection, _object) \
for (Base *_base = (Base *)BKE_collection_object_cache_get(_collection).first; _base; \
for (Base *_base = static_cast<Base *>(BKE_collection_object_cache_get(_collection).first); \
_base; \
_base = _base->next) \
{ \
Object *_object = _base->object; \
@ -378,28 +348,28 @@ typedef void (*BKE_scene_collections_Cb)(struct Collection *ob, void *data);
* Only use this in non-performance critical situations
* (it iterates over all scene collections twice)
*/
void BKE_scene_collections_iterator_begin(struct BLI_Iterator *iter, void *data_in);
void BKE_scene_collections_iterator_next(struct BLI_Iterator *iter);
void BKE_scene_collections_iterator_end(struct BLI_Iterator *iter);
void BKE_scene_collections_iterator_begin(BLI_Iterator *iter, void *data_in);
void BKE_scene_collections_iterator_next(BLI_Iterator *iter);
void BKE_scene_collections_iterator_end(BLI_Iterator *iter);
void BKE_scene_objects_iterator_begin(struct BLI_Iterator *iter, void *data_in);
void BKE_scene_objects_iterator_next(struct BLI_Iterator *iter);
void BKE_scene_objects_iterator_end(struct BLI_Iterator *iter);
void BKE_scene_objects_iterator_begin(BLI_Iterator *iter, void *data_in);
void BKE_scene_objects_iterator_next(BLI_Iterator *iter);
void BKE_scene_objects_iterator_end(BLI_Iterator *iter);
/**
* Iterate over objects in the scene based on a flag.
*
* \note The object->flag is tested against flag.
*/
typedef struct SceneObjectsIteratorExData {
struct Scene *scene;
struct SceneObjectsIteratorExData {
Scene *scene;
int flag;
void *iter_data;
} SceneObjectsIteratorExData;
};
void BKE_scene_objects_iterator_begin_ex(struct BLI_Iterator *iter, void *data_in);
void BKE_scene_objects_iterator_next_ex(struct BLI_Iterator *iter);
void BKE_scene_objects_iterator_end_ex(struct BLI_Iterator *iter);
void BKE_scene_objects_iterator_begin_ex(BLI_Iterator *iter, void *data_in);
void BKE_scene_objects_iterator_next_ex(BLI_Iterator *iter);
void BKE_scene_objects_iterator_end_ex(BLI_Iterator *iter);
/**
* Generate a new #GSet (or extend given `objects_gset` if not NULL) with all objects referenced by
@ -408,7 +378,7 @@ void BKE_scene_objects_iterator_end_ex(struct BLI_Iterator *iter);
* \note This will include objects without a base currently
* (because they would belong to excluded collections only e.g.).
*/
struct GSet *BKE_scene_objects_as_gset(struct Scene *scene, struct GSet *objects_gset);
GSet *BKE_scene_objects_as_gset(Scene *scene, GSet *objects_gset);
#define FOREACH_SCENE_COLLECTION_BEGIN(scene, _instance) \
ITER_BEGIN (BKE_scene_collections_iterator_begin, \
@ -430,16 +400,16 @@ struct GSet *BKE_scene_objects_as_gset(struct Scene *scene, struct GSet *objects
_instance_next = _scene->master_collection; \
} \
else { \
_instance_next = (Collection *)(_bmain)->collections.first; \
_instance_next = static_cast<Collection *>((_bmain)->collections.first); \
} \
\
while ((_instance = _instance_next)) { \
if (is_scene_collection) { \
_instance_next = (Collection *)(_bmain)->collections.first; \
_instance_next = static_cast<Collection *>((_bmain)->collections.first); \
is_scene_collection = false; \
} \
else { \
_instance_next = (Collection *)_instance->id.next; \
_instance_next = static_cast<Collection *>(_instance->id.next); \
}
#define FOREACH_COLLECTION_END \
@ -456,7 +426,3 @@ struct GSet *BKE_scene_objects_as_gset(struct Scene *scene, struct GSet *objects
_instance)
#define FOREACH_SCENE_OBJECT_END ITER_END
#ifdef __cplusplus
}
#endif

2
source/blender/blenkernel/BKE_layer.hh
View File

@ -10,7 +10,7 @@
#include "BLI_vector.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "DNA_layer_types.h"
#include "DNA_listBase.h"

2
source/blender/blenkernel/CMakeLists.txt
View File

@ -358,7 +358,7 @@ set(SRC
BKE_ccg.h
BKE_cdderivedmesh.h
BKE_cloth.hh
BKE_collection.h
BKE_collection.hh
BKE_collision.h
BKE_colorband.hh
BKE_colortools.hh

2
source/blender/blenkernel/intern/bake_geometry_nodes_modifier.cc
View File

@ -5,7 +5,7 @@
#include <sstream>
#include "BKE_bake_geometry_nodes_modifier.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_curves.hh"
#include "BKE_main.hh"

2
source/blender/blenkernel/intern/collection.cc
View File

@ -21,7 +21,7 @@
#include "BLT_translation.hh"
#include "BKE_anim_data.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_idprop.h"
#include "BKE_idtype.hh"
#include "BKE_layer.hh"

2
source/blender/blenkernel/intern/collision.cc
View File

@ -26,7 +26,7 @@
#include "BLI_utildefines.h"
#include "BKE_cloth.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_effect.h"
#include "BKE_layer.hh"
#include "BKE_modifier.hh"

2
source/blender/blenkernel/intern/dynamicpaint.cc
View File

@ -40,7 +40,7 @@
#include "BKE_armature.hh"
#include "BKE_bvhutils.hh" /* bvh tree */
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_collision.h"
#include "BKE_colorband.hh"
#include "BKE_constraint.h"

2
source/blender/blenkernel/intern/effect.cc
View File

@ -38,7 +38,7 @@
#include "BKE_anim_path.h" /* needed for where_on_path */
#include "BKE_bvhutils.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_collision.h"
#include "BKE_curve.hh"
#include "BKE_displist.h"

2
source/blender/blenkernel/intern/geometry_set_instances.cc
View File

@ -2,7 +2,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later */
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_geometry_set_instances.hh"
#include "BKE_instances.hh"
#include "BKE_mesh.hh"

2
source/blender/blenkernel/intern/gpencil_curve_legacy.cc
View File

@ -28,7 +28,7 @@
#include "DNA_meshdata_types.h"
#include "DNA_scene_types.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_context.hh"
#include "BKE_curve.hh"
#include "BKE_gpencil_curve_legacy.h"

2
source/blender/blenkernel/intern/gpencil_legacy.cc
View File

@ -35,7 +35,7 @@
#include "BKE_action.h"
#include "BKE_anim_data.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_colortools.hh"
#include "BKE_deform.hh"
#include "BKE_gpencil_geom_legacy.h"

2
source/blender/blenkernel/intern/layer.cc
View File

@ -22,7 +22,7 @@
#include "BLT_translation.hh"
#include "BKE_animsys.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_freestyle.h"
#include "BKE_idprop.h"
#include "BKE_layer.hh"

2
source/blender/blenkernel/intern/layer_utils.cc
View File

@ -10,7 +10,7 @@
#include "BLI_array.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_customdata.hh"
#include "BKE_editmesh.hh"
#include "BKE_layer.hh"

2
source/blender/blenkernel/intern/lib_override.cc
View File

@ -28,7 +28,7 @@
#include "BKE_anim_data.h"
#include "BKE_armature.hh"
#include "BKE_blender.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_fcurve.h"
#include "BKE_global.h"
#include "BKE_idtype.hh"

2
source/blender/blenkernel/intern/lib_override_proxy_conversion.cc
View File

@ -22,7 +22,7 @@
#include "DEG_depsgraph.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_idtype.hh"
#include "BKE_lib_id.hh"
#include "BKE_lib_override.hh"

2
source/blender/blenkernel/intern/lib_remap.cc
View File

@ -18,7 +18,7 @@
#include "DNA_object_types.h"
#include "BKE_armature.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_curve.hh"
#include "BKE_layer.hh"
#include "BKE_lib_id.hh"

2
source/blender/blenkernel/intern/light_linking.cc
View File

@ -16,7 +16,7 @@
#include "BLI_assert.h"
#include "BLI_string.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_layer.hh"
#include "BKE_lib_id.hh"
#include "BKE_report.h"

2
source/blender/blenkernel/intern/main_test.cc
View File

@ -11,7 +11,7 @@
#include "BLI_path_util.h"
#include "BLI_string.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_idtype.hh"
#include "BKE_lib_id.hh"
#include "BKE_library.hh"

2
source/blender/blenkernel/intern/object.cc
View File

@ -74,7 +74,7 @@
#include "BKE_asset.hh"
#include "BKE_bpath.hh"
#include "BKE_camera.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_constraint.h"
#include "BKE_crazyspace.hh"
#include "BKE_curve.hh"

2
source/blender/blenkernel/intern/object_dupli.cc
View File

@ -39,7 +39,7 @@
#include "DNA_vfont_types.h"
#include "DNA_volume_types.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_duplilist.h"
#include "BKE_editmesh.hh"
#include "BKE_editmesh_cache.hh"

2
source/blender/blenkernel/intern/particle.cc
View File

@ -51,7 +51,7 @@
#include "BKE_anim_path.h"
#include "BKE_boids.h"
#include "BKE_cloth.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_colortools.hh"
#include "BKE_customdata.hh"
#include "BKE_deform.hh"

2
source/blender/blenkernel/intern/particle_system.cc
View File

@ -58,7 +58,7 @@
#include "BKE_bvhutils.hh"
#include "BKE_cloth.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_lattice.hh"
#include "BKE_material.h"
#include "BKE_mesh.hh"

2
source/blender/blenkernel/intern/pointcache.cc
View File

@ -47,7 +47,7 @@
#include "BKE_appdir.hh"
#include "BKE_cloth.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_dynamicpaint.h"
#include "BKE_fluid.h"
#include "BKE_global.h"

2
source/blender/blenkernel/intern/rigidbody.cc
View File

@ -36,7 +36,7 @@
#include "DNA_rigidbody_types.h"
#include "DNA_scene_types.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_effect.h"
#include "BKE_global.h"
#include "BKE_layer.hh"

2
source/blender/blenkernel/intern/scene.cc
View File

@ -60,7 +60,7 @@
#include "BKE_armature.hh"
#include "BKE_bpath.hh"
#include "BKE_cachefile.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_colortools.hh"
#include "BKE_curveprofile.h"
#include "BKE_duplilist.h"

2
source/blender/blenkernel/intern/softbody.cc
View File

@ -50,7 +50,7 @@
#include "BLI_time.h"
#include "BLI_utildefines.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_collision.h"
#include "BKE_curve.hh"
#include "BKE_customdata.hh"

2
source/blender/blenloader/intern/readfile.cc
View File

@ -64,7 +64,7 @@
#include "BKE_animsys.h"
#include "BKE_asset.hh"
#include "BKE_blender_version.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_global.h" /* for G */
#include "BKE_idprop.h"
#include "BKE_idtype.hh"

2
source/blender/blenloader/intern/versioning_280.cc
View File

@ -65,7 +65,7 @@
#include "BKE_blender.hh"
#include "BKE_brush.hh"
#include "BKE_cloth.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_colortools.hh"
#include "BKE_constraint.h"
#include "BKE_curveprofile.h"

2
source/blender/blenloader/intern/versioning_290.cc
View File

@ -51,7 +51,7 @@
#include "BKE_animsys.h"
#include "BKE_armature.hh"
#include "BKE_attribute.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_colortools.hh"
#include "BKE_cryptomatte.h"
#include "BKE_curve.hh"

2
source/blender/blenloader/intern/versioning_300.cc
View File

@ -60,7 +60,7 @@
#include "BKE_armature.hh"
#include "BKE_asset.hh"
#include "BKE_attribute.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_colortools.hh"
#include "BKE_curve.hh"
#include "BKE_curves.hh"

2
source/blender/blenloader/intern/versioning_400.cc
View File

@ -49,7 +49,7 @@
#include "BKE_animsys.h"
#include "BKE_armature.hh"
#include "BKE_attribute.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_curve.hh"
#include "BKE_effect.h"
#include "BKE_grease_pencil.hh"

2
source/blender/depsgraph/intern/builder/deg_builder.cc
View File

@ -21,7 +21,7 @@
#include "BLI_utildefines.h"
#include "BKE_action.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_lib_id.hh"
#include "RNA_prototypes.h"

2
source/blender/depsgraph/intern/builder/deg_builder_nodes.cc
View File

@ -58,7 +58,7 @@
#include "BKE_armature.hh"
#include "BKE_bake_geometry_nodes_modifier.hh"
#include "BKE_cachefile.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_constraint.h"
#include "BKE_curve.hh"
#include "BKE_effect.h"

2
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
View File

@ -58,7 +58,7 @@
#include "BKE_action.h"
#include "BKE_anim_data.h"
#include "BKE_armature.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_collision.h"
#include "BKE_constraint.h"
#include "BKE_curve.hh"

2
source/blender/depsgraph/intern/depsgraph_build.cc
View File

@ -22,7 +22,7 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_main.hh"
#include "BKE_scene.h"

2
source/blender/depsgraph/intern/depsgraph_light_linking.cc
View File

@ -16,7 +16,7 @@
#include "BLI_map.hh"
#include "BLI_utildefines.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "DNA_collection_types.h"
#include "DNA_layer_types.h"

2
source/blender/draw/engines/eevee/eevee_lightprobes.cc
View File

@ -18,7 +18,7 @@
#include "DNA_view3d_types.h"
#include "DNA_world_types.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_object.hh"
#include "MEM_guardedalloc.h"

2
source/blender/editors/animation/anim_filter.cc
View File

@ -69,7 +69,7 @@
#include "BKE_action.h"
#include "BKE_anim_data.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_context.hh"
#include "BKE_fcurve.h"
#include "BKE_fcurve_driver.h"

2
source/blender/editors/gpencil_legacy/gpencil_convert.cc
View File

@ -36,7 +36,7 @@
#include "DNA_view3d_types.h"
#include "BKE_animsys.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_context.hh"
#include "BKE_curve.hh"
#include "BKE_fcurve.h"

2
source/blender/editors/gpencil_legacy/gpencil_utils.cc
View File

@ -41,7 +41,7 @@
#include "BKE_action.h"
#include "BKE_brush.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_colortools.hh"
#include "BKE_context.hh"
#include "BKE_deform.hh"

2
source/blender/editors/object/object_add.cc
View File

@ -48,7 +48,7 @@
#include "BKE_anim_data.h"
#include "BKE_armature.hh"
#include "BKE_camera.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_constraint.h"
#include "BKE_context.hh"
#include "BKE_curve.hh"

2
source/blender/editors/object/object_collection.cc
View File

@ -15,7 +15,7 @@
#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_context.hh"
#include "BKE_layer.hh"
#include "BKE_lib_id.hh"

2
source/blender/editors/object/object_edit.cc
View File

@ -41,7 +41,7 @@
#include "BKE_anim_visualization.h"
#include "BKE_armature.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_constraint.h"
#include "BKE_context.hh"
#include "BKE_curve.hh"

2
source/blender/editors/object/object_relations.cc
View File

@ -48,7 +48,7 @@
#include "BKE_anim_data.h"
#include "BKE_armature.hh"
#include "BKE_camera.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_constraint.h"
#include "BKE_context.hh"
#include "BKE_curve.hh"

2
source/blender/editors/object/object_select.cc
View File

@ -34,7 +34,7 @@
#include "BKE_action.h"
#include "BKE_armature.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_context.hh"
#include "BKE_deform.hh"
#include "BKE_layer.hh"

2
source/blender/editors/physics/rigidbody_constraint.cc
View File

@ -15,7 +15,7 @@
#include "DNA_rigidbody_types.h"
#include "DNA_scene_types.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_context.hh"
#include "BKE_layer.hh"
#include "BKE_lib_id.hh"

2
source/blender/editors/space_outliner/outliner_collections.cc
View File

@ -15,7 +15,7 @@
#include "DNA_collection_types.h"
#include "DNA_object_types.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_context.hh"
#include "BKE_idtype.hh"
#include "BKE_layer.hh"

2
source/blender/editors/space_outliner/outliner_dragdrop.cc
View File

@ -20,7 +20,7 @@
#include "BLT_translation.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_context.hh"
#include "BKE_layer.hh"
#include "BKE_lib_id.hh"

2
source/blender/editors/space_outliner/outliner_select.cc
View File

@ -25,7 +25,7 @@
#include "BLI_utildefines.h"
#include "BKE_armature.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_constraint.h"
#include "BKE_context.hh"
#include "BKE_deform.hh"

2
source/blender/editors/space_outliner/outliner_tools.cc
View File

@ -40,7 +40,7 @@
#include "BKE_anim_data.h"
#include "BKE_animsys.h"
#include "BKE_armature.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_constraint.h"
#include "BKE_context.hh"
#include "BKE_fcurve.h"

2
source/blender/editors/space_outliner/tree/tree_display_libraries.cc
View File

@ -9,7 +9,7 @@
#include "BLI_listbase.h"
#include "BLI_listbase_wrapper.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_main.hh"
#include "DNA_collection_types.h"

2
source/blender/editors/space_outliner/tree/tree_display_override_library_properties.cc
View File

@ -9,7 +9,7 @@
#include "BLI_listbase.h"
#include "BLI_listbase_wrapper.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_main.hh"
#include "DNA_collection_types.h"

2
source/blender/editors/space_outliner/tree/tree_element_overrides.cc
View File

@ -6,7 +6,7 @@
* \ingroup spoutliner
*/
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_lib_override.hh"
#include "BLI_function_ref.hh"

2
source/blender/editors/space_outliner/tree/tree_element_scene_objects.cc
View File

@ -6,7 +6,7 @@
* \ingroup spoutliner
*/
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BLI_utildefines.h"

2
source/blender/editors/space_view3d/view3d_draw.cc
View File

@ -20,7 +20,7 @@
#include "BKE_armature.hh"
#include "BKE_camera.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_context.hh"
#include "BKE_customdata.hh"
#include "BKE_global.h"

2
source/blender/editors/util/ed_util.cc
View File

@ -18,7 +18,7 @@
#include "BLT_translation.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_global.h"
#include "BKE_layer.hh"
#include "BKE_lib_id.hh"

2
source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
View File

@ -29,7 +29,7 @@
#include "DNA_screen_types.h"
#include "BKE_attribute.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_customdata.hh"
#include "BKE_global.h"
#include "BKE_idprop.h"

2
source/blender/geometry/intern/realize_instances.cc
View File

@ -15,7 +15,7 @@
#include "BLI_noise.hh"
#include "BLI_task.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_curves.hh"
#include "BKE_customdata.hh"
#include "BKE_geometry_set_instances.hh"

2
source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc
View File

@ -22,7 +22,7 @@
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_context.hh"
#include "BKE_global.h"
#include "BKE_gpencil_legacy.h"

2
source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc
View File

@ -24,7 +24,7 @@
#include "BKE_attribute.hh"
#include "BKE_camera.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_customdata.hh"
#include "BKE_deform.hh"
#include "BKE_duplilist.h"

2
source/blender/io/collada/DocumentImporter.cpp
View File

@ -40,7 +40,7 @@
#include "BLI_utildefines.h"
#include "BKE_camera.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_fcurve.h"
#include "BKE_global.h"
#include "BKE_image.h"

2
source/blender/io/collada/EffectExporter.cpp
View File

@ -22,7 +22,7 @@
#include "DNA_mesh_types.h"
#include "DNA_world_types.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_customdata.hh"
#include "BKE_material.h"
#include "BKE_mesh.hh"

2
source/blender/io/collada/SceneExporter.cpp
View File

@ -6,7 +6,7 @@
* \ingroup collada
*/
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_lib_id.hh"
#include "BKE_object.hh"
#include "BLI_listbase.h"

2
source/blender/io/usd/intern/usd_reader_stage.cc
View File

@ -45,7 +45,7 @@
#include "BLI_sort.hh"
#include "BLI_string.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_lib_id.hh"
#include "BKE_modifier.hh"
#include "BKE_report.h"

2
source/blender/makesrna/intern/rna_access.cc
View File

@ -33,7 +33,7 @@
#include "BLT_translation.hh"
#include "BKE_anim_data.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_context.hh"
#include "BKE_fcurve.h"
#include "BKE_global.h"

2
source/blender/makesrna/intern/rna_collection.cc
View File

@ -48,7 +48,7 @@ BLI_STATIC_ASSERT(ARRAY_SIZE(rna_enum_collection_color_items) - 2 == COLLECTION_
# include "DEG_depsgraph_build.hh"
# include "DEG_depsgraph_query.hh"
# include "BKE_collection.h"
# include "BKE_collection.hh"
# include "BKE_global.h"
# include "BKE_layer.hh"

2
source/blender/makesrna/intern/rna_main_api.cc
View File

@ -29,7 +29,7 @@
# include "BKE_armature.hh"
# include "BKE_brush.hh"
# include "BKE_camera.h"
# include "BKE_collection.h"
# include "BKE_collection.hh"
# include "BKE_curve.hh"
# include "BKE_curves.h"
# include "BKE_displist.h"

2
source/blender/makesrna/intern/rna_object.cc
View File

@ -32,7 +32,7 @@
#include "BLT_translation.hh"
#include "BKE_camera.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_editlattice.h"
#include "BKE_editmesh.hh"
#include "BKE_layer.hh"

2
source/blender/makesrna/intern/rna_object_force.cc
View File

@ -109,7 +109,7 @@ static const EnumPropertyItem empty_vortex_shape_items[] = {
# include "DNA_modifier_types.h"
# include "DNA_texture_types.h"
# include "BKE_collection.h"
# include "BKE_collection.hh"
# include "BKE_context.hh"
# include "BKE_modifier.hh"
# include "BKE_pointcache.h"

2
source/blender/makesrna/intern/rna_scene.cc
View File

@ -729,7 +729,7 @@ const EnumPropertyItem rna_enum_grease_pencil_selectmode_items[] = {
# include "BKE_animsys.h"
# include "BKE_bake_geometry_nodes_modifier.hh"
# include "BKE_brush.hh"
# include "BKE_collection.h"
# include "BKE_collection.hh"
# include "BKE_context.hh"
# include "BKE_freestyle.h"
# include "BKE_global.h"

2
source/blender/makesrna/intern/rna_sculpt_paint.cc
View File

@ -109,7 +109,7 @@ const EnumPropertyItem rna_enum_symmetrize_direction_items[] = {
#ifdef RNA_RUNTIME
# include "MEM_guardedalloc.h"
# include "BKE_collection.h"
# include "BKE_collection.hh"
# include "BKE_context.hh"
# include "BKE_gpencil_legacy.h"
# include "BKE_object.hh"

2
source/blender/modifiers/intern/MOD_boolean.cc
View File

@ -27,7 +27,7 @@
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_context.hh"
#include "BKE_global.h" /* only to check G.debug */
#include "BKE_lib_id.hh"

2
source/blender/nodes/geometry/nodes/node_geo_collection_info.cc
View File

@ -12,7 +12,7 @@
#include "UI_interface.hh"
#include "UI_resources.hh"
#include "BKE_collection.h"
#include "BKE_collection.hh"
#include "BKE_instances.hh"
#include "node_geometry_util.hh"