From af5731ce03a213247078af784c766ba257689d85 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sat, 20 Jan 2024 19:17:36 +0100 Subject: [PATCH] Cleanup: Move `BKE_idtype.h` to Cpp header `BKE_idtype.hh` --- .../animrig/intern/bone_collections_test.cc | 2 +- source/blender/animrig/intern/keyframing.cc | 2 +- .../{BKE_idtype.h => BKE_idtype.hh} | 65 +++++++------------ source/blender/blenkernel/CMakeLists.txt | 2 +- source/blender/blenkernel/intern/action.cc | 2 +- source/blender/blenkernel/intern/anim_data.cc | 2 +- source/blender/blenkernel/intern/armature.cc | 2 +- source/blender/blenkernel/intern/blendfile.cc | 2 +- .../intern/blendfile_link_append.cc | 2 +- source/blender/blenkernel/intern/bpath.cc | 2 +- .../blender/blenkernel/intern/bpath_test.cc | 2 +- source/blender/blenkernel/intern/brush.cc | 2 +- source/blender/blenkernel/intern/cachefile.cc | 2 +- source/blender/blenkernel/intern/camera.cc | 2 +- .../blender/blenkernel/intern/collection.cc | 2 +- source/blender/blenkernel/intern/curve.cc | 2 +- source/blender/blenkernel/intern/curves.cc | 2 +- .../blenkernel/intern/gpencil_legacy.cc | 2 +- .../blenkernel/intern/grease_pencil.cc | 2 +- .../blenkernel/intern/grease_pencil_test.cc | 2 +- .../blender/blenkernel/intern/idprop_utils.cc | 2 +- source/blender/blenkernel/intern/idtype.cc | 2 +- source/blender/blenkernel/intern/image.cc | 2 +- .../intern/image_partial_update_test.cc | 2 +- source/blender/blenkernel/intern/ipo.cc | 2 +- source/blender/blenkernel/intern/key.cc | 2 +- source/blender/blenkernel/intern/lattice.cc | 2 +- .../blenkernel/intern/lattice_deform_test.cc | 2 +- .../blender/blenkernel/intern/layer_test.cc | 2 +- source/blender/blenkernel/intern/lib_id.cc | 2 +- .../blenkernel/intern/lib_id_delete.cc | 2 +- .../blenkernel/intern/lib_id_remapper.cc | 2 +- .../blender/blenkernel/intern/lib_id_test.cc | 2 +- .../blender/blenkernel/intern/lib_override.cc | 2 +- .../intern/lib_override_proxy_conversion.cc | 2 +- source/blender/blenkernel/intern/lib_query.cc | 2 +- .../blenkernel/intern/lib_remap_test.cc | 2 +- source/blender/blenkernel/intern/library.cc | 2 +- source/blender/blenkernel/intern/light.cc | 2 +- .../blender/blenkernel/intern/lightprobe.cc | 2 +- source/blender/blenkernel/intern/linestyle.cc | 2 +- source/blender/blenkernel/intern/main.cc | 2 +- .../blender/blenkernel/intern/main_idmap.cc | 2 +- .../blender/blenkernel/intern/main_namemap.cc | 2 +- source/blender/blenkernel/intern/main_test.cc | 2 +- source/blender/blenkernel/intern/mask.cc | 2 +- source/blender/blenkernel/intern/material.cc | 2 +- source/blender/blenkernel/intern/mball.cc | 2 +- source/blender/blenkernel/intern/mesh.cc | 2 +- source/blender/blenkernel/intern/modifier.cc | 2 +- source/blender/blenkernel/intern/movieclip.cc | 2 +- source/blender/blenkernel/intern/node.cc | 2 +- source/blender/blenkernel/intern/object.cc | 2 +- source/blender/blenkernel/intern/paint.cc | 2 +- source/blender/blenkernel/intern/particle.cc | 2 +- .../blender/blenkernel/intern/pointcloud.cc | 2 +- source/blender/blenkernel/intern/scene.cc | 2 +- source/blender/blenkernel/intern/screen.cc | 2 +- source/blender/blenkernel/intern/sound.cc | 2 +- source/blender/blenkernel/intern/speaker.cc | 2 +- source/blender/blenkernel/intern/text.cc | 2 +- source/blender/blenkernel/intern/texture.cc | 2 +- source/blender/blenkernel/intern/vfont.cc | 2 +- source/blender/blenkernel/intern/volume.cc | 2 +- .../blender/blenkernel/intern/volume_test.cc | 2 +- source/blender/blenkernel/intern/workspace.cc | 2 +- source/blender/blenkernel/intern/world.cc | 2 +- .../blenloader/intern/readblenentry.cc | 2 +- source/blender/blenloader/intern/readfile.cc | 2 +- source/blender/blenloader/intern/writefile.cc | 2 +- .../tests/blendfile_loading_base_test.cc | 2 +- .../intern/builder/deg_builder_nodes.cc | 2 +- .../intern/builder/deg_builder_stack.cc | 2 +- source/blender/depsgraph/intern/depsgraph.cc | 2 +- .../depsgraph/intern/depsgraph_query.cc | 2 +- .../blender/depsgraph/intern/depsgraph_tag.cc | 2 +- .../blender/editors/animation/keyframing.cc | 2 +- .../editors/asset/intern/asset_filter.cc | 2 +- .../editors/asset/intern/asset_mark_clear.cc | 2 +- .../eyedroppers/eyedropper_datablock.cc | 2 +- .../editors/interface/interface_ops.cc | 2 +- .../editors/interface/interface_templates.cc | 2 +- .../editors/object/object_relations.cc | 2 +- .../editors/object/object_transform.cc | 2 +- source/blender/editors/space_file/filelist.cc | 2 +- source/blender/editors/space_file/filesel.cc | 2 +- .../blender/editors/space_node/node_draw.cc | 2 +- .../space_outliner/outliner_collections.cc | 2 +- .../editors/space_outliner/outliner_draw.cc | 2 +- .../editors/space_outliner/outliner_edit.cc | 2 +- .../editors/space_outliner/outliner_tools.cc | 2 +- .../editors/space_outliner/tree/common.cc | 2 +- source/blender/imbuf/intern/thumbs_blend.cc | 2 +- source/blender/makesrna/intern/rna_ID.cc | 2 +- source/blender/makesrna/intern/rna_access.cc | 2 +- .../intern/rna_access_compare_override.cc | 2 +- .../blender/makesrna/intern/rna_main_api.cc | 2 +- source/blender/makesrna/intern/rna_path.cc | 2 +- source/blender/makesrna/intern/rna_scene.cc | 2 +- source/blender/python/intern/bpy_driver.cc | 2 +- .../blender/python/intern/bpy_library_load.cc | 2 +- source/blender/python/intern/bpy_rna.cc | 2 +- source/blender/python/intern/bpy_rna_anim.cc | 2 +- source/blender/windowmanager/intern/wm.cc | 2 +- .../windowmanager/intern/wm_dragdrop.cc | 2 +- .../windowmanager/intern/wm_files_link.cc | 2 +- .../windowmanager/intern/wm_operators.cc | 2 +- source/creator/creator.cc | 2 +- 108 files changed, 131 insertions(+), 148 deletions(-) rename source/blender/blenkernel/{BKE_idtype.h => BKE_idtype.hh} (83%) diff --git a/source/blender/animrig/intern/bone_collections_test.cc b/source/blender/animrig/intern/bone_collections_test.cc index dbc22497dbc..8cb5ed2dd91 100644 --- a/source/blender/animrig/intern/bone_collections_test.cc +++ b/source/blender/animrig/intern/bone_collections_test.cc @@ -6,7 +6,7 @@ #include "BLT_translation.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "ANIM_bone_collections.hh" diff --git a/source/blender/animrig/intern/keyframing.cc b/source/blender/animrig/intern/keyframing.cc index f621a48f12e..ca6b2eb0801 100644 --- a/source/blender/animrig/intern/keyframing.cc +++ b/source/blender/animrig/intern/keyframing.cc @@ -21,7 +21,7 @@ #include "BKE_anim_data.h" #include "BKE_animsys.h" #include "BKE_fcurve.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_nla.h" #include "BKE_report.h" diff --git a/source/blender/blenkernel/BKE_idtype.h b/source/blender/blenkernel/BKE_idtype.hh similarity index 83% rename from source/blender/blenkernel/BKE_idtype.h rename to source/blender/blenkernel/BKE_idtype.hh index 74266f540ea..12e841126cf 100644 --- a/source/blender/blenkernel/BKE_idtype.h +++ b/source/blender/blenkernel/BKE_idtype.hh @@ -12,10 +12,7 @@ #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - +struct AssetTypeInfo; struct BPathForeachPathData; struct BlendDataReader; struct BlendLibReader; @@ -50,65 +47,55 @@ enum { IDTYPE_FLAGS_NO_MEMFILE_UNDO = 1 << 5, }; -typedef struct IDCacheKey { +struct IDCacheKey { /* The session UUID of the ID owning the cached data. */ unsigned int id_session_uuid; /* Value uniquely identifying the cache within its ID. * Typically the offset of its member in the data-block struct, but can be anything. */ size_t identifier; -} IDCacheKey; +}; uint BKE_idtype_cache_key_hash(const void *key_v); bool BKE_idtype_cache_key_cmp(const void *key_a_v, const void *key_b_v); /* ********** Prototypes for #IDTypeInfo callbacks. ********** */ -typedef void (*IDTypeInitDataFunction)(struct ID *id); +typedef void (*IDTypeInitDataFunction)(ID *id); /** \param flag: Copying options (see BKE_lib_id.hh's LIB_ID_COPY_... flags for more). */ -typedef void (*IDTypeCopyDataFunction)(struct Main *bmain, - struct ID *id_dst, - const struct ID *id_src, - int flag); +typedef void (*IDTypeCopyDataFunction)(Main *bmain, ID *id_dst, const ID *id_src, int flag); -typedef void (*IDTypeFreeDataFunction)(struct ID *id); +typedef void (*IDTypeFreeDataFunction)(ID *id); /** \param flags: See BKE_lib_id.hh's LIB_ID_MAKELOCAL_... flags. */ -typedef void (*IDTypeMakeLocalFunction)(struct Main *bmain, struct ID *id, int flags); +typedef void (*IDTypeMakeLocalFunction)(Main *bmain, ID *id, int flags); -typedef void (*IDTypeForeachIDFunction)(struct ID *id, struct LibraryForeachIDData *data); +typedef void (*IDTypeForeachIDFunction)(ID *id, LibraryForeachIDData *data); typedef enum eIDTypeInfoCacheCallbackFlags { /** Indicates to the callback that cache may be stored in the .blend file, * so its pointer should not be cleared at read-time. */ IDTYPE_CACHE_CB_FLAGS_PERSISTENT = 1 << 0, } eIDTypeInfoCacheCallbackFlags; -typedef void (*IDTypeForeachCacheFunctionCallback)(struct ID *id, - const struct IDCacheKey *cache_key, - void **cache_p, - uint flags, - void *user_data); -typedef void (*IDTypeForeachCacheFunction)(struct ID *id, +typedef void (*IDTypeForeachCacheFunctionCallback)( + ID *id, const IDCacheKey *cache_key, void **cache_p, uint flags, void *user_data); +typedef void (*IDTypeForeachCacheFunction)(ID *id, IDTypeForeachCacheFunctionCallback function_callback, void *user_data); -typedef void (*IDTypeForeachPathFunction)(struct ID *id, struct BPathForeachPathData *bpath_data); +typedef void (*IDTypeForeachPathFunction)(ID *id, BPathForeachPathData *bpath_data); -typedef struct ID **(*IDTypeEmbeddedOwnerPointerGetFunction)(struct ID *id); +typedef ID **(*IDTypeEmbeddedOwnerPointerGetFunction)(ID *id); -typedef void (*IDTypeBlendWriteFunction)(struct BlendWriter *writer, - struct ID *id, - const void *id_address); -typedef void (*IDTypeBlendReadDataFunction)(struct BlendDataReader *reader, struct ID *id); -typedef void (*IDTypeBlendReadAfterLiblinkFunction)(struct BlendLibReader *reader, struct ID *id); +typedef void (*IDTypeBlendWriteFunction)(BlendWriter *writer, ID *id, const void *id_address); +typedef void (*IDTypeBlendReadDataFunction)(BlendDataReader *reader, ID *id); +typedef void (*IDTypeBlendReadAfterLiblinkFunction)(BlendLibReader *reader, ID *id); -typedef void (*IDTypeBlendReadUndoPreserve)(struct BlendLibReader *reader, - struct ID *id_new, - struct ID *id_old); +typedef void (*IDTypeBlendReadUndoPreserve)(BlendLibReader *reader, ID *id_new, ID *id_old); -typedef void (*IDTypeLibOverrideApplyPost)(struct ID *id_dst, struct ID *id_src); +typedef void (*IDTypeLibOverrideApplyPost)(ID *id_dst, ID *id_src); -typedef struct IDTypeInfo { +struct IDTypeInfo { /* ********** General IDType data. ********** */ /** @@ -145,7 +132,7 @@ typedef struct IDTypeInfo { /** * Information and callbacks for assets, based on the type of asset. */ - struct AssetTypeInfo *asset_type_info; + AssetTypeInfo *asset_type_info; /* ********** ID management callbacks ********** */ @@ -229,7 +216,7 @@ typedef struct IDTypeInfo { * \note Currently needed for some update operation on point caches. */ IDTypeLibOverrideApplyPost lib_override_apply_post; -} IDTypeInfo; +}; /* ********** Declaration of each IDTypeInfo. ********** */ @@ -284,8 +271,8 @@ extern IDTypeInfo IDType_ID_LINK_PLACEHOLDER; void BKE_idtype_init(void); /* General helpers. */ -const struct IDTypeInfo *BKE_idtype_get_info_from_idcode(short id_code); -const struct IDTypeInfo *BKE_idtype_get_info_from_id(const struct ID *id); +const IDTypeInfo *BKE_idtype_get_info_from_idcode(short id_code); +const IDTypeInfo *BKE_idtype_get_info_from_id(const ID *id); /** * Convert an \a idcode into a name. @@ -382,10 +369,6 @@ short BKE_idtype_idcode_iter_step(int *index); /** * Wrapper around #IDTypeInfo foreach_cache that also handles embedded IDs. */ -void BKE_idtype_id_foreach_cache(struct ID *id, +void BKE_idtype_id_foreach_cache(ID *id, IDTypeForeachCacheFunctionCallback function_callback, void *user_data); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index e6aa4d9c1c6..20fae0b2eca 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -405,7 +405,7 @@ set(SRC BKE_icons.h BKE_idprop.h BKE_idprop.hh - BKE_idtype.h + BKE_idtype.hh BKE_image.h BKE_image_format.h BKE_image_partial_update.hh diff --git a/source/blender/blenkernel/intern/action.cc b/source/blender/blenkernel/intern/action.cc index 4dd0b65d625..8098d4d260e 100644 --- a/source/blender/blenkernel/intern/action.cc +++ b/source/blender/blenkernel/intern/action.cc @@ -44,7 +44,7 @@ #include "BKE_deform.h" #include "BKE_fcurve.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/anim_data.cc b/source/blender/blenkernel/intern/anim_data.cc index 413eb1e60b5..0e7e9badcde 100644 --- a/source/blender/blenkernel/intern/anim_data.cc +++ b/source/blender/blenkernel/intern/anim_data.cc @@ -16,7 +16,7 @@ #include "BKE_fcurve.h" #include "BKE_fcurve_driver.h" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/armature.cc b/source/blender/blenkernel/intern/armature.cc index 0ef77960d72..2c1498a231a 100644 --- a/source/blender/blenkernel/intern/armature.cc +++ b/source/blender/blenkernel/intern/armature.cc @@ -43,7 +43,7 @@ #include "BKE_constraint.h" #include "BKE_curve.hh" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/blendfile.cc b/source/blender/blenkernel/intern/blendfile.cc index 9baf126951a..4013210000c 100644 --- a/source/blender/blenkernel/intern/blendfile.cc +++ b/source/blender/blenkernel/intern/blendfile.cc @@ -38,7 +38,7 @@ #include "BKE_colorband.hh" #include "BKE_context.hh" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_ipo.h" #include "BKE_keyconfig.h" #include "BKE_layer.h" diff --git a/source/blender/blenkernel/intern/blendfile_link_append.cc b/source/blender/blenkernel/intern/blendfile_link_append.cc index a12ee6fa89d..8f7056bbc3a 100644 --- a/source/blender/blenkernel/intern/blendfile_link_append.cc +++ b/source/blender/blenkernel/intern/blendfile_link_append.cc @@ -35,7 +35,7 @@ #include "BLT_translation.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_lib_id.hh" diff --git a/source/blender/blenkernel/intern/bpath.cc b/source/blender/blenkernel/intern/bpath.cc index cae8bdab103..4d94ac261e4 100644 --- a/source/blender/blenkernel/intern/bpath.cc +++ b/source/blender/blenkernel/intern/bpath.cc @@ -56,7 +56,7 @@ #include "DEG_depsgraph.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_image.h" #include "BKE_lib_id.hh" #include "BKE_library.hh" diff --git a/source/blender/blenkernel/intern/bpath_test.cc b/source/blender/blenkernel/intern/bpath_test.cc index 70242d8cda5..e2012d692a1 100644 --- a/source/blender/blenkernel/intern/bpath_test.cc +++ b/source/blender/blenkernel/intern/bpath_test.cc @@ -6,7 +6,7 @@ #include "CLG_log.h" #include "BKE_bpath.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/brush.cc b/source/blender/blenkernel/intern/brush.cc index e9ed7b56807..423498cc2c3 100644 --- a/source/blender/blenkernel/intern/brush.cc +++ b/source/blender/blenkernel/intern/brush.cc @@ -26,7 +26,7 @@ #include "BKE_colortools.hh" #include "BKE_context.hh" #include "BKE_gpencil_legacy.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_lib_remap.hh" diff --git a/source/blender/blenkernel/intern/cachefile.cc b/source/blender/blenkernel/intern/cachefile.cc index 2d0cdd11328..d43831e93b8 100644 --- a/source/blender/blenkernel/intern/cachefile.cc +++ b/source/blender/blenkernel/intern/cachefile.cc @@ -27,7 +27,7 @@ #include "BKE_anim_data.h" #include "BKE_bpath.h" #include "BKE_cachefile.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_modifier.hh" diff --git a/source/blender/blenkernel/intern/camera.cc b/source/blender/blenkernel/intern/camera.cc index 67c032f8fff..b279cd51c64 100644 --- a/source/blender/blenkernel/intern/camera.cc +++ b/source/blender/blenkernel/intern/camera.cc @@ -32,7 +32,7 @@ #include "BKE_anim_data.h" #include "BKE_camera.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_layer.h" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/collection.cc b/source/blender/blenkernel/intern/collection.cc index c27ed832d7b..83854b06fac 100644 --- a/source/blender/blenkernel/intern/collection.cc +++ b/source/blender/blenkernel/intern/collection.cc @@ -23,7 +23,7 @@ #include "BKE_anim_data.h" #include "BKE_collection.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_layer.h" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/curve.cc b/source/blender/blenkernel/intern/curve.cc index 14f5cf2804a..2016aea8afa 100644 --- a/source/blender/blenkernel/intern/curve.cc +++ b/source/blender/blenkernel/intern/curve.cc @@ -44,7 +44,7 @@ #include "BKE_curve.hh" #include "BKE_curveprofile.h" #include "BKE_displist.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_key.h" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/curves.cc b/source/blender/blenkernel/intern/curves.cc index a1b6f3742bd..8e0a03b2330 100644 --- a/source/blender/blenkernel/intern/curves.cc +++ b/source/blender/blenkernel/intern/curves.cc @@ -32,7 +32,7 @@ #include "BKE_geometry_fields.hh" #include "BKE_geometry_set.hh" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_lib_remap.hh" diff --git a/source/blender/blenkernel/intern/gpencil_legacy.cc b/source/blender/blenkernel/intern/gpencil_legacy.cc index 49685b4e964..511b791d021 100644 --- a/source/blender/blenkernel/intern/gpencil_legacy.cc +++ b/source/blender/blenkernel/intern/gpencil_legacy.cc @@ -43,7 +43,7 @@ #include "BKE_gpencil_legacy.h" #include "BKE_gpencil_update_cache_legacy.h" #include "BKE_icons.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_image.h" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/grease_pencil.cc b/source/blender/blenkernel/intern/grease_pencil.cc index dafc688be19..6d08b2ef9e5 100644 --- a/source/blender/blenkernel/intern/grease_pencil.cc +++ b/source/blender/blenkernel/intern/grease_pencil.cc @@ -14,7 +14,7 @@ #include "BKE_geometry_set.hh" #include "BKE_grease_pencil.h" #include "BKE_grease_pencil.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_material.h" diff --git a/source/blender/blenkernel/intern/grease_pencil_test.cc b/source/blender/blenkernel/intern/grease_pencil_test.cc index 548b77b3b90..461defdea32 100644 --- a/source/blender/blenkernel/intern/grease_pencil_test.cc +++ b/source/blender/blenkernel/intern/grease_pencil_test.cc @@ -9,7 +9,7 @@ #include "BKE_curves.hh" #include "BKE_customdata.hh" #include "BKE_grease_pencil.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/idprop_utils.cc b/source/blender/blenkernel/intern/idprop_utils.cc index 712294f82ff..05a37e46570 100644 --- a/source/blender/blenkernel/intern/idprop_utils.cc +++ b/source/blender/blenkernel/intern/idprop_utils.cc @@ -17,7 +17,7 @@ #include "DNA_ID.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/idtype.cc b/source/blender/blenkernel/intern/idtype.cc index abdb9c1449f..40618cb8e9c 100644 --- a/source/blender/blenkernel/intern/idtype.cc +++ b/source/blender/blenkernel/intern/idtype.cc @@ -25,7 +25,7 @@ #include "BKE_main.hh" #include "BKE_node.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" // static CLG_LogRef LOG = {"bke.idtype"}; diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc index dfb9a170d2e..e8aa73d04ae 100644 --- a/source/blender/blenkernel/intern/image.cc +++ b/source/blender/blenkernel/intern/image.cc @@ -66,7 +66,7 @@ #include "BKE_colortools.hh" #include "BKE_global.h" #include "BKE_icons.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_image.h" #include "BKE_image_format.h" #include "BKE_lib_id.hh" diff --git a/source/blender/blenkernel/intern/image_partial_update_test.cc b/source/blender/blenkernel/intern/image_partial_update_test.cc index 883cf68182e..8ebc9a2811e 100644 --- a/source/blender/blenkernel/intern/image_partial_update_test.cc +++ b/source/blender/blenkernel/intern/image_partial_update_test.cc @@ -7,7 +7,7 @@ #include "BKE_appdir.h" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_image.h" #include "BKE_image_partial_update.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/ipo.cc b/source/blender/blenkernel/intern/ipo.cc index 2aecc75a82d..7f936a648ea 100644 --- a/source/blender/blenkernel/intern/ipo.cc +++ b/source/blender/blenkernel/intern/ipo.cc @@ -48,7 +48,7 @@ #include "BKE_fcurve.h" #include "BKE_fcurve_driver.h" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_ipo.h" #include "BKE_key.h" #include "BKE_lib_id.hh" diff --git a/source/blender/blenkernel/intern/key.cc b/source/blender/blenkernel/intern/key.cc index ca637a99eee..f97c0f21cf1 100644 --- a/source/blender/blenkernel/intern/key.cc +++ b/source/blender/blenkernel/intern/key.cc @@ -39,7 +39,7 @@ #include "BKE_customdata.hh" #include "BKE_deform.h" #include "BKE_editmesh.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_key.h" #include "BKE_lattice.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/blenkernel/intern/lattice.cc b/source/blender/blenkernel/intern/lattice.cc index 3c3a134fb77..155419f0714 100644 --- a/source/blender/blenkernel/intern/lattice.cc +++ b/source/blender/blenkernel/intern/lattice.cc @@ -36,7 +36,7 @@ #include "BKE_curve.hh" #include "BKE_deform.h" #include "BKE_displist.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lattice.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/lattice_deform_test.cc b/source/blender/blenkernel/intern/lattice_deform_test.cc index 93e7b23770b..90eee096b11 100644 --- a/source/blender/blenkernel/intern/lattice_deform_test.cc +++ b/source/blender/blenkernel/intern/lattice_deform_test.cc @@ -3,7 +3,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "testing/testing.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lattice.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/layer_test.cc b/source/blender/blenkernel/intern/layer_test.cc index 04b7a47ec47..d73f7e455e3 100644 --- a/source/blender/blenkernel/intern/layer_test.cc +++ b/source/blender/blenkernel/intern/layer_test.cc @@ -6,7 +6,7 @@ #include "MEM_guardedalloc.h" #include "BKE_appdir.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_layer.h" #include "BLI_string.h" diff --git a/source/blender/blenkernel/intern/lib_id.cc b/source/blender/blenkernel/intern/lib_id.cc index 4fcf6847471..ffdd5f83771 100644 --- a/source/blender/blenkernel/intern/lib_id.cc +++ b/source/blender/blenkernel/intern/lib_id.cc @@ -48,7 +48,7 @@ #include "BKE_global.h" #include "BKE_gpencil_legacy.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_key.h" #include "BKE_lib_id.hh" #include "BKE_lib_override.hh" diff --git a/source/blender/blenkernel/intern/lib_id_delete.cc b/source/blender/blenkernel/intern/lib_id_delete.cc index 1f38dcbd68e..81ce1c0434a 100644 --- a/source/blender/blenkernel/intern/lib_id_delete.cc +++ b/source/blender/blenkernel/intern/lib_id_delete.cc @@ -25,7 +25,7 @@ #include "BKE_anim_data.h" #include "BKE_asset.hh" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_lib_id.hh" diff --git a/source/blender/blenkernel/intern/lib_id_remapper.cc b/source/blender/blenkernel/intern/lib_id_remapper.cc index 9a6eb4f8e1f..0a8135fd7c3 100644 --- a/source/blender/blenkernel/intern/lib_id_remapper.cc +++ b/source/blender/blenkernel/intern/lib_id_remapper.cc @@ -4,7 +4,7 @@ #include "DNA_ID.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_remap.hh" diff --git a/source/blender/blenkernel/intern/lib_id_test.cc b/source/blender/blenkernel/intern/lib_id_test.cc index 534cabdbf22..bc8ae334eff 100644 --- a/source/blender/blenkernel/intern/lib_id_test.cc +++ b/source/blender/blenkernel/intern/lib_id_test.cc @@ -8,7 +8,7 @@ #include "BLI_listbase.h" #include "BLI_string.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_main_namemap.hh" diff --git a/source/blender/blenkernel/intern/lib_override.cc b/source/blender/blenkernel/intern/lib_override.cc index baf538cb231..366d21cf19e 100644 --- a/source/blender/blenkernel/intern/lib_override.cc +++ b/source/blender/blenkernel/intern/lib_override.cc @@ -31,7 +31,7 @@ #include "BKE_collection.h" #include "BKE_fcurve.h" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_key.h" #include "BKE_layer.h" #include "BKE_lib_id.hh" diff --git a/source/blender/blenkernel/intern/lib_override_proxy_conversion.cc b/source/blender/blenkernel/intern/lib_override_proxy_conversion.cc index 23dedd8f871..133aeeebabc 100644 --- a/source/blender/blenkernel/intern/lib_override_proxy_conversion.cc +++ b/source/blender/blenkernel/intern/lib_override_proxy_conversion.cc @@ -23,7 +23,7 @@ #include "DEG_depsgraph.hh" #include "BKE_collection.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_override.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/lib_query.cc b/source/blender/blenkernel/intern/lib_query.cc index f47055b720e..789566c9a63 100644 --- a/source/blender/blenkernel/intern/lib_query.cc +++ b/source/blender/blenkernel/intern/lib_query.cc @@ -17,7 +17,7 @@ #include "BKE_anim_data.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/lib_remap_test.cc b/source/blender/blenkernel/intern/lib_remap_test.cc index 45a1b25f868..503777302be 100644 --- a/source/blender/blenkernel/intern/lib_remap_test.cc +++ b/source/blender/blenkernel/intern/lib_remap_test.cc @@ -17,7 +17,7 @@ #include "BKE_appdir.h" #include "BKE_context.hh" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_remap.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/library.cc b/source/blender/blenkernel/intern/library.cc index e6b667735fa..5b5970fa102 100644 --- a/source/blender/blenkernel/intern/library.cc +++ b/source/blender/blenkernel/intern/library.cc @@ -22,7 +22,7 @@ #include "BLT_translation.h" #include "BKE_bpath.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_library.hh" diff --git a/source/blender/blenkernel/intern/light.cc b/source/blender/blenkernel/intern/light.cc index f41cf884c7e..e09eceb2dbf 100644 --- a/source/blender/blenkernel/intern/light.cc +++ b/source/blender/blenkernel/intern/light.cc @@ -26,7 +26,7 @@ #include "BKE_anim_data.h" #include "BKE_icons.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_light.h" diff --git a/source/blender/blenkernel/intern/lightprobe.cc b/source/blender/blenkernel/intern/lightprobe.cc index 00aed40025c..a91dea3537a 100644 --- a/source/blender/blenkernel/intern/lightprobe.cc +++ b/source/blender/blenkernel/intern/lightprobe.cc @@ -18,7 +18,7 @@ #include "BLI_utildefines.h" #include "BKE_anim_data.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_lightprobe.h" diff --git a/source/blender/blenkernel/intern/linestyle.cc b/source/blender/blenkernel/intern/linestyle.cc index 9f5a06ccfd2..36481b438e5 100644 --- a/source/blender/blenkernel/intern/linestyle.cc +++ b/source/blender/blenkernel/intern/linestyle.cc @@ -29,7 +29,7 @@ #include "BKE_colortools.hh" #include "BKE_context.hh" #include "BKE_freestyle.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_linestyle.h" diff --git a/source/blender/blenkernel/intern/main.cc b/source/blender/blenkernel/intern/main.cc index 9984bcfcbf7..fb4a7574885 100644 --- a/source/blender/blenkernel/intern/main.cc +++ b/source/blender/blenkernel/intern/main.cc @@ -26,7 +26,7 @@ #include "BKE_bpath.h" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_lib_remap.hh" diff --git a/source/blender/blenkernel/intern/main_idmap.cc b/source/blender/blenkernel/intern/main_idmap.cc index 356d5b1486c..fe76f4c0597 100644 --- a/source/blender/blenkernel/intern/main_idmap.cc +++ b/source/blender/blenkernel/intern/main_idmap.cc @@ -14,7 +14,7 @@ #include "DNA_ID.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_main_idmap.hh" /* own include */ diff --git a/source/blender/blenkernel/intern/main_namemap.cc b/source/blender/blenkernel/intern/main_namemap.cc index 88eb339b846..63e7645952e 100644 --- a/source/blender/blenkernel/intern/main_namemap.cc +++ b/source/blender/blenkernel/intern/main_namemap.cc @@ -6,7 +6,7 @@ * \ingroup bke */ -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_main_namemap.hh" diff --git a/source/blender/blenkernel/intern/main_test.cc b/source/blender/blenkernel/intern/main_test.cc index 2a8e7955056..9c83a46e85f 100644 --- a/source/blender/blenkernel/intern/main_test.cc +++ b/source/blender/blenkernel/intern/main_test.cc @@ -12,7 +12,7 @@ #include "BLI_string.h" #include "BKE_collection.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_library.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/mask.cc b/source/blender/blenkernel/intern/mask.cc index b183e6b1ead..f5929cdf087 100644 --- a/source/blender/blenkernel/intern/mask.cc +++ b/source/blender/blenkernel/intern/mask.cc @@ -30,7 +30,7 @@ #include "BKE_animsys.h" #include "BKE_curve.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_anim_data.h" #include "BKE_image.h" diff --git a/source/blender/blenkernel/intern/material.cc b/source/blender/blenkernel/intern/material.cc index cea94d1fa2c..3ecefead6d6 100644 --- a/source/blender/blenkernel/intern/material.cc +++ b/source/blender/blenkernel/intern/material.cc @@ -53,7 +53,7 @@ #include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil.hh" #include "BKE_icons.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_image.h" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/mball.cc b/source/blender/blenkernel/intern/mball.cc index 26a09c350e7..6a5daeb3fc4 100644 --- a/source/blender/blenkernel/intern/mball.cc +++ b/source/blender/blenkernel/intern/mball.cc @@ -43,7 +43,7 @@ #include "BKE_curve.hh" #include "BKE_displist.h" #include "BKE_geometry_set.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lattice.hh" #include "BKE_layer.h" #include "BKE_lib_id.hh" diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc index 64767e56207..86546bdffc3 100644 --- a/source/blender/blenkernel/intern/mesh.cc +++ b/source/blender/blenkernel/intern/mesh.cc @@ -49,7 +49,7 @@ #include "BKE_editmesh.hh" #include "BKE_editmesh_cache.hh" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_key.h" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/modifier.cc b/source/blender/blenkernel/intern/modifier.cc index c047052af4d..73a386e7397 100644 --- a/source/blender/blenkernel/intern/modifier.cc +++ b/source/blender/blenkernel/intern/modifier.cc @@ -52,7 +52,7 @@ #include "BKE_fluid.h" #include "BKE_global.h" #include "BKE_gpencil_modifier_legacy.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_key.h" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/movieclip.cc b/source/blender/blenkernel/intern/movieclip.cc index 308a222fdaf..92702409758 100644 --- a/source/blender/blenkernel/intern/movieclip.cc +++ b/source/blender/blenkernel/intern/movieclip.cc @@ -48,7 +48,7 @@ #include "BKE_bpath.h" #include "BKE_colortools.hh" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_image.h" /* openanim */ #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 65f250a0e36..fab16d71d72 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -61,7 +61,7 @@ #include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_idprop.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_image_format.h" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index 5dd1dc46d45..48d9177780e 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -95,7 +95,7 @@ #include "BKE_gpencil_modifier_legacy.h" #include "BKE_grease_pencil.hh" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_image.h" #include "BKE_key.h" #include "BKE_lattice.hh" diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc index ef9dbd7fafe..cc5daf1565f 100644 --- a/source/blender/blenkernel/intern/paint.cc +++ b/source/blender/blenkernel/intern/paint.cc @@ -45,7 +45,7 @@ #include "BKE_crazyspace.hh" #include "BKE_deform.h" #include "BKE_gpencil_legacy.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_image.h" #include "BKE_key.h" #include "BKE_layer.h" diff --git a/source/blender/blenkernel/intern/particle.cc b/source/blender/blenkernel/intern/particle.cc index 75a35c23b2b..95dd3800627 100644 --- a/source/blender/blenkernel/intern/particle.cc +++ b/source/blender/blenkernel/intern/particle.cc @@ -56,7 +56,7 @@ #include "BKE_deform.h" #include "BKE_displist.h" #include "BKE_effect.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_key.h" #include "BKE_lattice.hh" #include "BKE_layer.h" diff --git a/source/blender/blenkernel/intern/pointcloud.cc b/source/blender/blenkernel/intern/pointcloud.cc index 2ad8ab8948d..bf5ef45bc11 100644 --- a/source/blender/blenkernel/intern/pointcloud.cc +++ b/source/blender/blenkernel/intern/pointcloud.cc @@ -28,7 +28,7 @@ #include "BKE_customdata.hh" #include "BKE_geometry_set.hh" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_lib_remap.hh" diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index c4717541e2f..82034cc2c98 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -69,7 +69,7 @@ #include "BKE_freestyle.h" #include "BKE_gpencil_legacy.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_image.h" #include "BKE_image_format.h" #include "BKE_layer.h" diff --git a/source/blender/blenkernel/intern/screen.cc b/source/blender/blenkernel/intern/screen.cc index ede21bb85f1..115b76196c8 100644 --- a/source/blender/blenkernel/intern/screen.cc +++ b/source/blender/blenkernel/intern/screen.cc @@ -43,7 +43,7 @@ #include "BKE_gpencil_legacy.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_node.h" diff --git a/source/blender/blenkernel/intern/sound.cc b/source/blender/blenkernel/intern/sound.cc index b1e2de7b079..82c2a0075f4 100644 --- a/source/blender/blenkernel/intern/sound.cc +++ b/source/blender/blenkernel/intern/sound.cc @@ -42,7 +42,7 @@ #include "BKE_bpath.h" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/speaker.cc b/source/blender/blenkernel/intern/speaker.cc index 9e2450665af..8c78b7b249f 100644 --- a/source/blender/blenkernel/intern/speaker.cc +++ b/source/blender/blenkernel/intern/speaker.cc @@ -16,7 +16,7 @@ #include "BLT_translation.h" #include "BKE_anim_data.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/text.cc b/source/blender/blenkernel/intern/text.cc index 428986e6f23..7d9f64af2ae 100644 --- a/source/blender/blenkernel/intern/text.cc +++ b/source/blender/blenkernel/intern/text.cc @@ -35,7 +35,7 @@ #include "DNA_userdef_types.h" #include "BKE_bpath.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_node.h" diff --git a/source/blender/blenkernel/intern/texture.cc b/source/blender/blenkernel/intern/texture.cc index 89e601ecc4c..b463a0504a1 100644 --- a/source/blender/blenkernel/intern/texture.cc +++ b/source/blender/blenkernel/intern/texture.cc @@ -44,7 +44,7 @@ #include "BKE_colorband.hh" #include "BKE_colortools.hh" #include "BKE_icons.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_image.h" #include "BKE_key.h" #include "BKE_lib_id.hh" diff --git a/source/blender/blenkernel/intern/vfont.cc b/source/blender/blenkernel/intern/vfont.cc index 97507fa2457..3ec770ca0ff 100644 --- a/source/blender/blenkernel/intern/vfont.cc +++ b/source/blender/blenkernel/intern/vfont.cc @@ -39,7 +39,7 @@ #include "BKE_bpath.h" #include "BKE_curve.hh" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_object_types.hh" diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index f3714a080b4..58c1b5ea486 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -33,7 +33,7 @@ #include "BKE_bpath.h" #include "BKE_geometry_set.hh" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_lib_remap.hh" diff --git a/source/blender/blenkernel/intern/volume_test.cc b/source/blender/blenkernel/intern/volume_test.cc index 371a1b19d3e..09ec8fdb1dd 100644 --- a/source/blender/blenkernel/intern/volume_test.cc +++ b/source/blender/blenkernel/intern/volume_test.cc @@ -10,7 +10,7 @@ # include "DNA_volume_types.h" -# include "BKE_idtype.h" +# include "BKE_idtype.hh" # include "BKE_lib_id.hh" # include "BKE_main.hh" # include "BKE_volume.hh" diff --git a/source/blender/blenkernel/intern/workspace.cc b/source/blender/blenkernel/intern/workspace.cc index c75c42020bb..099120cdf16 100644 --- a/source/blender/blenkernel/intern/workspace.cc +++ b/source/blender/blenkernel/intern/workspace.cc @@ -20,7 +20,7 @@ #include "BKE_asset.hh" #include "BKE_global.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/world.cc b/source/blender/blenkernel/intern/world.cc index 73bb5e46444..ed403bc1997 100644 --- a/source/blender/blenkernel/intern/world.cc +++ b/source/blender/blenkernel/intern/world.cc @@ -25,7 +25,7 @@ #include "BKE_anim_data.h" #include "BKE_icons.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" diff --git a/source/blender/blenloader/intern/readblenentry.cc b/source/blender/blenloader/intern/readblenentry.cc index 5ad15e68a2b..2a92e86fc16 100644 --- a/source/blender/blenloader/intern/readblenentry.cc +++ b/source/blender/blenloader/intern/readblenentry.cc @@ -26,7 +26,7 @@ #include "DNA_sdna_types.h" #include "BKE_asset.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_main.hh" #include "BKE_preview_image.hh" diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index cf0db07b92b..acb9f9f2a25 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -67,7 +67,7 @@ #include "BKE_collection.h" #include "BKE_global.h" /* for G */ #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_layer.h" #include "BKE_lib_id.hh" #include "BKE_lib_override.hh" diff --git a/source/blender/blenloader/intern/writefile.cc b/source/blender/blenloader/intern/writefile.cc index 68af908d88d..504c9aa760d 100644 --- a/source/blender/blenloader/intern/writefile.cc +++ b/source/blender/blenloader/intern/writefile.cc @@ -103,7 +103,7 @@ #include "BKE_bpath.h" #include "BKE_global.h" /* For #Global `G`. */ #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_layer.h" #include "BKE_lib_id.hh" #include "BKE_lib_override.hh" diff --git a/source/blender/blenloader/tests/blendfile_loading_base_test.cc b/source/blender/blenloader/tests/blendfile_loading_base_test.cc index 8d6e8833278..9299fda6e28 100644 --- a/source/blender/blenloader/tests/blendfile_loading_base_test.cc +++ b/source/blender/blenloader/tests/blendfile_loading_base_test.cc @@ -10,7 +10,7 @@ #include "BKE_callbacks.h" #include "BKE_context.hh" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_image.h" #include "BKE_layer.h" #include "BKE_main.hh" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index afd4ac7262d..7f4820e6a7f 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -67,7 +67,7 @@ #include "BKE_gpencil_modifier_legacy.h" #include "BKE_grease_pencil.hh" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_image.h" #include "BKE_key.h" #include "BKE_lattice.hh" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_stack.cc b/source/blender/depsgraph/intern/builder/deg_builder_stack.cc index c50659e7ce0..0eeed87d488 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_stack.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_stack.cc @@ -12,7 +12,7 @@ #include #include -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "DNA_ID.h" #include "DNA_action_types.h" diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index cfda9fdafb6..88db9136951 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -20,7 +20,7 @@ #include "BLI_utildefines.h" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_scene.h" #include "DEG_depsgraph.hh" diff --git a/source/blender/depsgraph/intern/depsgraph_query.cc b/source/blender/depsgraph/intern/depsgraph_query.cc index ff23d80be9e..44efdcbd2ab 100644 --- a/source/blender/depsgraph/intern/depsgraph_query.cc +++ b/source/blender/depsgraph/intern/depsgraph_query.cc @@ -17,7 +17,7 @@ #include "BKE_action.h" /* XXX: BKE_pose_channel_find_name */ #include "BKE_customdata.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_main.hh" #include "DNA_object_types.h" diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index 0ad57216a4d..6624f21f16f 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -30,7 +30,7 @@ #include "BKE_anim_data.h" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_override.hh" #include "BKE_node.hh" #include "BKE_scene.h" diff --git a/source/blender/editors/animation/keyframing.cc b/source/blender/editors/animation/keyframing.cc index e03d80a375d..25ec616abb0 100644 --- a/source/blender/editors/animation/keyframing.cc +++ b/source/blender/editors/animation/keyframing.cc @@ -32,7 +32,7 @@ #include "BKE_context.hh" #include "BKE_fcurve.h" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_nla.h" #include "BKE_report.h" diff --git a/source/blender/editors/asset/intern/asset_filter.cc b/source/blender/editors/asset/intern/asset_filter.cc index 74f5970ff58..7dfa27212b2 100644 --- a/source/blender/editors/asset/intern/asset_filter.cc +++ b/source/blender/editors/asset/intern/asset_filter.cc @@ -9,7 +9,7 @@ #include "AS_asset_representation.hh" #include "BKE_asset.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BLI_listbase.h" diff --git a/source/blender/editors/asset/intern/asset_mark_clear.cc b/source/blender/editors/asset/intern/asset_mark_clear.cc index fae67f42b68..a7ed95445bb 100644 --- a/source/blender/editors/asset/intern/asset_mark_clear.cc +++ b/source/blender/editors/asset/intern/asset_mark_clear.cc @@ -13,7 +13,7 @@ #include "BKE_asset.hh" #include "BKE_context.hh" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_preview_image.hh" diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc b/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc index ab0dc3b672d..ae79f25fd4e 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc @@ -23,7 +23,7 @@ #include "BLT_translation.h" #include "BKE_context.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_report.h" #include "BKE_screen.hh" diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc index 891582d0356..a0fe01ff8fd 100644 --- a/source/blender/editors/interface/interface_ops.cc +++ b/source/blender/editors/interface/interface_ops.cc @@ -27,7 +27,7 @@ #include "BKE_context.hh" #include "BKE_global.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_layer.h" #include "BKE_lib_id.hh" #include "BKE_lib_override.hh" diff --git a/source/blender/editors/interface/interface_templates.cc b/source/blender/editors/interface/interface_templates.cc index bdc904e4b5e..9a4504736ba 100644 --- a/source/blender/editors/interface/interface_templates.cc +++ b/source/blender/editors/interface/interface_templates.cc @@ -57,7 +57,7 @@ #include "BKE_global.h" #include "BKE_gpencil_modifier_legacy.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_layer.h" #include "BKE_lib_id.hh" #include "BKE_lib_override.hh" diff --git a/source/blender/editors/object/object_relations.cc b/source/blender/editors/object/object_relations.cc index 3dd47500a66..fab99fd2969 100644 --- a/source/blender/editors/object/object_relations.cc +++ b/source/blender/editors/object/object_relations.cc @@ -58,7 +58,7 @@ #include "BKE_fcurve.h" #include "BKE_gpencil_legacy.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lattice.hh" #include "BKE_layer.h" #include "BKE_lib_id.hh" diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc index 9568ba272c9..9b9cc349fcd 100644 --- a/source/blender/editors/object/object_transform.cc +++ b/source/blender/editors/object/object_transform.cc @@ -40,7 +40,7 @@ #include "BKE_editmesh.hh" #include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lattice.hh" #include "BKE_layer.h" #include "BKE_lib_id.hh" diff --git a/source/blender/editors/space_file/filelist.cc b/source/blender/editors/space_file/filelist.cc index ef081504236..1966956482a 100644 --- a/source/blender/editors/space_file/filelist.cc +++ b/source/blender/editors/space_file/filelist.cc @@ -54,7 +54,7 @@ #include "BKE_context.hh" #include "BKE_global.h" #include "BKE_icons.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_main_idmap.hh" diff --git a/source/blender/editors/space_file/filesel.cc b/source/blender/editors/space_file/filesel.cc index a87464c171c..9521e6f1b51 100644 --- a/source/blender/editors/space_file/filesel.cc +++ b/source/blender/editors/space_file/filesel.cc @@ -43,7 +43,7 @@ #include "BKE_appdir.h" #include "BKE_context.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_main.hh" #include "BKE_preferences.h" diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc index 79222925ef4..19bb4b8ff39 100644 --- a/source/blender/editors/space_node/node_draw.cc +++ b/source/blender/editors/space_node/node_draw.cc @@ -38,7 +38,7 @@ #include "BKE_context.hh" #include "BKE_curves.hh" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_node.hh" diff --git a/source/blender/editors/space_outliner/outliner_collections.cc b/source/blender/editors/space_outliner/outliner_collections.cc index 2ccb259752b..05aeff3298b 100644 --- a/source/blender/editors/space_outliner/outliner_collections.cc +++ b/source/blender/editors/space_outliner/outliner_collections.cc @@ -17,7 +17,7 @@ #include "BKE_collection.h" #include "BKE_context.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_layer.h" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc index 8d1942b8bb4..7a31fe76a41 100644 --- a/source/blender/editors/space_outliner/outliner_draw.cc +++ b/source/blender/editors/space_outliner/outliner_draw.cc @@ -32,7 +32,7 @@ #include "BKE_deform.h" #include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_layer.h" #include "BKE_lib_id.hh" #include "BKE_lib_override.hh" diff --git a/source/blender/editors/space_outliner/outliner_edit.cc b/source/blender/editors/space_outliner/outliner_edit.cc index d353f19eb41..6eee9e449ae 100644 --- a/source/blender/editors/space_outliner/outliner_edit.cc +++ b/source/blender/editors/space_outliner/outliner_edit.cc @@ -29,7 +29,7 @@ #include "BKE_armature.hh" #include "BKE_blender_copybuffer.h" #include "BKE_context.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_layer.h" #include "BKE_lib_id.hh" #include "BKE_lib_override.hh" diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc index 6be9c5b71b9..54f199cc007 100644 --- a/source/blender/editors/space_outliner/outliner_tools.cc +++ b/source/blender/editors/space_outliner/outliner_tools.cc @@ -46,7 +46,7 @@ #include "BKE_fcurve.h" #include "BKE_global.h" #include "BKE_grease_pencil.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_layer.h" #include "BKE_lib_id.hh" #include "BKE_lib_override.hh" diff --git a/source/blender/editors/space_outliner/tree/common.cc b/source/blender/editors/space_outliner/tree/common.cc index 1da04beb774..0edca57e330 100644 --- a/source/blender/editors/space_outliner/tree/common.cc +++ b/source/blender/editors/space_outliner/tree/common.cc @@ -10,7 +10,7 @@ #include "BLI_listbase.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "DNA_anim_types.h" #include "DNA_object_types.h" diff --git a/source/blender/imbuf/intern/thumbs_blend.cc b/source/blender/imbuf/intern/thumbs_blend.cc index 1603b24bf05..172a34bf840 100644 --- a/source/blender/imbuf/intern/thumbs_blend.cc +++ b/source/blender/imbuf/intern/thumbs_blend.cc @@ -17,7 +17,7 @@ #include "BLO_blend_defs.hh" #include "BLO_readfile.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_main.hh" #include "BKE_preview_image.hh" diff --git a/source/blender/makesrna/intern/rna_ID.cc b/source/blender/makesrna/intern/rna_ID.cc index c08c86b8370..a38c0452fd3 100644 --- a/source/blender/makesrna/intern/rna_ID.cc +++ b/source/blender/makesrna/intern/rna_ID.cc @@ -218,7 +218,7 @@ const IDFilterEnumPropertyItem rna_enum_id_type_filter_items[] = { # include "BKE_anim_data.h" # include "BKE_global.h" /* XXX, remove me */ # include "BKE_idprop.h" -# include "BKE_idtype.h" +# include "BKE_idtype.hh" # include "BKE_lib_override.hh" # include "BKE_lib_query.hh" # include "BKE_lib_remap.hh" diff --git a/source/blender/makesrna/intern/rna_access.cc b/source/blender/makesrna/intern/rna_access.cc index 5fd86f3a02b..112643da487 100644 --- a/source/blender/makesrna/intern/rna_access.cc +++ b/source/blender/makesrna/intern/rna_access.cc @@ -35,7 +35,7 @@ #include "BKE_fcurve.h" #include "BKE_global.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_override.hh" #include "BKE_main.hh" #include "BKE_node.hh" diff --git a/source/blender/makesrna/intern/rna_access_compare_override.cc b/source/blender/makesrna/intern/rna_access_compare_override.cc index 7e05873715f..d72e1ab1790 100644 --- a/source/blender/makesrna/intern/rna_access_compare_override.cc +++ b/source/blender/makesrna/intern/rna_access_compare_override.cc @@ -35,7 +35,7 @@ #include "BKE_armature.hh" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_override.hh" #include "BKE_main.hh" diff --git a/source/blender/makesrna/intern/rna_main_api.cc b/source/blender/makesrna/intern/rna_main_api.cc index 46ad7aad465..9fa4628529a 100644 --- a/source/blender/makesrna/intern/rna_main_api.cc +++ b/source/blender/makesrna/intern/rna_main_api.cc @@ -35,7 +35,7 @@ # include "BKE_displist.h" # include "BKE_gpencil_legacy.h" # include "BKE_icons.h" -# include "BKE_idtype.h" +# include "BKE_idtype.hh" # include "BKE_image.h" # include "BKE_lattice.hh" # include "BKE_lib_remap.hh" diff --git a/source/blender/makesrna/intern/rna_path.cc b/source/blender/makesrna/intern/rna_path.cc index d0c7d9617ec..4312210d19b 100644 --- a/source/blender/makesrna/intern/rna_path.cc +++ b/source/blender/makesrna/intern/rna_path.cc @@ -16,7 +16,7 @@ #include "BLI_utildefines.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "DNA_ID.h" /* For ID properties. */ diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc index 64592e89347..008ce861099 100644 --- a/source/blender/makesrna/intern/rna_scene.cc +++ b/source/blender/makesrna/intern/rna_scene.cc @@ -35,7 +35,7 @@ #include "BKE_armature.hh" #include "BKE_editmesh.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_paint.hh" #include "BKE_volume.hh" diff --git a/source/blender/python/intern/bpy_driver.cc b/source/blender/python/intern/bpy_driver.cc index 668a53f34dd..55fb2d54c81 100644 --- a/source/blender/python/intern/bpy_driver.cc +++ b/source/blender/python/intern/bpy_driver.cc @@ -21,7 +21,7 @@ #include "BKE_animsys.h" #include "BKE_fcurve_driver.h" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "RNA_access.hh" #include "RNA_prototypes.h" diff --git a/source/blender/python/intern/bpy_library_load.cc b/source/blender/python/intern/bpy_library_load.cc index 9acff4e9342..130b158839d 100644 --- a/source/blender/python/intern/bpy_library_load.cc +++ b/source/blender/python/intern/bpy_library_load.cc @@ -24,7 +24,7 @@ #include "BKE_blendfile_link_append.hh" #include "BKE_context.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_report.h" diff --git a/source/blender/python/intern/bpy_rna.cc b/source/blender/python/intern/bpy_rna.cc index 02a23e58e97..9077a275331 100644 --- a/source/blender/python/intern/bpy_rna.cc +++ b/source/blender/python/intern/bpy_rna.cc @@ -53,7 +53,7 @@ #include "BKE_context.hh" #include "BKE_global.h" /* evil G.* */ #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_main.hh" #include "BKE_report.h" diff --git a/source/blender/python/intern/bpy_rna_anim.cc b/source/blender/python/intern/bpy_rna_anim.cc index 0c283ed1112..a7d501e2d98 100644 --- a/source/blender/python/intern/bpy_rna_anim.cc +++ b/source/blender/python/intern/bpy_rna_anim.cc @@ -30,7 +30,7 @@ #include "BKE_context.hh" #include "BKE_fcurve.h" #include "BKE_global.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_report.h" diff --git a/source/blender/windowmanager/intern/wm.cc b/source/blender/windowmanager/intern/wm.cc index 1b8839f9493..6288be426b4 100644 --- a/source/blender/windowmanager/intern/wm.cc +++ b/source/blender/windowmanager/intern/wm.cc @@ -31,7 +31,7 @@ #include "BKE_context.hh" #include "BKE_global.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" diff --git a/source/blender/windowmanager/intern/wm_dragdrop.cc b/source/blender/windowmanager/intern/wm_dragdrop.cc index 937ce9d87df..e975498891d 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.cc +++ b/source/blender/windowmanager/intern/wm_dragdrop.cc @@ -30,7 +30,7 @@ #include "BKE_context.hh" #include "BKE_global.h" #include "BKE_idprop.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_screen.hh" diff --git a/source/blender/windowmanager/intern/wm_files_link.cc b/source/blender/windowmanager/intern/wm_files_link.cc index a0c0b79f46b..e6436554919 100644 --- a/source/blender/windowmanager/intern/wm_files_link.cc +++ b/source/blender/windowmanager/intern/wm_files_link.cc @@ -54,7 +54,7 @@ #include "BKE_rigidbody.h" #include "BKE_scene.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_build.hh" diff --git a/source/blender/windowmanager/intern/wm_operators.cc b/source/blender/windowmanager/intern/wm_operators.cc index 03a873761b5..3bfd88cdbcc 100644 --- a/source/blender/windowmanager/intern/wm_operators.cc +++ b/source/blender/windowmanager/intern/wm_operators.cc @@ -62,7 +62,7 @@ #include "BKE_screen.hh" /* BKE_ST_MAXNAME */ #include "BKE_unit.hh" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BLF_api.h" diff --git a/source/creator/creator.cc b/source/creator/creator.cc index e50abd45fd4..a6e43b4fd37 100644 --- a/source/creator/creator.cc +++ b/source/creator/creator.cc @@ -41,7 +41,7 @@ #include "BKE_cpp_types.hh" #include "BKE_global.h" #include "BKE_gpencil_modifier_legacy.h" -#include "BKE_idtype.h" +#include "BKE_idtype.hh" #include "BKE_material.h" #include "BKE_modifier.hh" #include "BKE_node.h"