bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

BKE_main: move header to be a fully CPP one.

Browse Source 
Pull Request: https://projects.blender.org/blender/blender/pulls/115681
This commit is contained in:
Bastien Montagne 2023-12-01 19:43:16 +01:00 committed by Gitea
parent 2cc6519692
commit 3acb64e7ac
430 changed files with 479 additions and 489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/asset_system/intern/asset_library.cc
View File

@ -14,7 +14,7 @@
#include "AS_asset_library.hh"
#include "AS_asset_representation.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_preferences.h"
#include "BLI_fileops.h"

2
source/blender/asset_system/tests/asset_library_service_test.cc
View File

@ -10,7 +10,7 @@
#include "BKE_appdir.h"
#include "BKE_callbacks.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "DNA_asset_types.h"

110
source/blender/blenkernel/BKE_main.h → source/blender/blenkernel/BKE_main.hh
View File

@ -25,10 +25,6 @@
#include "BLI_compiler_attrs.h"
#include "BLI_sys_types.h"
#ifdef __cplusplus
extern "C" {
#endif
struct BLI_mempool;
struct BlendThumbnail;
struct GHash;
@ -42,14 +38,14 @@ struct UniqueName_Map;
/**
* Blender thumbnail, as written to the `.blend` file (width, height, and data as char RGBA).
*/
typedef struct BlendThumbnail {
struct BlendThumbnail {
int width, height;
/** Pixel data, RGBA (repeated): `sizeof(char[4]) * width * height`. */
char rect[0];
} BlendThumbnail;
};
/** Structs caching relations between data-blocks in a given Main. */
typedef struct MainIDRelationsEntryItem {
struct MainIDRelationsEntryItem {
struct MainIDRelationsEntryItem *next;
union {
@ -62,9 +58,9 @@ typedef struct MainIDRelationsEntryItem {
uint session_uuid;
int usage_flag; /* Using IDWALK_ enums, defined in BKE_lib_query.h */
} MainIDRelationsEntryItem;
};
typedef struct MainIDRelationsEntry {
struct MainIDRelationsEntry {
/* Linked list of IDs using that ID. */
struct MainIDRelationsEntryItem *from_ids;
/* Linked list of IDs used by that ID. */
@ -75,10 +71,10 @@ typedef struct MainIDRelationsEntry {
/* Runtime tags, users should ensure those are reset after usage. */
uint tags;
} MainIDRelationsEntry;
};
/** #MainIDRelationsEntry.tags */
typedef enum eMainIDRelationsEntryTags {
enum eMainIDRelationsEntryTags {
/* Generic tag marking the entry as to be processed. */
MAINIDRELATIONS_ENTRY_TAGS_DOIT = 1 << 0,
@ -102,9 +98,9 @@ typedef enum eMainIDRelationsEntryTags {
* handling. */
MAINIDRELATIONS_ENTRY_TAGS_INPROGRESS = MAINIDRELATIONS_ENTRY_TAGS_INPROGRESS_TO |
MAINIDRELATIONS_ENTRY_TAGS_INPROGRESS_FROM,
} eMainIDRelationsEntryTags;
};
typedef struct MainIDRelations {
struct MainIDRelations {
/* Mapping from an ID pointer to all of its parents (IDs using it) and children (IDs it uses).
* Values are `MainIDRelationsEntry` pointers. */
struct GHash *relations_from_pointers;
@ -114,15 +110,15 @@ typedef struct MainIDRelations {
/* Private... */
struct BLI_mempool *entry_items_pool;
} MainIDRelations;
};
enum {
/* Those bmain relations include pointers/usages from editors. */
MAINIDRELATIONS_INCLUDE_UI = 1 << 0,
};
typedef struct Main {
struct Main *next, *prev;
struct Main {
Main *next, *prev;
/**
* The file-path of this blend file, an empty string indicates an unsaved file.
*
@ -187,7 +183,7 @@ typedef struct Main {
BlendThumbnail *blen_thumb;
struct Library *curlib;
Library *curlib;
ListBase scenes;
ListBase libraries;
ListBase objects;
@ -238,20 +234,20 @@ typedef struct Main {
* know when, who and how it was created.
* Used by code doing a lot of remapping etc. at once to speed things up.
*/
struct MainIDRelations *relations;
MainIDRelations *relations;
/** IDMap of IDs. Currently used when reading (expanding) libraries. */
struct IDNameLib_Map *id_map;
IDNameLib_Map *id_map;
/** Used for efficient calculations of unique names. */
struct UniqueName_Map *name_map;
UniqueName_Map *name_map;
/* Used for efficient calculations of unique names. Covers all names in current Main, including
* linked data ones. */
struct UniqueName_Map *name_map_global;
UniqueName_Map *name_map_global;
struct MainLock *lock;
} Main;
MainLock *lock;
};
/**
* Create a new Main data-base.
@ -259,22 +255,22 @@ typedef struct Main {
* \note Always generate a non-global Main, use #BKE_blender_globals_main_replace to put a newly
* created one in `G_MAIN`.
*/
struct Main *BKE_main_new(void);
void BKE_main_free(struct Main *mainvar);
Main *BKE_main_new(void);
void BKE_main_free(Main *mainvar);
/**
* Check whether given `bmain` is empty or contains some IDs.
*/
bool BKE_main_is_empty(struct Main *bmain);
bool BKE_main_is_empty(Main *bmain);
void BKE_main_lock(struct Main *bmain);
void BKE_main_unlock(struct Main *bmain);
void BKE_main_lock(Main *bmain);
void BKE_main_unlock(Main *bmain);
/** Generate the mappings between used IDs and their users, and vice-versa. */
void BKE_main_relations_create(struct Main *bmain, short flag);
void BKE_main_relations_free(struct Main *bmain);
void BKE_main_relations_create(Main *bmain, short flag);
void BKE_main_relations_free(Main *bmain);
/** Set or clear given `tag` in all relation entries of given `bmain`. */
void BKE_main_relations_tag_set(struct Main *bmain, eMainIDRelationsEntryTags tag, bool value);
void BKE_main_relations_tag_set(Main *bmain, eMainIDRelationsEntryTags tag, bool value);
/**
* Create a #GSet storing all IDs present in given \a bmain, by their pointers.
@ -282,7 +278,7 @@ void BKE_main_relations_tag_set(struct Main *bmain, eMainIDRelationsEntryTags ta
* \param gset: If not NULL, given GSet will be extended with IDs from given \a bmain,
* instead of creating a new one.
*/
struct GSet *BKE_main_gset_create(struct Main *bmain, struct GSet *gset);
GSet *BKE_main_gset_create(Main *bmain, GSet *gset);
/* Temporary runtime API to allow re-using local (already appended)
* IDs instead of appending a new copy again. */
@ -293,12 +289,11 @@ struct GSet *BKE_main_gset_create(struct Main *bmain, struct GSet *gset);
*
* This uses the information stored in `ID.library_weak_reference`.
*/
struct GHash *BKE_main_library_weak_reference_create(struct Main *bmain) ATTR_NONNULL();
GHash *BKE_main_library_weak_reference_create(Main *bmain) ATTR_NONNULL();
/**
* Destroy the data generated by #BKE_main_library_weak_reference_create.
*/
void BKE_main_library_weak_reference_destroy(struct GHash *library_weak_reference_mapping)
ATTR_NONNULL();
void BKE_main_library_weak_reference_destroy(GHash *library_weak_reference_mapping) ATTR_NONNULL();
/**
* Search for a local ID matching the given linked ID reference.
*
@ -308,10 +303,9 @@ void BKE_main_library_weak_reference_destroy(struct GHash *library_weak_referenc
* \param library_id_name: the full ID name, including the leading two chars encoding the ID
* type.
*/
struct ID *BKE_main_library_weak_reference_search_item(
struct GHash *library_weak_reference_mapping,
const char *library_filepath,
const char *library_id_name) ATTR_NONNULL();
ID *BKE_main_library_weak_reference_search_item(GHash *library_weak_reference_mapping,
const char *library_filepath,
const char *library_id_name) ATTR_NONNULL();
/**
* Add the given ID weak library reference to given local ID and the runtime mapping.
*
@ -321,10 +315,10 @@ struct ID *BKE_main_library_weak_reference_search_item(
* \param library_id_name: the full ID name, including the leading two chars encoding the ID type.
* \param new_id: New local ID matching given weak reference.
*/
void BKE_main_library_weak_reference_add_item(struct GHash *library_weak_reference_mapping,
void BKE_main_library_weak_reference_add_item(GHash *library_weak_reference_mapping,
const char *library_filepath,
const char *library_id_name,
struct ID *new_id) ATTR_NONNULL();
ID *new_id) ATTR_NONNULL();
/**
* Update the status of the given ID weak library reference in current local IDs and the runtime
* mapping.
@ -339,11 +333,11 @@ void BKE_main_library_weak_reference_add_item(struct GHash *library_weak_referen
* \param old_id: Existing local ID matching given weak reference.
* \param new_id: New local ID matching given weak reference.
*/
void BKE_main_library_weak_reference_update_item(struct GHash *library_weak_reference_mapping,
void BKE_main_library_weak_reference_update_item(GHash *library_weak_reference_mapping,
const char *library_filepath,
const char *library_id_name,
struct ID *old_id,
struct ID *new_id) ATTR_NONNULL();
ID *old_id,
ID *new_id) ATTR_NONNULL();
/**
* Remove the given ID weak library reference from the given local ID and the runtime mapping.
*
@ -353,18 +347,18 @@ void BKE_main_library_weak_reference_update_item(struct GHash *library_weak_refe
* \param library_id_name: the full ID name, including the leading two chars encoding the ID type.
* \param old_id: Existing local ID matching given weak reference.
*/
void BKE_main_library_weak_reference_remove_item(struct GHash *library_weak_reference_mapping,
void BKE_main_library_weak_reference_remove_item(GHash *library_weak_reference_mapping,
const char *library_filepath,
const char *library_id_name,
struct ID *old_id) ATTR_NONNULL();
ID *old_id) ATTR_NONNULL();
/* *** Generic utils to loop over whole Main database. *** */
#define FOREACH_MAIN_LISTBASE_ID_BEGIN(_lb, _id) \
{ \
ID *_id_next = (ID *)(_lb)->first; \
for ((_id) = _id_next; (_id) != NULL; (_id) = _id_next) { \
_id_next = (ID *)(_id)->next;
ID *_id_next = static_cast<ID *>((_lb)->first); \
for ((_id) = _id_next; (_id) != nullptr; (_id) = _id_next) { \
_id_next = static_cast<ID *>((_id)->next);
#define FOREACH_MAIN_LISTBASE_ID_END \
} \
@ -411,7 +405,7 @@ void BKE_main_library_weak_reference_remove_item(struct GHash *library_weak_refe
* \param img: ImBuf image to generate thumbnail data from.
* \return The generated .blend file raw thumbnail data.
*/
struct BlendThumbnail *BKE_main_thumbnail_from_imbuf(struct Main *bmain, struct ImBuf *img);
BlendThumbnail *BKE_main_thumbnail_from_imbuf(Main *bmain, ImBuf *img);
/**
* Generates an image from raw .blend file thumbnail \a data.
*
@ -419,16 +413,16 @@ struct BlendThumbnail *BKE_main_thumbnail_from_imbuf(struct Main *bmain, struct
* \param data: Raw .blend file thumbnail data.
* \return An ImBuf from given data, or NULL if invalid.
*/
struct ImBuf *BKE_main_thumbnail_to_imbuf(struct Main *bmain, struct BlendThumbnail *data);
ImBuf *BKE_main_thumbnail_to_imbuf(Main *bmain, BlendThumbnail *data);
/**
* Generates an empty (black) thumbnail for given Main.
*/
void BKE_main_thumbnail_create(struct Main *bmain);
void BKE_main_thumbnail_create(Main *bmain);
/**
* Return file-path of given \a main.
*/
const char *BKE_main_blendfile_path(const struct Main *bmain) ATTR_NONNULL();
const char *BKE_main_blendfile_path(const Main *bmain) ATTR_NONNULL();
/**
* Return file-path of global main #G_MAIN.
*
@ -440,7 +434,7 @@ const char *BKE_main_blendfile_path_from_global(void);
/**
* \return A pointer to the \a ListBase of given \a bmain for requested \a type ID type.
*/
struct ListBase *which_libbase(struct Main *bmain, short type);
ListBase *which_libbase(Main *bmain, short type);
//#define INDEX_ID_MAX 41
/**
@ -453,9 +447,9 @@ struct ListBase *which_libbase(struct Main *bmain, short type);
* \param lb: Array of lists #INDEX_ID_MAX in length.
*
* \note The order of each ID type #ListBase in the array is determined by the `INDEX_ID_<IDTYPE>`
* enum definitions in `DNA_ID.h`. See also the #FOREACH_MAIN_ID_BEGIN macro in `BKE_main.h`
* enum definitions in `DNA_ID.h`. See also the #FOREACH_MAIN_ID_BEGIN macro in `BKE_main.hh`
*/
int set_listbasepointers(struct Main *main, struct ListBase *lb[]);
int set_listbasepointers(Main *main, ListBase *lb[]);
#define MAIN_VERSION_FILE_ATLEAST(main, ver, subver) \
((main)->versionfile > (ver) || \
@ -483,7 +477,3 @@ int set_listbasepointers(struct Main *main, struct ListBase *lb[]);
/** Protect against buffer overflow vulnerability & negative sizes. */
#define BLEN_THUMB_MEMSIZE_IS_VALID(_x, _y) \
(((_x) > 0 && (_y) > 0) && ((uint64_t)(_x) * (uint64_t)(_y) < (SIZE_MAX / (sizeof(int) * 4))))
#ifdef __cplusplus
}
#endif

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

@ -422,7 +422,7 @@ set(SRC
BKE_light_linking.h
BKE_lightprobe.h
BKE_linestyle.h
BKE_main.h
BKE_main.hh
BKE_main_idmap.hh
BKE_main_namemap.hh
BKE_mask.h

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

@ -47,7 +47,7 @@
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_object.hh"
#include "BKE_object_types.hh"
#include "BKE_preview_image.hh"

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

@ -19,7 +19,7 @@
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_nla.h"
#include "BKE_node.h"
#include "BKE_report.h"

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

@ -43,7 +43,7 @@
#include "BKE_global.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_material.h"
#include "BKE_nla.h"
#include "BKE_node.h"

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

@ -45,7 +45,7 @@
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_object.hh"
#include "BKE_object_types.hh"
#include "BKE_scene.h"

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

@ -7,7 +7,7 @@
#include "BKE_bake_geometry_nodes_modifier.hh"
#include "BKE_collection.h"
#include "BKE_curves.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "DNA_modifier_types.h"
#include "DNA_node_types.h"

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

@ -33,7 +33,7 @@
#include "BKE_idprop.h"
#include "BKE_image.h"
#include "BKE_layer.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_node.h"
#include "BKE_report.h"
#include "BKE_scene.h"

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

@ -31,7 +31,7 @@
#include "BKE_global.h"
#include "BKE_layer.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_scene.h"
#include "DEG_depsgraph.hh"

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

@ -35,7 +35,7 @@
#include "BKE_blendfile.h"
#include "BKE_context.hh"
#include "BKE_global.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_undo_system.h"
#include "BLO_readfile.h"

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

@ -47,7 +47,7 @@
#include "BKE_lib_override.hh"
#include "BKE_lib_query.h"
#include "BKE_lib_remap.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_main_idmap.hh"
#include "BKE_main_namemap.hh"
#include "BKE_preferences.h"

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

@ -42,7 +42,7 @@
#include "BKE_lib_override.hh"
#include "BKE_lib_query.h"
#include "BKE_lib_remap.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_main_namemap.hh"
#include "BKE_material.h"
#include "BKE_object.hh"

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

@ -60,7 +60,7 @@
#include "BKE_image.h"
#include "BKE_lib_id.h"
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_node.h"
#include "BKE_report.h"
#include "BKE_vfont.hh"

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

@ -8,7 +8,7 @@
#include "BKE_bpath.h"
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "MEM_guardedalloc.h"

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

@ -30,7 +30,7 @@
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_lib_remap.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_material.h"
#include "BKE_paint.hh"
#include "BKE_preview_image.hh"

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

@ -29,7 +29,7 @@
#include "BKE_cachefile.h"
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_modifier.hh"
#include "BKE_scene.h"

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

@ -36,7 +36,7 @@
#include "BKE_layer.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_object.hh"
#include "BKE_scene.h"
#include "BKE_screen.hh"

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

@ -28,7 +28,7 @@
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_lib_remap.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_object.hh"
#include "BKE_preview_image.hh"
#include "BKE_rigidbody.h"

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

@ -34,7 +34,7 @@
#include "BKE_context.hh"
#include "BKE_layer.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_scene.h"
#include "BKE_screen.hh"
#include "BKE_sound.h"

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

@ -9,7 +9,7 @@
#include "BKE_cryptomatte.h"
#include "BKE_cryptomatte.hh"
#include "BKE_image.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "DNA_layer_types.h"
#include "DNA_material_types.h"

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

@ -48,7 +48,7 @@
#include "BKE_key.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_object.hh"
#include "BKE_object_types.hh"
#include "BKE_vfont.hh"

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

@ -36,7 +36,7 @@
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_lib_remap.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_modifier.hh"
#include "BKE_object.hh"
#include "BKE_object_types.hh"

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

@ -46,7 +46,7 @@
#include "BKE_customdata.hh"
#include "BKE_customdata_file.h"
#include "BKE_deform.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_mesh_mapping.hh"
#include "BKE_mesh_remap.hh"
#include "BKE_multires.hh"

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

@ -51,7 +51,7 @@
#include "BKE_image.h"
#include "BKE_image_format.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_material.h"
#include "BKE_mesh.hh"
#include "BKE_mesh_mapping.hh"

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

@ -34,7 +34,7 @@
#include "BKE_gpencil_curve_legacy.h"
#include "BKE_gpencil_geom_legacy.h"
#include "BKE_gpencil_legacy.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_material.h"
#include "BKE_object.hh"

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

@ -46,7 +46,7 @@
#include "BKE_gpencil_curve_legacy.h"
#include "BKE_gpencil_geom_legacy.h"
#include "BKE_gpencil_legacy.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_material.h"
#include "BKE_mesh.hh"
#include "BKE_object.hh"

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

@ -47,7 +47,7 @@
#include "BKE_image.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_material.h"
#include "BKE_paint.hh"

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

@ -10,7 +10,7 @@
#include "BKE_grease_pencil.hh"
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
using namespace blender::bke::greasepencil;

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

@ -22,7 +22,7 @@
#include "DNA_node_types.h"
#include "DNA_scene_types.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_node.h"
#include "BKE_idtype.h"

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

@ -70,7 +70,7 @@
#include "BKE_image.h"
#include "BKE_image_format.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_node.hh"
#include "BKE_node_runtime.hh"
#include "BKE_node_tree_update.hh"

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

@ -24,7 +24,7 @@
#include "BKE_global.h"
#include "BKE_image.h"
#include "BKE_image_partial_update.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "GPU_capabilities.h"
#include "GPU_state.h"

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

@ -10,7 +10,7 @@
#include "BKE_idtype.h"
#include "BKE_image.h"
#include "BKE_image_partial_update.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "IMB_imbuf.h"
#include "IMB_moviecache.h"

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

@ -31,7 +31,7 @@
#include "BKE_image.h"
#include "BKE_image_format.h"
#include "BKE_image_save.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_report.h"
#include "BKE_scene.h"

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

@ -53,7 +53,7 @@
#include "BKE_key.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_nla.h"
#include "CLG_log.h"

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

@ -43,7 +43,7 @@
#include "BKE_lattice.hh"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_mesh.hh"
#include "BKE_scene.h"

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

@ -40,7 +40,7 @@
#include "BKE_lattice.hh"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_modifier.hh"
#include "BKE_object.hh"
#include "BKE_object_types.hh"

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

@ -27,7 +27,7 @@
#include "BKE_idprop.h"
#include "BKE_layer.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_node.hh"
#include "BKE_object.hh"
#include "BKE_object_types.hh"

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

@ -54,7 +54,7 @@
#include "BKE_lib_override.hh"
#include "BKE_lib_query.h"
#include "BKE_lib_remap.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_main_namemap.hh"
#include "BKE_node.h"
#include "BKE_rigidbody.h"

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

@ -31,7 +31,7 @@
#include "BKE_lib_id.h"
#include "BKE_lib_override.hh"
#include "BKE_lib_remap.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_main_namemap.hh"
#include "lib_intern.hh"

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

@ -10,7 +10,7 @@
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_main_namemap.hh"
#include "DNA_ID.h"

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

@ -38,7 +38,7 @@
#include "BKE_lib_override.hh"
#include "BKE_lib_query.h"
#include "BKE_lib_remap.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_main_namemap.hh"
#include "BKE_node.hh"
#include "BKE_report.h"

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

@ -26,7 +26,7 @@
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_lib_override.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BLO_readfile.h"

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

@ -20,7 +20,7 @@
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_node.h"
/* status */

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

@ -24,7 +24,7 @@
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_lib_remap.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_material.h"
#include "BKE_mball.h"
#include "BKE_modifier.hh"

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

@ -20,7 +20,7 @@
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_lib_remap.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_mesh.hh"
#include "BKE_node.hh"
#include "BKE_object.hh"

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

@ -26,7 +26,7 @@
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_main_namemap.hh"
#include "BKE_packedFile.h"

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

@ -31,7 +31,7 @@
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_light.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_node.h"
#include "BKE_preview_image.hh"

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

@ -22,7 +22,7 @@
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_lightprobe.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BLT_translation.h"

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

@ -33,7 +33,7 @@
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_linestyle.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_node.hh"
#include "BKE_node_tree_update.hh"
#include "BKE_texture.h"

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

@ -23,7 +23,7 @@
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_main_idmap.hh"
#include "BKE_main_namemap.hh"

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

@ -16,7 +16,7 @@
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_main_idmap.hh" /* own include */
/** \file

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

@ -8,7 +8,7 @@
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_main_namemap.hh"
#include "BLI_assert.h"

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

@ -36,7 +36,7 @@
#include "BKE_image.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_mask.h"
#include "BKE_movieclip.h"
#include "BKE_tracking.h"

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

@ -59,7 +59,7 @@
#include "BKE_image.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_material.h"
#include "BKE_mesh.hh"
#include "BKE_node.hh"

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

@ -37,7 +37,7 @@
#include "BLT_translation.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_anim_data.h"
#include "BKE_curve.hh"

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

@ -52,7 +52,7 @@
#include "BKE_key.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_material.h"
#include "BKE_mesh.hh"
#include "BKE_mesh_legacy_convert.hh"

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

@ -38,7 +38,7 @@
#include "BKE_key.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_material.h"
#include "BKE_mball.h"
#include "BKE_mesh.hh"

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

@ -35,7 +35,7 @@
#include "BKE_customdata.hh"
#include "BKE_global.h"
#include "BKE_idprop.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_mesh.hh"
#include "BKE_mesh_legacy_convert.hh"
#include "BKE_modifier.hh"

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

@ -64,7 +64,7 @@
#include "BKE_screen.hh"
/* may move these, only for BKE_modifier_path_relbase */
#include "BKE_main.h"
#include "BKE_main.hh"
/* end */
#include "DEG_depsgraph.hh"

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

@ -52,7 +52,7 @@
#include "BKE_image.h" /* openanim */
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_movieclip.h"
#include "BKE_node.h"
#include "BKE_node_tree_update.hh"

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

@ -35,7 +35,7 @@
#include "BKE_global.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_nla.h"
#include "BKE_sound.h"

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

@ -63,7 +63,7 @@
#include "BKE_image_format.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_node.hh"
#include "BKE_node_runtime.hh"
#include "BKE_node_tree_anonymous_attributes.hh"

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

@ -19,7 +19,7 @@
#include "BKE_anim_data.h"
#include "BKE_image.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_node.hh"
#include "BKE_node_runtime.hh"
#include "BKE_node_tree_anonymous_attributes.hh"

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

@ -106,7 +106,7 @@
#include "BKE_light.h"
#include "BKE_lightprobe.h"
#include "BKE_linestyle.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_material.h"
#include "BKE_mball.h"
#include "BKE_mesh.hh"

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

@ -49,7 +49,7 @@
#include "BKE_idprop.h"
#include "BKE_instances.hh"
#include "BKE_lattice.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_mesh.hh"
#include "BKE_mesh_iterators.hh"
#include "BKE_mesh_runtime.hh"

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

@ -30,7 +30,7 @@
#include "BKE_image.h"
#include "BKE_image_format.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_packedFile.h"
#include "BKE_report.h"
#include "BKE_sound.h"

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

@ -51,7 +51,7 @@
#include "BKE_key.h"
#include "BKE_layer.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_material.h"
#include "BKE_mesh.hh"
#include "BKE_mesh_mapping.hh"

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

@ -18,7 +18,7 @@
#include "BKE_brush.hh"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_paint.hh"
/* -------------------------------------------------------------------- */

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

@ -61,7 +61,7 @@
#include "BKE_layer.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_material.h"
#include "BKE_mesh.hh"
#include "BKE_mesh_legacy_convert.hh"

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

@ -52,7 +52,7 @@
#include "BKE_fluid.h"
#include "BKE_global.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_modifier.hh"
#include "BKE_object.hh"
#include "BKE_particle.h"

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

@ -32,7 +32,7 @@
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_lib_remap.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_mesh_wrapper.hh"
#include "BKE_modifier.hh"
#include "BKE_object.hh"

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

@ -40,7 +40,7 @@
#include "BKE_effect.h"
#include "BKE_global.h"
#include "BKE_layer.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_mesh.hh"
#include "BKE_mesh_runtime.hh"
#include "BKE_object.hh"

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

@ -76,7 +76,7 @@
#include "BKE_lib_query.h"
#include "BKE_lib_remap.hh"
#include "BKE_linestyle.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_mask.h"
#include "BKE_node.hh"
#include "BKE_node_runtime.hh"

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

@ -45,7 +45,7 @@
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_packedFile.h"
#include "BKE_scene.h"
#include "BKE_sound.h"

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

@ -19,7 +19,7 @@
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_speaker.h"
#include "BLO_read_write.hh"

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

@ -37,7 +37,7 @@
#include "BKE_bpath.h"
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_node.h"
#include "BKE_text.h"

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

@ -38,7 +38,7 @@
#include "IMB_imbuf.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_anim_data.h"
#include "BKE_colorband.h"

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

@ -26,7 +26,7 @@
#include "BKE_context.hh"
#include "BKE_global.h"
#include "BKE_lib_override.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_undo_system.h"
#include "RNA_access.hh"

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

@ -41,7 +41,7 @@
#include "BKE_global.h"
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_object_types.hh"
#include "BKE_packedFile.h"
#include "BKE_vfont.hh"

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

@ -37,7 +37,7 @@
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_lib_remap.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_modifier.hh"
#include "BKE_object.hh"
#include "BKE_object_types.hh"

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

@ -23,7 +23,7 @@
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_object.hh"
#include "BKE_scene.h"
#include "BKE_viewer_path.hh"

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

@ -28,7 +28,7 @@
#include "BKE_idtype.h"
#include "BKE_lib_id.h"
#include "BKE_lib_query.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_node.h"
#include "BKE_preview_image.hh"
#include "BKE_world.h"

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

@ -20,7 +20,7 @@
#ifdef WITH_AVI
# include "BLI_blenlib.h"
# include "BKE_main.h"
# include "BKE_main.hh"
#endif
#include "BKE_writeavi.h"

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

@ -33,7 +33,7 @@
# include "BKE_idprop.h"
# include "BKE_image.h"
# include "BKE_lib_id.h"
# include "BKE_main.h"
# include "BKE_main.hh"
# include "BKE_report.h"
# include "BKE_sound.h"
# include "BKE_writeffmpeg.hh"

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

@ -28,7 +28,7 @@
#include "BKE_lib_id.h"
#include "BKE_lib_remap.hh"
#include "BKE_library.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_report.h"
#include "BLO_blend_validate.hh"

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

@ -27,7 +27,7 @@
#include "BKE_asset.hh"
#include "BKE_idtype.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_preview_image.hh"
#include "BLO_blend_defs.hh"

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

@ -74,7 +74,7 @@
#include "BKE_lib_override.hh"
#include "BKE_lib_query.h"
#include "BKE_lib_remap.hh"
#include "BKE_main.h" /* for Main */
#include "BKE_main.hh" /* for Main */
#include "BKE_main_idmap.hh"
#include "BKE_main_namemap.hh"
#include "BKE_material.h"

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

@ -11,7 +11,7 @@
#include "BLI_string.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_report.h"
#include "DNA_ID.h"

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

@ -31,7 +31,7 @@
#include "BLO_undofile.hh"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_undo_system.h"
/* keep last */

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

@ -57,7 +57,7 @@
#include "BKE_colortools.h"
#include "BKE_global.h" /* for G */
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_mesh.hh"
#include "BKE_modifier.hh"
#include "BKE_multires.hh"

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

@ -53,7 +53,7 @@
#include "BKE_anim_visualization.h"
#include "BKE_image.h"
#include "BKE_main.h" /* for Main */
#include "BKE_main.hh" /* for Main */
#include "BKE_mesh.hh" /* for ME_ defines (patching) */
#include "BKE_mesh_legacy_convert.hh"
#include "BKE_modifier.hh"

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

@ -52,7 +52,7 @@
#include "BKE_animsys.h"
#include "BKE_colortools.h"
#include "BKE_fcurve_driver.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_mask.h"
#include "BKE_modifier.hh"
#include "BKE_node.h"

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

@ -79,7 +79,7 @@
#include "BKE_key.h"
#include "BKE_layer.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_mesh.hh"
#include "BKE_mesh_legacy_convert.hh"
#include "BKE_node.h"

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

@ -55,7 +55,7 @@
#include "BKE_fcurve.h"
#include "BKE_gpencil_legacy.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_mesh.hh"
#include "BKE_mesh_legacy_convert.hh"
#include "BKE_multires.hh"

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

@ -71,7 +71,7 @@
#include "BKE_image.h"
#include "BKE_lib_id.h"
#include "BKE_lib_override.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_main_namemap.hh"
#include "BKE_mesh.hh"
#include "BKE_modifier.hh"

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

@ -53,7 +53,7 @@
#include "BKE_effect.h"
#include "BKE_grease_pencil.hh"
#include "BKE_idprop.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_material.h"
#include "BKE_mesh_legacy_convert.hh"
#include "BKE_node.hh"

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

@ -23,7 +23,7 @@
#include "BKE_ipo.h"
#include "BKE_lib_id.h"
#include "BKE_lib_override.hh"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_main_namemap.hh"
#include "BKE_mesh_legacy_convert.hh"
#include "BKE_node.hh"

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

@ -52,7 +52,7 @@
#include "BKE_idprop.h"
#include "BKE_layer.h"
#include "BKE_lib_id.h"
#include "BKE_main.h"
#include "BKE_main.hh"
#include "BKE_main_namemap.hh"
#include "BKE_material.h"
#include "BKE_mesh.hh"

Some files were not shown because too many files have changed in this diff Show More