diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 607456b3815..28d7d001b66 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -1114,8 +1114,8 @@ function(data_to_c_simple_icons ${_icon_files} datatoc_icon datatoc - # could be an arg but for now we only create icons depending on UI_icons.h - ${CMAKE_SOURCE_DIR}/source/blender/editors/include/UI_icons.h + # could be an arg but for now we only create icons depending on UI_icons.hh + ${CMAKE_SOURCE_DIR}/source/blender/editors/include/UI_icons.hh ) set_source_files_properties(${_file_from} ${_file_to} PROPERTIES GENERATED TRUE) diff --git a/scripts/startup/bl_ui/__init__.py b/scripts/startup/bl_ui/__init__.py index cdc7b03b6d2..5d153bdcc1b 100644 --- a/scripts/startup/bl_ui/__init__.py +++ b/scripts/startup/bl_ui/__init__.py @@ -174,7 +174,7 @@ def unregister(): unregister_class(cls) # Define a default UIList, when a list does not need any custom drawing... -# Keep in sync with its #defined name in UI_interface.h +# Keep in sync with its #defined name in UI_interface.hh class UI_UL_list(bpy.types.UIList): diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index 3714cb02bfb..62b5f8824d9 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -3565,6 +3565,7 @@ class VIEW3D_MT_mask(Menu): layout.template_node_operator_asset_menu_items(catalog_path=self.bl_label) + class VIEW3D_MT_face_sets(Menu): bl_label = "Face Sets" diff --git a/scripts/startup/keyingsets_builtins.py b/scripts/startup/keyingsets_builtins.py index c0df2d88e9c..8e03fc8a846 100644 --- a/scripts/startup/keyingsets_builtins.py +++ b/scripts/startup/keyingsets_builtins.py @@ -23,7 +23,7 @@ from bpy.types import KeyingSetInfo # "Defines" -# Keep these in sync with those in ED_keyframing.h! +# Keep these in sync with those in ED_keyframing.hh! ANIM_KS_LOCATION_ID = "Location" ANIM_KS_ROTATION_ID = "Rotation" ANIM_KS_SCALING_ID = "Scaling" diff --git a/source/blender/blenkernel/intern/context.cc b/source/blender/blenkernel/intern/context.cc index 58ceac0c808..fcf6d93af2d 100644 --- a/source/blender/blenkernel/intern/context.cc +++ b/source/blender/blenkernel/intern/context.cc @@ -1508,7 +1508,7 @@ AssetHandle CTX_wm_asset_handle(const bContext *C, bool *r_is_valid) /* If the asset handle was not found in context directly, try if there's an active file with * asset data there instead. Not nice to have this here, would be better to have this in - * `ED_asset.h`, but we can't include that in BKE. Even better would be not needing this at all + * `ED_asset.hh`, but we can't include that in BKE. Even better would be not needing this at all * and being able to have editors return this in the usual `context` callback. But that would * require returning a non-owning pointer, which we don't have in the Asset Browser (yet). */ FileDirEntry *file = diff --git a/source/blender/blenkernel/intern/fcurve_test.cc b/source/blender/blenkernel/intern/fcurve_test.cc index e9b8c7205e9..16c60bb69c2 100644 --- a/source/blender/blenkernel/intern/fcurve_test.cc +++ b/source/blender/blenkernel/intern/fcurve_test.cc @@ -7,7 +7,7 @@ #include "BKE_fcurve.h" -#include "ED_keyframing.h" +#include "ED_keyframing.hh" #include "DNA_anim_types.h" diff --git a/source/blender/blenkernel/intern/lib_remap_test.cc b/source/blender/blenkernel/intern/lib_remap_test.cc index 3a30f0ecb26..d836c6c9a1c 100644 --- a/source/blender/blenkernel/intern/lib_remap_test.cc +++ b/source/blender/blenkernel/intern/lib_remap_test.cc @@ -28,7 +28,7 @@ #include "IMB_imbuf.h" -#include "ED_node.h" +#include "ED_node.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/undo_system.cc b/source/blender/blenkernel/intern/undo_system.cc index 6d13b6535c0..2957f167be9 100644 --- a/source/blender/blenkernel/intern/undo_system.cc +++ b/source/blender/blenkernel/intern/undo_system.cc @@ -5,7 +5,7 @@ /** \file * \ingroup bke * - * Used by ED_undo.h, internal implementation. + * Used by ED_undo.hh, internal implementation. */ #include diff --git a/source/blender/blenlib/intern/string_search.cc b/source/blender/blenlib/intern/string_search.cc index 89e6ba58be6..b83d9bef505 100644 --- a/source/blender/blenlib/intern/string_search.cc +++ b/source/blender/blenlib/intern/string_search.cc @@ -13,7 +13,7 @@ #include "BLI_string_utf8_symbols.h" #include "BLI_timeit.hh" -/* Right arrow, keep in sync with #UI_MENU_ARROW_SEP in `UI_interface.h`. */ +/* Right arrow, keep in sync with #UI_MENU_ARROW_SEP in `UI_interface.hh`. */ #define UI_MENU_ARROW_SEP BLI_STR_UTF8_BLACK_RIGHT_POINTING_SMALL_TRIANGLE #define UI_MENU_ARROW_SEP_UNICODE 0x25b8 diff --git a/source/blender/blenlib/tests/BLI_string_search_test.cc b/source/blender/blenlib/tests/BLI_string_search_test.cc index dbde3e0b79e..99f959f6cab 100644 --- a/source/blender/blenlib/tests/BLI_string_search_test.cc +++ b/source/blender/blenlib/tests/BLI_string_search_test.cc @@ -10,7 +10,7 @@ namespace blender::string_search::tests { -/* Right arrow, keep in sync with #UI_MENU_ARROW_SEP in `UI_interface.h`. */ +/* Right arrow, keep in sync with #UI_MENU_ARROW_SEP in `UI_interface.hh`. */ #define UI_MENU_ARROW_SEP "\xe2\x96\xb8" TEST(string_search, damerau_levenshtein_distance) diff --git a/source/blender/datatoc/datatoc_icon_split.py b/source/blender/datatoc/datatoc_icon_split.py index f703ab44f6f..2022b153d39 100755 --- a/source/blender/datatoc/datatoc_icon_split.py +++ b/source/blender/datatoc/datatoc_icon_split.py @@ -117,7 +117,7 @@ def dice_icon_name( # Search for eg: DEF_ICON(BRUSH_NUDGE) --> BRUSH_NUDGE re_icon = re.compile(r'^\s*DEF_ICON.*\(\s*([A-Za-z0-9_]+)\s*\).*$') - ui_icons_h = os.path.join(SOURCE_DIR, "source", "blender", "editors", "include", "UI_icons.h") + ui_icons_h = os.path.join(SOURCE_DIR, "source", "blender", "editors", "include", "UI_icons.hh") with open(ui_icons_h, 'r', encoding="utf-8") as f: for l in f: match = re_icon.search(l) diff --git a/source/blender/draw/engines/compositor/compositor_engine.cc b/source/blender/draw/engines/compositor/compositor_engine.cc index fab286b08bf..0a16ed69c78 100644 --- a/source/blender/draw/engines/compositor/compositor_engine.cc +++ b/source/blender/draw/engines/compositor/compositor_engine.cc @@ -20,7 +20,7 @@ #include "DEG_depsgraph_query.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "DRW_render.h" diff --git a/source/blender/draw/engines/eevee/eevee_lookdev.cc b/source/blender/draw/engines/eevee/eevee_lookdev.cc index b063c856b0a..8cb261e7822 100644 --- a/source/blender/draw/engines/eevee/eevee_lookdev.cc +++ b/source/blender/draw/engines/eevee/eevee_lookdev.cc @@ -22,7 +22,7 @@ #include "GPU_material.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "eevee_lightcache.h" #include "eevee_private.h" diff --git a/source/blender/draw/engines/eevee_next/eevee_camera.cc b/source/blender/draw/engines/eevee_next/eevee_camera.cc index b056f915fb2..e7b1dc19475 100644 --- a/source/blender/draw/engines/eevee_next/eevee_camera.cc +++ b/source/blender/draw/engines/eevee_next/eevee_camera.cc @@ -15,7 +15,7 @@ #include "BKE_camera.h" #include "DEG_depsgraph_query.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "RE_pipeline.h" #include "render_types.h" diff --git a/source/blender/draw/engines/eevee_next/eevee_engine.cc b/source/blender/draw/engines/eevee_next/eevee_engine.cc index 1d6ba325cf6..21080b80c68 100644 --- a/source/blender/draw/engines/eevee_next/eevee_engine.cc +++ b/source/blender/draw/engines/eevee_next/eevee_engine.cc @@ -8,7 +8,7 @@ #include "GPU_capabilities.h" #include "GPU_framebuffer.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "DRW_render.h" diff --git a/source/blender/draw/engines/external/external_engine.cc b/source/blender/draw/engines/external/external_engine.cc index 1e358ff65e1..102640a0ec8 100644 --- a/source/blender/draw/engines/external/external_engine.cc +++ b/source/blender/draw/engines/external/external_engine.cc @@ -18,7 +18,7 @@ #include "BKE_object.h" #include "BKE_particle.h" -#include "ED_image.h" +#include "ED_image.hh" #include "ED_screen.hh" #include "GPU_batch.h" diff --git a/source/blender/draw/engines/gpencil/gpencil_cache_utils.cc b/source/blender/draw/engines/gpencil/gpencil_cache_utils.cc index d7ec67e23f4..082ffa02275 100644 --- a/source/blender/draw/engines/gpencil/gpencil_cache_utils.cc +++ b/source/blender/draw/engines/gpencil/gpencil_cache_utils.cc @@ -9,8 +9,8 @@ #include "DRW_engine.h" #include "DRW_render.h" -#include "ED_gpencil_legacy.h" -#include "ED_view3d.h" +#include "ED_gpencil_legacy.hh" +#include "ED_view3d.hh" #include "DNA_gpencil_legacy_types.h" #include "DNA_view3d_types.h" diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.cc b/source/blender/draw/engines/gpencil/gpencil_engine.cc index e23adcad8a3..b670fa45322 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine.cc +++ b/source/blender/draw/engines/gpencil/gpencil_engine.cc @@ -13,7 +13,7 @@ #include "DRW_engine.h" #include "DRW_render.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "GPU_capabilities.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/draw/engines/gpencil/gpencil_engine_c.cc b/source/blender/draw/engines/gpencil/gpencil_engine_c.cc index 1926ada14f8..5b745a36199 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine_c.cc +++ b/source/blender/draw/engines/gpencil/gpencil_engine_c.cc @@ -36,9 +36,9 @@ #include "DEG_depsgraph_query.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_resources.h" +#include "UI_resources.hh" /* *********** FUNCTIONS *********** */ diff --git a/source/blender/draw/engines/image/image_engine.cc b/source/blender/draw/engines/image/image_engine.cc index f38dc57b23b..f9557153529 100644 --- a/source/blender/draw/engines/image/image_engine.cc +++ b/source/blender/draw/engines/image/image_engine.cc @@ -23,7 +23,7 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "ED_image.h" +#include "ED_image.hh" #include "GPU_batch.h" diff --git a/source/blender/draw/engines/overlay/overlay_armature.cc b/source/blender/draw/engines/overlay/overlay_armature.cc index 419a110f775..b3ec2415a06 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.cc +++ b/source/blender/draw/engines/overlay/overlay_armature.cc @@ -32,12 +32,12 @@ #include "DEG_depsgraph_query.h" -#include "ED_armature.h" -#include "ED_view3d.h" +#include "ED_armature.hh" +#include "ED_view3d.hh" #include "ANIM_bone_collections.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "draw_common.h" #include "draw_manager_text.h" diff --git a/source/blender/draw/engines/overlay/overlay_background.cc b/source/blender/draw/engines/overlay/overlay_background.cc index 521fdffbefe..49daacb4307 100644 --- a/source/blender/draw/engines/overlay/overlay_background.cc +++ b/source/blender/draw/engines/overlay/overlay_background.cc @@ -8,7 +8,7 @@ #include "DRW_render.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "draw_manager_text.h" #include "overlay_private.hh" diff --git a/source/blender/draw/engines/overlay/overlay_edit_curves.cc b/source/blender/draw/engines/overlay/overlay_edit_curves.cc index a0845ce69af..7b10a048ee6 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_curves.cc +++ b/source/blender/draw/engines/overlay/overlay_edit_curves.cc @@ -10,7 +10,7 @@ #include "DRW_render.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "DEG_depsgraph_query.h" diff --git a/source/blender/draw/engines/overlay/overlay_edit_mesh.cc b/source/blender/draw/engines/overlay/overlay_edit_mesh.cc index d5887b2fc1c..b1561bba646 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_mesh.cc +++ b/source/blender/draw/engines/overlay/overlay_edit_mesh.cc @@ -8,7 +8,7 @@ #include "DRW_render.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "DNA_mesh_types.h" diff --git a/source/blender/draw/engines/overlay/overlay_edit_text.cc b/source/blender/draw/engines/overlay/overlay_edit_text.cc index 2230e8c8c46..344c6a919b9 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_text.cc +++ b/source/blender/draw/engines/overlay/overlay_edit_text.cc @@ -8,7 +8,7 @@ #include "DRW_render.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "BKE_vfont.h" diff --git a/source/blender/draw/engines/overlay/overlay_edit_uv.cc b/source/blender/draw/engines/overlay/overlay_edit_uv.cc index 77f92398690..77f29e781af 100644 --- a/source/blender/draw/engines/overlay/overlay_edit_uv.cc +++ b/source/blender/draw/engines/overlay/overlay_edit_uv.cc @@ -23,14 +23,14 @@ #include "DEG_depsgraph_query.h" -#include "ED_image.h" +#include "ED_image.hh" #include "IMB_imbuf_types.h" #include "GPU_batch.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "overlay_private.hh" diff --git a/source/blender/draw/engines/overlay/overlay_engine.cc b/source/blender/draw/engines/overlay/overlay_engine.cc index 7914460d689..e66252506b4 100644 --- a/source/blender/draw/engines/overlay/overlay_engine.cc +++ b/source/blender/draw/engines/overlay/overlay_engine.cc @@ -13,9 +13,9 @@ #include "DEG_depsgraph_query.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BKE_duplilist.h" #include "BKE_object.h" diff --git a/source/blender/draw/engines/overlay/overlay_extra.cc b/source/blender/draw/engines/overlay/overlay_extra.cc index e2fac9dffeb..0cdd3addd59 100644 --- a/source/blender/draw/engines/overlay/overlay_extra.cc +++ b/source/blender/draw/engines/overlay/overlay_extra.cc @@ -8,7 +8,7 @@ #include "DRW_render.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "BKE_anim_path.h" #include "BKE_camera.h" @@ -38,7 +38,7 @@ #include "DEG_depsgraph_query.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "overlay_private.hh" diff --git a/source/blender/draw/engines/overlay/overlay_fade.cc b/source/blender/draw/engines/overlay/overlay_fade.cc index b6d23d237c9..1d549e7758a 100644 --- a/source/blender/draw/engines/overlay/overlay_fade.cc +++ b/source/blender/draw/engines/overlay/overlay_fade.cc @@ -9,7 +9,7 @@ #include "BKE_paint.hh" #include "DRW_render.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "overlay_private.hh" diff --git a/source/blender/draw/engines/overlay/overlay_gpencil_legacy.cc b/source/blender/draw/engines/overlay/overlay_gpencil_legacy.cc index d436cf551e5..96fd1de6139 100644 --- a/source/blender/draw/engines/overlay/overlay_gpencil_legacy.cc +++ b/source/blender/draw/engines/overlay/overlay_gpencil_legacy.cc @@ -10,13 +10,13 @@ #include "BKE_gpencil_legacy.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "DNA_gpencil_legacy_types.h" #include "DEG_depsgraph_query.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "overlay_private.hh" diff --git a/source/blender/draw/engines/overlay/overlay_grid.cc b/source/blender/draw/engines/overlay/overlay_grid.cc index f89463da33c..2a841b8871f 100644 --- a/source/blender/draw/engines/overlay/overlay_grid.cc +++ b/source/blender/draw/engines/overlay/overlay_grid.cc @@ -13,10 +13,10 @@ #include "DEG_depsgraph_query.h" -#include "ED_image.h" -#include "ED_view3d.h" +#include "ED_image.hh" +#include "ED_view3d.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "overlay_next_instance.hh" #include "overlay_private.hh" diff --git a/source/blender/draw/engines/overlay/overlay_image.cc b/source/blender/draw/engines/overlay/overlay_image.cc index 5c9dde2a190..75e12c4f7f2 100644 --- a/source/blender/draw/engines/overlay/overlay_image.cc +++ b/source/blender/draw/engines/overlay/overlay_image.cc @@ -20,7 +20,7 @@ #include "DEG_depsgraph_query.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "IMB_imbuf_types.h" diff --git a/source/blender/draw/engines/overlay/overlay_metaball.cc b/source/blender/draw/engines/overlay/overlay_metaball.cc index 5e6bfe8c895..db7165a847c 100644 --- a/source/blender/draw/engines/overlay/overlay_metaball.cc +++ b/source/blender/draw/engines/overlay/overlay_metaball.cc @@ -14,7 +14,7 @@ #include "DEG_depsgraph_query.h" -#include "ED_mball.h" +#include "ED_mball.hh" #include "overlay_private.hh" diff --git a/source/blender/draw/engines/overlay/overlay_mode_transfer.cc b/source/blender/draw/engines/overlay/overlay_mode_transfer.cc index 7fb34d6949d..fd92810fe7d 100644 --- a/source/blender/draw/engines/overlay/overlay_mode_transfer.cc +++ b/source/blender/draw/engines/overlay/overlay_mode_transfer.cc @@ -9,10 +9,10 @@ #include "BKE_paint.hh" #include "DRW_render.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "PIL_time.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "overlay_private.hh" diff --git a/source/blender/draw/engines/overlay/overlay_motion_path.cc b/source/blender/draw/engines/overlay/overlay_motion_path.cc index 16e54f6f73b..d5bca30d0dd 100644 --- a/source/blender/draw/engines/overlay/overlay_motion_path.cc +++ b/source/blender/draw/engines/overlay/overlay_motion_path.cc @@ -17,7 +17,7 @@ #include "GPU_batch.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "draw_manager_text.h" diff --git a/source/blender/draw/engines/overlay/overlay_next_engine.cc b/source/blender/draw/engines/overlay/overlay_next_engine.cc index 64071b42bfc..b1aad3f8a0b 100644 --- a/source/blender/draw/engines/overlay/overlay_next_engine.cc +++ b/source/blender/draw/engines/overlay/overlay_next_engine.cc @@ -13,9 +13,9 @@ #include "DEG_depsgraph_query.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BKE_duplilist.h" #include "BKE_object.h" diff --git a/source/blender/draw/engines/overlay/overlay_next_grid.hh b/source/blender/draw/engines/overlay/overlay_next_grid.hh index 8f39fa60a6c..f82d439eeba 100644 --- a/source/blender/draw/engines/overlay/overlay_next_grid.hh +++ b/source/blender/draw/engines/overlay/overlay_next_grid.hh @@ -11,7 +11,7 @@ #include "DEG_depsgraph_query.h" #include "DNA_camera_types.h" #include "DNA_space_types.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "overlay_next_private.hh" diff --git a/source/blender/draw/engines/overlay/overlay_next_instance.cc b/source/blender/draw/engines/overlay/overlay_next_instance.cc index 284e74e0ed8..370c8aaffa5 100644 --- a/source/blender/draw/engines/overlay/overlay_next_instance.cc +++ b/source/blender/draw/engines/overlay/overlay_next_instance.cc @@ -7,7 +7,7 @@ */ #include "DEG_depsgraph_query.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "draw_debug.hh" #include "overlay_next_instance.hh" diff --git a/source/blender/draw/engines/overlay/overlay_next_metaball.hh b/source/blender/draw/engines/overlay/overlay_next_metaball.hh index 3b07552a455..c20ea0e36f4 100644 --- a/source/blender/draw/engines/overlay/overlay_next_metaball.hh +++ b/source/blender/draw/engines/overlay/overlay_next_metaball.hh @@ -11,7 +11,7 @@ #include "overlay_next_private.hh" #include "overlay_shader_shared.h" -#include "ED_mball.h" +#include "ED_mball.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_private.hh b/source/blender/draw/engines/overlay/overlay_next_private.hh index 4ed375b3fd7..698d53bad32 100644 --- a/source/blender/draw/engines/overlay/overlay_next_private.hh +++ b/source/blender/draw/engines/overlay/overlay_next_private.hh @@ -10,7 +10,7 @@ #include "DRW_gpu_wrapper.hh" #include "DRW_render.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "draw_manager.hh" #include "draw_pass.hh" #include "gpu_shader_create_info.hh" diff --git a/source/blender/draw/engines/overlay/overlay_outline.cc b/source/blender/draw/engines/overlay/overlay_outline.cc index 67d6f08138e..821b3542716 100644 --- a/source/blender/draw/engines/overlay/overlay_outline.cc +++ b/source/blender/draw/engines/overlay/overlay_outline.cc @@ -15,7 +15,7 @@ #include "DNA_gpencil_legacy_types.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "overlay_private.hh" diff --git a/source/blender/draw/engines/overlay/overlay_particle.cc b/source/blender/draw/engines/overlay/overlay_particle.cc index beb57e313e9..d618f1348f8 100644 --- a/source/blender/draw/engines/overlay/overlay_particle.cc +++ b/source/blender/draw/engines/overlay/overlay_particle.cc @@ -14,7 +14,7 @@ #include "BKE_pointcache.h" -#include "ED_particle.h" +#include "ED_particle.hh" #include "overlay_private.hh" diff --git a/source/blender/draw/engines/overlay/overlay_private.hh b/source/blender/draw/engines/overlay/overlay_private.hh index 8d3c87bfac9..d9778a27818 100644 --- a/source/blender/draw/engines/overlay/overlay_private.hh +++ b/source/blender/draw/engines/overlay/overlay_private.hh @@ -13,7 +13,7 @@ #include "DRW_gpu_wrapper.hh" #include "DRW_render.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "draw_handle.hh" diff --git a/source/blender/draw/engines/overlay/overlay_shader.cc b/source/blender/draw/engines/overlay/overlay_shader.cc index 74124533f56..7f8439f5dea 100644 --- a/source/blender/draw/engines/overlay/overlay_shader.cc +++ b/source/blender/draw/engines/overlay/overlay_shader.cc @@ -10,7 +10,7 @@ #include "GPU_shader.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "gpu_shader_create_info.hh" diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.cc b/source/blender/draw/engines/overlay/overlay_wireframe.cc index 929a23346d2..7355dab8431 100644 --- a/source/blender/draw/engines/overlay/overlay_wireframe.cc +++ b/source/blender/draw/engines/overlay/overlay_wireframe.cc @@ -27,7 +27,7 @@ #include "DRW_render.h" #include "GPU_shader.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "overlay_private.hh" diff --git a/source/blender/draw/engines/select/select_draw_utils.cc b/source/blender/draw/engines/select/select_draw_utils.cc index 9f107d8cb5f..f030ab33911 100644 --- a/source/blender/draw/engines/select/select_draw_utils.cc +++ b/source/blender/draw/engines/select/select_draw_utils.cc @@ -15,7 +15,7 @@ #include "DNA_mesh_types.h" #include "DNA_scene_types.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/draw/engines/select/select_engine.cc b/source/blender/draw/engines/select/select_engine.cc index c55e15c0abe..1cc3375aafa 100644 --- a/source/blender/draw/engines/select/select_engine.cc +++ b/source/blender/draw/engines/select/select_engine.cc @@ -10,9 +10,9 @@ #include "DNA_screen_types.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "DRW_engine.h" #include "DRW_select_buffer.h" diff --git a/source/blender/draw/engines/workbench/workbench_data.cc b/source/blender/draw/engines/workbench/workbench_data.cc index f1b42e87b94..866b22191f7 100644 --- a/source/blender/draw/engines/workbench/workbench_data.cc +++ b/source/blender/draw/engines/workbench/workbench_data.cc @@ -14,9 +14,9 @@ #include "DNA_userdef_types.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "GPU_uniform_buffer.h" diff --git a/source/blender/draw/engines/workbench/workbench_engine.cc b/source/blender/draw/engines/workbench/workbench_engine.cc index 4dab66125a0..404cdea2901 100644 --- a/source/blender/draw/engines/workbench/workbench_engine.cc +++ b/source/blender/draw/engines/workbench/workbench_engine.cc @@ -11,8 +11,8 @@ #include "BKE_report.h" #include "DEG_depsgraph_query.h" #include "DNA_fluid_types.h" -#include "ED_paint.h" -#include "ED_view3d.h" +#include "ED_paint.hh" +#include "ED_view3d.hh" #include "GPU_capabilities.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/draw/engines/workbench/workbench_engine_c.cc b/source/blender/draw/engines/workbench/workbench_engine_c.cc index 663f9cebe97..ba3a41643d1 100644 --- a/source/blender/draw/engines/workbench/workbench_engine_c.cc +++ b/source/blender/draw/engines/workbench/workbench_engine_c.cc @@ -29,7 +29,7 @@ #include "DNA_node_types.h" #include "DNA_pointcloud_types.h" -#include "ED_paint.h" +#include "ED_paint.hh" #include "GPU_context.h" diff --git a/source/blender/draw/engines/workbench/workbench_materials.cc b/source/blender/draw/engines/workbench/workbench_materials.cc index a2e60dcd8d5..994ce06ffe2 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.cc +++ b/source/blender/draw/engines/workbench/workbench_materials.cc @@ -21,7 +21,7 @@ #include "GPU_uniform_buffer.h" -#include "ED_uvedit.h" +#include "ED_uvedit.hh" #define HSV_SATURATION 0.5 #define HSV_VALUE 0.8 diff --git a/source/blender/draw/engines/workbench/workbench_materials_next.cc b/source/blender/draw/engines/workbench/workbench_materials_next.cc index c166d6f6486..74f921e1dd9 100644 --- a/source/blender/draw/engines/workbench/workbench_materials_next.cc +++ b/source/blender/draw/engines/workbench/workbench_materials_next.cc @@ -8,7 +8,7 @@ /* get_image */ #include "BKE_node.hh" #include "DNA_node_types.h" -#include "ED_uvedit.h" +#include "ED_uvedit.hh" /* get_image */ namespace blender::workbench { diff --git a/source/blender/draw/engines/workbench/workbench_render.cc b/source/blender/draw/engines/workbench/workbench_render.cc index aa54c6bea47..b64f98507e4 100644 --- a/source/blender/draw/engines/workbench/workbench_render.cc +++ b/source/blender/draw/engines/workbench/workbench_render.cc @@ -16,7 +16,7 @@ #include "DRW_render.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "GPU_context.h" #include "GPU_shader.h" diff --git a/source/blender/draw/engines/workbench/workbench_state.cc b/source/blender/draw/engines/workbench/workbench_state.cc index ecdc4bc9e80..ae627543e3b 100644 --- a/source/blender/draw/engines/workbench/workbench_state.cc +++ b/source/blender/draw/engines/workbench/workbench_state.cc @@ -14,8 +14,8 @@ #include "BKE_pbvh_api.hh" #include "DEG_depsgraph_query.h" #include "DNA_fluid_types.h" -#include "ED_paint.h" -#include "ED_view3d.h" +#include "ED_paint.hh" +#include "ED_view3d.hh" #include "GPU_capabilities.h" namespace blender::workbench { diff --git a/source/blender/draw/engines/workbench/workbench_transparent.cc b/source/blender/draw/engines/workbench/workbench_transparent.cc index 58d470d12eb..7a9333c38fa 100644 --- a/source/blender/draw/engines/workbench/workbench_transparent.cc +++ b/source/blender/draw/engines/workbench/workbench_transparent.cc @@ -19,7 +19,7 @@ #include "DRW_render.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "workbench_engine.h" #include "workbench_private.h" diff --git a/source/blender/draw/intern/draw_cache.cc b/source/blender/draw/intern/draw_cache.cc index a38e29fedf4..54d8417cc99 100644 --- a/source/blender/draw/intern/draw_cache.cc +++ b/source/blender/draw/intern/draw_cache.cc @@ -19,7 +19,7 @@ #include "DNA_scene_types.h" #include "DNA_volume_types.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "BLI_math.h" #include "BLI_utildefines.h" diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc index d9d9be8fa7e..d192380d57c 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc +++ b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc @@ -22,7 +22,7 @@ #include "GPU_batch.h" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "mesh_extractors/extract_mesh.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_curve.cc b/source/blender/draw/intern/draw_cache_impl_curve.cc index ff572d40afe..d43ff814152 100644 --- a/source/blender/draw/intern/draw_cache_impl_curve.cc +++ b/source/blender/draw/intern/draw_cache_impl_curve.cc @@ -31,7 +31,7 @@ #include "GPU_material.h" #include "GPU_texture.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "DRW_render.h" diff --git a/source/blender/draw/intern/draw_cache_impl_gpencil_legacy.cc b/source/blender/draw/intern/draw_cache_impl_gpencil_legacy.cc index ffaf8b1e7dd..a5173a1f377 100644 --- a/source/blender/draw/intern/draw_cache_impl_gpencil_legacy.cc +++ b/source/blender/draw/intern/draw_cache_impl_gpencil_legacy.cc @@ -18,7 +18,7 @@ #include "DRW_engine.h" #include "DRW_render.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "GPU_batch.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.cc b/source/blender/draw/intern/draw_cache_impl_mesh.cc index f267d57851d..2353dfac44c 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.cc +++ b/source/blender/draw/intern/draw_cache_impl_mesh.cc @@ -55,8 +55,8 @@ #include "DRW_render.h" -#include "ED_mesh.h" -#include "ED_uvedit.h" +#include "ED_mesh.hh" +#include "ED_uvedit.hh" #include "draw_cache_extract.hh" #include "draw_cache_inline.h" diff --git a/source/blender/draw/intern/draw_cache_impl_particles.cc b/source/blender/draw/intern/draw_cache_impl_particles.cc index 8913c38d8f7..6e1e17592e4 100644 --- a/source/blender/draw/intern/draw_cache_impl_particles.cc +++ b/source/blender/draw/intern/draw_cache_impl_particles.cc @@ -30,7 +30,7 @@ #include "BKE_particle.h" #include "BKE_pointcache.h" -#include "ED_particle.h" +#include "ED_particle.hh" #include "GPU_batch.h" #include "GPU_capabilities.h" diff --git a/source/blender/draw/intern/draw_cache_impl_volume.cc b/source/blender/draw/intern/draw_cache_impl_volume.cc index 6b876fb5a5b..d022dc1e74e 100644 --- a/source/blender/draw/intern/draw_cache_impl_volume.cc +++ b/source/blender/draw/intern/draw_cache_impl_volume.cc @@ -32,7 +32,7 @@ #include "DRW_render.h" -#include "draw_cache.h" /* own include */ +#include "draw_cache.h" /* own include */ #include "draw_cache_impl.hh" /* own include */ static void volume_batch_cache_clear(Volume *volume); diff --git a/source/blender/draw/intern/draw_common.cc b/source/blender/draw/intern/draw_common.cc index 81ad869b9b0..f02d9ac66c9 100644 --- a/source/blender/draw/intern/draw_common.cc +++ b/source/blender/draw/intern/draw_common.cc @@ -12,7 +12,7 @@ #include "GPU_shader.h" #include "GPU_texture.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "BKE_colorband.h" #include "BKE_global.h" diff --git a/source/blender/draw/intern/draw_manager_c.cc b/source/blender/draw/intern/draw_manager_c.cc index 6c50b797a8f..3b101e312c7 100644 --- a/source/blender/draw/intern/draw_manager_c.cc +++ b/source/blender/draw/intern/draw_manager_c.cc @@ -49,10 +49,10 @@ #include "DNA_view3d_types.h" #include "DNA_world_types.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_view3d.h" +#include "ED_space_api.hh" +#include "ED_view3d.hh" #include "GPU_capabilities.h" #include "GPU_framebuffer.h" @@ -69,8 +69,8 @@ #include "RE_engine.h" #include "RE_pipeline.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "WM_api.hh" #include "wm_window.hh" diff --git a/source/blender/draw/intern/draw_manager_profiling.cc b/source/blender/draw/intern/draw_manager_profiling.cc index 1715477b4ca..c66ef967d2a 100644 --- a/source/blender/draw/intern/draw_manager_profiling.cc +++ b/source/blender/draw/intern/draw_manager_profiling.cc @@ -21,7 +21,7 @@ #include "GPU_debug.h" #include "GPU_texture.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "draw_manager_profiling.hh" diff --git a/source/blender/draw/intern/draw_manager_text.cc b/source/blender/draw/intern/draw_manager_text.cc index f052746b129..106fffd0f4d 100644 --- a/source/blender/draw/intern/draw_manager_text.cc +++ b/source/blender/draw/intern/draw_manager_text.cc @@ -31,10 +31,10 @@ #include "GPU_state.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLF_api.h" #include "WM_api.hh" diff --git a/source/blender/draw/intern/draw_view_c.cc b/source/blender/draw/intern/draw_view_c.cc index 220c0f1f1cb..20fed2991e0 100644 --- a/source/blender/draw/intern/draw_view_c.cc +++ b/source/blender/draw/intern/draw_view_c.cc @@ -15,14 +15,14 @@ #include "ED_screen.hh" #include "ED_util.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "GPU_immediate.h" #include "GPU_matrix.h" #include "GPU_shader.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "WM_types.hh" diff --git a/source/blender/draw/intern/mesh_extractors/extract_mesh.cc b/source/blender/draw/intern/mesh_extractors/extract_mesh.cc index 7698f7d7bf0..09916ff3efe 100644 --- a/source/blender/draw/intern/mesh_extractors/extract_mesh.cc +++ b/source/blender/draw/intern/mesh_extractors/extract_mesh.cc @@ -12,7 +12,7 @@ #include "DNA_object_types.h" -#include "ED_uvedit.h" +#include "ED_uvedit.hh" #include "extract_mesh.hh" diff --git a/source/blender/editors/animation/anim_channels_defines.cc b/source/blender/editors/animation/anim_channels_defines.cc index a6e6b7b07a5..41264c490ce 100644 --- a/source/blender/editors/animation/anim_channels_defines.cc +++ b/source/blender/editors/animation/anim_channels_defines.cc @@ -63,13 +63,13 @@ #include "DEG_depsgraph.h" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" -#include "ED_anim_api.h" -#include "ED_keyframing.h" +#include "ED_anim_api.hh" +#include "ED_keyframing.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -4136,7 +4136,7 @@ static void ANIM_init_channel_typeinfo_data() ACF_INIT = 0; /* NOTE: need to keep the order of these synchronized with the definition of - * channel types (eAnim_ChannelType) in ED_anim_api.h + * channel types (eAnim_ChannelType) in ED_anim_api.hh */ animchannelTypeInfo[type++] = nullptr; /* None */ animchannelTypeInfo[type++] = nullptr; /* AnimData */ diff --git a/source/blender/editors/animation/anim_channels_edit.cc b/source/blender/editors/animation/anim_channels_edit.cc index df73af17808..37ab343ae29 100644 --- a/source/blender/editors/animation/anim_channels_edit.cc +++ b/source/blender/editors/animation/anim_channels_edit.cc @@ -43,16 +43,16 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" -#include "ED_anim_api.h" -#include "ED_armature.h" -#include "ED_keyframes_edit.h" /* XXX move the select modes out of there! */ -#include "ED_markers.h" -#include "ED_object.h" +#include "ED_anim_api.hh" +#include "ED_armature.hh" +#include "ED_keyframes_edit.hh" /* XXX move the select modes out of there! */ +#include "ED_markers.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/animation/anim_deps.cc b/source/blender/editors/animation/anim_deps.cc index 9ce76e094a8..5ef52a44f89 100644 --- a/source/blender/editors/animation/anim_deps.cc +++ b/source/blender/editors/animation/anim_deps.cc @@ -39,7 +39,7 @@ #include "SEQ_sequencer.h" #include "SEQ_utils.h" -#include "ED_anim_api.h" +#include "ED_anim_api.hh" /* **************************** depsgraph tagging ******************************** */ diff --git a/source/blender/editors/animation/anim_draw.cc b/source/blender/editors/animation/anim_draw.cc index 88e77316fe7..9329c75b60b 100644 --- a/source/blender/editors/animation/anim_draw.cc +++ b/source/blender/editors/animation/anim_draw.cc @@ -30,17 +30,17 @@ #include "BKE_mask.h" #include "BKE_nla.h" -#include "ED_anim_api.h" -#include "ED_keyframes_draw.h" -#include "ED_keyframes_edit.h" -#include "ED_keyframes_keylist.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_draw.hh" +#include "ED_keyframes_edit.hh" +#include "ED_keyframes_keylist.hh" #include "RNA_access.h" #include "RNA_path.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "GPU_immediate.h" #include "GPU_matrix.h" diff --git a/source/blender/editors/animation/anim_filter.cc b/source/blender/editors/animation/anim_filter.cc index cfd58481552..0dac9e52529 100644 --- a/source/blender/editors/animation/anim_filter.cc +++ b/source/blender/editors/animation/anim_filter.cc @@ -83,15 +83,15 @@ #include "BKE_modifier.h" #include "BKE_node.h" -#include "ED_anim_api.h" -#include "ED_markers.h" +#include "ED_anim_api.hh" +#include "ED_markers.hh" #include "SEQ_sequencer.h" #include "SEQ_utils.h" #include "ANIM_bone_collections.h" -#include "UI_resources.h" /* for TH_KEYFRAME_SCALE lookup */ +#include "UI_resources.hh" /* for TH_KEYFRAME_SCALE lookup */ /* ************************************************************ */ /* Blender Context <-> Animation Context mapping */ diff --git a/source/blender/editors/animation/anim_ipo_utils.cc b/source/blender/editors/animation/anim_ipo_utils.cc index 882cbd662e0..38af3e1e488 100644 --- a/source/blender/editors/animation/anim_ipo_utils.cc +++ b/source/blender/editors/animation/anim_ipo_utils.cc @@ -26,7 +26,7 @@ #include "RNA_path.h" #include "RNA_prototypes.h" -#include "ED_anim_api.h" +#include "ED_anim_api.hh" /* ----------------------- Getter functions ----------------------- */ diff --git a/source/blender/editors/animation/anim_markers.cc b/source/blender/editors/animation/anim_markers.cc index 2645f44f279..2a3533ea68d 100644 --- a/source/blender/editors/animation/anim_markers.cc +++ b/source/blender/editors/animation/anim_markers.cc @@ -40,19 +40,19 @@ #include "GPU_matrix.h" #include "GPU_state.h" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" -#include "ED_anim_api.h" -#include "ED_keyframes_edit.h" -#include "ED_markers.h" -#include "ED_numinput.h" -#include "ED_object.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_edit.hh" +#include "ED_markers.hh" +#include "ED_numinput.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_transform.h" +#include "ED_select_utils.hh" +#include "ED_transform.hh" #include "ED_util.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/animation/anim_motion_paths.cc b/source/blender/editors/animation/anim_motion_paths.cc index 4863222d250..ea40c831282 100644 --- a/source/blender/editors/animation/anim_motion_paths.cc +++ b/source/blender/editors/animation/anim_motion_paths.cc @@ -30,8 +30,8 @@ #include "GPU_batch.h" #include "GPU_vertex_buffer.h" -#include "ED_anim_api.h" -#include "ED_keyframes_keylist.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_keylist.hh" #include "ANIM_bone_collections.h" diff --git a/source/blender/editors/animation/anim_ops.cc b/source/blender/editors/animation/anim_ops.cc index ab7c9e4f334..a85db9fdf2c 100644 --- a/source/blender/editors/animation/anim_ops.cc +++ b/source/blender/editors/animation/anim_ops.cc @@ -21,7 +21,7 @@ #include "BKE_report.h" #include "BKE_scene.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "RNA_access.h" #include "RNA_define.h" @@ -29,10 +29,10 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_anim_api.h" +#include "ED_anim_api.hh" #include "ED_screen.hh" -#include "ED_sequencer.h" -#include "ED_time_scrub_ui.h" +#include "ED_sequencer.hh" +#include "ED_time_scrub_ui.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/animation/drivers.cc b/source/blender/editors/animation/drivers.cc index c1176560641..be80ac6fbc9 100644 --- a/source/blender/editors/animation/drivers.cc +++ b/source/blender/editors/animation/drivers.cc @@ -30,10 +30,10 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_keyframing.h" +#include "ED_keyframing.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/animation/fmodifier_ui.cc b/source/blender/editors/animation/fmodifier_ui.cc index 650a66b2e6f..e977752d90a 100644 --- a/source/blender/editors/animation/fmodifier_ui.cc +++ b/source/blender/editors/animation/fmodifier_ui.cc @@ -36,11 +36,11 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" -#include "ED_anim_api.h" -#include "ED_undo.h" +#include "ED_anim_api.hh" +#include "ED_undo.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/animation/keyframes_draw.cc b/source/blender/editors/animation/keyframes_draw.cc index 89eab5a7e94..79fedae24e2 100644 --- a/source/blender/editors/animation/keyframes_draw.cc +++ b/source/blender/editors/animation/keyframes_draw.cc @@ -27,13 +27,13 @@ #include "GPU_shader_shared.h" #include "GPU_state.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" -#include "ED_anim_api.h" -#include "ED_keyframes_draw.h" -#include "ED_keyframes_keylist.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_draw.hh" +#include "ED_keyframes_keylist.hh" /* *************************** Keyframe Drawing *************************** */ diff --git a/source/blender/editors/animation/keyframes_edit.cc b/source/blender/editors/animation/keyframes_edit.cc index fdc46286170..b1612b6bfee 100644 --- a/source/blender/editors/animation/keyframes_edit.cc +++ b/source/blender/editors/animation/keyframes_edit.cc @@ -25,9 +25,9 @@ #include "BKE_fcurve.h" #include "BKE_nla.h" -#include "ED_anim_api.h" -#include "ED_keyframes_edit.h" -#include "ED_markers.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_edit.hh" +#include "ED_markers.hh" /* This file defines an API and set of callback-operators for * non-destructive editing of keyframe data. diff --git a/source/blender/editors/animation/keyframes_general.cc b/source/blender/editors/animation/keyframes_general.cc index 2a5690bd6cd..7801ab818b3 100644 --- a/source/blender/editors/animation/keyframes_general.cc +++ b/source/blender/editors/animation/keyframes_general.cc @@ -34,9 +34,9 @@ #include "RNA_enum_types.h" #include "RNA_path.h" -#include "ED_anim_api.h" -#include "ED_keyframes_edit.h" -#include "ED_keyframing.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_edit.hh" +#include "ED_keyframing.hh" /* This file contains code for various keyframe-editing tools which are 'destructive' * (i.e. they will modify the order of the keyframes, and change the size of the array). diff --git a/source/blender/editors/animation/keyframes_keylist.cc b/source/blender/editors/animation/keyframes_keylist.cc index 33634bfa284..25fa6b7488a 100644 --- a/source/blender/editors/animation/keyframes_keylist.cc +++ b/source/blender/editors/animation/keyframes_keylist.cc @@ -35,10 +35,9 @@ #include "BKE_fcurve.h" #include "BKE_grease_pencil.hh" -#include "ED_anim_api.h" -#include "ED_keyframes_keylist.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_keylist.hh" -extern "C" { /* *************************** Keyframe Processing *************************** */ /* ActKeyColumns (Keyframe Columns) ------------------------------------------ */ @@ -1202,4 +1201,3 @@ void mask_to_keylist(bDopeSheet * /*ads*/, MaskLayer *masklay, AnimKeylist *keyl update_keyblocks(keylist, nullptr, 0); } } -} diff --git a/source/blender/editors/animation/keyframes_keylist_test.cc b/source/blender/editors/animation/keyframes_keylist_test.cc index 715bdc43fba..3de525f0931 100644 --- a/source/blender/editors/animation/keyframes_keylist_test.cc +++ b/source/blender/editors/animation/keyframes_keylist_test.cc @@ -6,7 +6,7 @@ #include "BLI_utildefines.h" -#include "ED_keyframes_keylist.h" +#include "ED_keyframes_keylist.hh" #include "DNA_anim_types.h" #include "DNA_curve_types.h" diff --git a/source/blender/editors/animation/keyframing.cc b/source/blender/editors/animation/keyframing.cc index a68f29dfe0d..3d28beb8964 100644 --- a/source/blender/editors/animation/keyframing.cc +++ b/source/blender/editors/animation/keyframing.cc @@ -51,16 +51,16 @@ #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "ED_anim_api.h" -#include "ED_keyframes_edit.h" -#include "ED_keyframing.h" -#include "ED_object.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_edit.hh" +#include "ED_keyframing.hh" +#include "ED_object.hh" #include "ED_screen.hh" #include "ANIM_bone_collections.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/animation/keyingsets.cc b/source/blender/editors/animation/keyingsets.cc index 14a479d62ef..6390b5f775d 100644 --- a/source/blender/editors/animation/keyingsets.cc +++ b/source/blender/editors/animation/keyingsets.cc @@ -28,11 +28,11 @@ #include "DEG_depsgraph.h" -#include "ED_keyframing.h" +#include "ED_keyframing.hh" #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/animation/time_scrub_ui.cc b/source/blender/editors/animation/time_scrub_ui.cc index 2a0afc315a2..18160e72c0d 100644 --- a/source/blender/editors/animation/time_scrub_ui.cc +++ b/source/blender/editors/animation/time_scrub_ui.cc @@ -13,15 +13,15 @@ #include "GPU_matrix.h" #include "GPU_state.h" -#include "ED_time_scrub_ui.h" +#include "ED_time_scrub_ui.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "DNA_scene_types.h" diff --git a/source/blender/editors/armature/armature_add.cc b/source/blender/editors/armature/armature_add.cc index 68d99b2c966..09368f5c5d0 100644 --- a/source/blender/editors/armature/armature_add.cc +++ b/source/blender/editors/armature/armature_add.cc @@ -38,10 +38,10 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_armature.h" -#include "ED_outliner.h" +#include "ED_armature.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "ANIM_bone_collections.h" diff --git a/source/blender/editors/armature/armature_edit.cc b/source/blender/editors/armature/armature_edit.cc index c188a824293..4e06f5de2fd 100644 --- a/source/blender/editors/armature/armature_edit.cc +++ b/source/blender/editors/armature/armature_edit.cc @@ -36,10 +36,10 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_armature.h" -#include "ED_outliner.h" +#include "ED_armature.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "ANIM_bone_collections.h" diff --git a/source/blender/editors/armature/armature_naming.cc b/source/blender/editors/armature/armature_naming.cc index cd5412eaa77..53938409352 100644 --- a/source/blender/editors/armature/armature_naming.cc +++ b/source/blender/editors/armature/armature_naming.cc @@ -46,7 +46,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_armature.h" +#include "ED_armature.hh" #include "ED_screen.hh" #include "armature_intern.h" diff --git a/source/blender/editors/armature/armature_ops.cc b/source/blender/editors/armature/armature_ops.cc index 697b4f23ec9..74f66c54074 100644 --- a/source/blender/editors/armature/armature_ops.cc +++ b/source/blender/editors/armature/armature_ops.cc @@ -11,7 +11,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_armature.h" +#include "ED_armature.hh" #include "ED_screen.hh" #include "armature_intern.h" diff --git a/source/blender/editors/armature/armature_relations.cc b/source/blender/editors/armature/armature_relations.cc index ab4a8caefa7..2fe4fa8af33 100644 --- a/source/blender/editors/armature/armature_relations.cc +++ b/source/blender/editors/armature/armature_relations.cc @@ -41,13 +41,13 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_armature.h" -#include "ED_object.h" -#include "ED_outliner.h" +#include "ED_armature.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "armature_intern.h" diff --git a/source/blender/editors/armature/armature_select.cc b/source/blender/editors/armature/armature_select.cc index 9f25f0e4e16..546ce26e2e2 100644 --- a/source/blender/editors/armature/armature_select.cc +++ b/source/blender/editors/armature/armature_select.cc @@ -31,12 +31,12 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_armature.h" -#include "ED_object.h" -#include "ED_outliner.h" +#include "ED_armature.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/armature/armature_skinning.cc b/source/blender/editors/armature/armature_skinning.cc index 2cfe6e23cad..70454aea04f 100644 --- a/source/blender/editors/armature/armature_skinning.cc +++ b/source/blender/editors/armature/armature_skinning.cc @@ -34,8 +34,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "ED_armature.h" -#include "ED_mesh.h" +#include "ED_armature.hh" +#include "ED_mesh.hh" #include "ANIM_bone_collections.h" diff --git a/source/blender/editors/armature/armature_utils.cc b/source/blender/editors/armature/armature_utils.cc index 5536c1f877a..cfdef892b9c 100644 --- a/source/blender/editors/armature/armature_utils.cc +++ b/source/blender/editors/armature/armature_utils.cc @@ -25,7 +25,7 @@ #include "DEG_depsgraph.h" -#include "ED_armature.h" +#include "ED_armature.hh" #include "ED_util.hh" #include "ANIM_bone_collections.h" diff --git a/source/blender/editors/armature/editarmature_undo.cc b/source/blender/editors/armature/editarmature_undo.cc index e78ac5fbe71..ec609e6fd31 100644 --- a/source/blender/editors/armature/editarmature_undo.cc +++ b/source/blender/editors/armature/editarmature_undo.cc @@ -27,9 +27,9 @@ #include "DEG_depsgraph.h" -#include "ED_armature.h" -#include "ED_object.h" -#include "ED_undo.h" +#include "ED_armature.hh" +#include "ED_object.hh" +#include "ED_undo.hh" #include "ED_util.hh" #include "WM_api.hh" diff --git a/source/blender/editors/armature/meshlaplacian.cc b/source/blender/editors/armature/meshlaplacian.cc index 4540dea4d97..3b8f010f914 100644 --- a/source/blender/editors/armature/meshlaplacian.cc +++ b/source/blender/editors/armature/meshlaplacian.cc @@ -27,8 +27,8 @@ #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" -#include "ED_armature.h" -#include "ED_mesh.h" +#include "ED_armature.hh" +#include "ED_mesh.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/armature/meshlaplacian.h b/source/blender/editors/armature/meshlaplacian.h index fe9ecdd25cb..60ed26a6a70 100644 --- a/source/blender/editors/armature/meshlaplacian.h +++ b/source/blender/editors/armature/meshlaplacian.h @@ -63,4 +63,4 @@ void rigid_deform_end(int cancel); /* Harmonic Coordinates */ -/* ED_mesh_deform_bind_callback(...) defined in ED_armature.h */ +/* ED_mesh_deform_bind_callback(...) defined in ED_armature.hh */ diff --git a/source/blender/editors/armature/pose_edit.cc b/source/blender/editors/armature/pose_edit.cc index a0a3aba8cd9..2240543a3e5 100644 --- a/source/blender/editors/armature/pose_edit.cc +++ b/source/blender/editors/armature/pose_edit.cc @@ -43,16 +43,16 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_anim_api.h" -#include "ED_armature.h" -#include "ED_keyframing.h" -#include "ED_object.h" +#include "ED_anim_api.hh" +#include "ED_armature.hh" +#include "ED_keyframing.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "ANIM_bone_collections.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "armature_intern.h" diff --git a/source/blender/editors/armature/pose_group.cc b/source/blender/editors/armature/pose_group.cc index 66fd0ca329c..5f3055d31e2 100644 --- a/source/blender/editors/armature/pose_group.cc +++ b/source/blender/editors/armature/pose_group.cc @@ -28,12 +28,12 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_armature.h" -#include "ED_outliner.h" +#include "ED_armature.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "armature_intern.h" diff --git a/source/blender/editors/armature/pose_lib_2.cc b/source/blender/editors/armature/pose_lib_2.cc index 78cd9fbe395..716e5ba8f97 100644 --- a/source/blender/editors/armature/pose_lib_2.cc +++ b/source/blender/editors/armature/pose_lib_2.cc @@ -37,10 +37,10 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" -#include "ED_asset.h" -#include "ED_keyframing.h" +#include "ED_asset.hh" +#include "ED_keyframing.hh" #include "ED_screen.hh" #include "ED_util.hh" diff --git a/source/blender/editors/armature/pose_select.cc b/source/blender/editors/armature/pose_select.cc index 864993ef102..9da265d6548 100644 --- a/source/blender/editors/armature/pose_select.cc +++ b/source/blender/editors/armature/pose_select.cc @@ -37,14 +37,14 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_armature.h" -#include "ED_keyframing.h" -#include "ED_mesh.h" -#include "ED_object.h" -#include "ED_outliner.h" +#include "ED_armature.hh" +#include "ED_keyframing.hh" +#include "ED_mesh.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_view3d.hh" #include "armature_intern.h" diff --git a/source/blender/editors/armature/pose_slide.cc b/source/blender/editors/armature/pose_slide.cc index ef1107c2967..32426f16cc6 100644 --- a/source/blender/editors/armature/pose_slide.cc +++ b/source/blender/editors/armature/pose_slide.cc @@ -61,17 +61,17 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" -#include "ED_armature.h" -#include "ED_keyframes_edit.h" -#include "ED_keyframes_keylist.h" -#include "ED_keyframing.h" -#include "ED_markers.h" -#include "ED_numinput.h" +#include "ED_armature.hh" +#include "ED_keyframes_edit.hh" +#include "ED_keyframes_keylist.hh" +#include "ED_keyframing.hh" +#include "ED_markers.hh" +#include "ED_numinput.hh" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "ED_util.hh" #include "GPU_immediate.h" diff --git a/source/blender/editors/armature/pose_transform.cc b/source/blender/editors/armature/pose_transform.cc index d210a73df38..7dc8217f753 100644 --- a/source/blender/editors/armature/pose_transform.cc +++ b/source/blender/editors/armature/pose_transform.cc @@ -41,15 +41,15 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_armature.h" -#include "ED_keyframing.h" +#include "ED_armature.hh" +#include "ED_keyframing.hh" #include "ED_screen.hh" #include "ED_util.hh" #include "ANIM_bone_collections.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "armature_intern.h" diff --git a/source/blender/editors/armature/pose_utils.cc b/source/blender/editors/armature/pose_utils.cc index 9fafd5d1ed5..afabd945665 100644 --- a/source/blender/editors/armature/pose_utils.cc +++ b/source/blender/editors/armature/pose_utils.cc @@ -33,8 +33,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_armature.h" -#include "ED_keyframing.h" +#include "ED_armature.hh" +#include "ED_keyframing.hh" #include "armature_intern.h" diff --git a/source/blender/editors/asset/ED_asset_indexer.h b/source/blender/editors/asset/ED_asset_indexer.h index abd9a2141d4..900562df641 100644 --- a/source/blender/editors/asset/ED_asset_indexer.h +++ b/source/blender/editors/asset/ED_asset_indexer.h @@ -8,7 +8,7 @@ #pragma once -#include "ED_file_indexer.h" +#include "ED_file_indexer.hh" #ifdef __cplusplus extern "C" { diff --git a/source/blender/editors/asset/intern/asset_handle.cc b/source/blender/editors/asset/intern/asset_handle.cc index e5c92358bc6..96686cd5aad 100644 --- a/source/blender/editors/asset/intern/asset_handle.cc +++ b/source/blender/editors/asset/intern/asset_handle.cc @@ -18,7 +18,7 @@ #include "DNA_space_types.h" -#include "ED_fileselect.h" +#include "ED_fileselect.hh" #include "RNA_prototypes.h" diff --git a/source/blender/editors/asset/intern/asset_library_reference_enum.cc b/source/blender/editors/asset/intern/asset_library_reference_enum.cc index f71cd7dcbe3..9090a787e5d 100644 --- a/source/blender/editors/asset/intern/asset_library_reference_enum.cc +++ b/source/blender/editors/asset/intern/asset_library_reference_enum.cc @@ -17,7 +17,7 @@ #include "DNA_userdef_types.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "RNA_define.h" diff --git a/source/blender/editors/asset/intern/asset_mark_clear.cc b/source/blender/editors/asset/intern/asset_mark_clear.cc index 0212f29d853..4c8a893b0fe 100644 --- a/source/blender/editors/asset/intern/asset_mark_clear.cc +++ b/source/blender/editors/asset/intern/asset_mark_clear.cc @@ -18,7 +18,7 @@ #include "BKE_lib_id.h" #include "BKE_main.h" -#include "UI_interface_icons.h" +#include "UI_interface_icons.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/editors/asset/intern/asset_ops.cc b/source/blender/editors/asset/intern/asset_ops.cc index d51d1b65494..d8293ad748c 100644 --- a/source/blender/editors/asset/intern/asset_ops.cc +++ b/source/blender/editors/asset/intern/asset_ops.cc @@ -22,12 +22,12 @@ #include "BLI_path_util.h" #include "BLI_set.hh" -#include "ED_asset.h" +#include "ED_asset.hh" #include "ED_asset_catalog.hh" #include "ED_screen.hh" #include "ED_util.hh" /* XXX needs access to the file list, should all be done via the asset system in future. */ -#include "ED_fileselect.h" +#include "ED_fileselect.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/asset/intern/asset_shelf.cc b/source/blender/editors/asset/intern/asset_shelf.cc index 4a23b720240..3d88bb49820 100644 --- a/source/blender/editors/asset/intern/asset_shelf.cc +++ b/source/blender/editors/asset/intern/asset_shelf.cc @@ -24,11 +24,10 @@ #include "RNA_prototypes.h" -#include "UI_interface.h" #include "UI_interface.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "UI_tree_view.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "WM_api.hh" diff --git a/source/blender/editors/asset/intern/asset_shelf_asset_view.cc b/source/blender/editors/asset/intern/asset_shelf_asset_view.cc index cc07fcef6ec..b3d8a722f65 100644 --- a/source/blender/editors/asset/intern/asset_shelf_asset_view.cc +++ b/source/blender/editors/asset/intern/asset_shelf_asset_view.cc @@ -25,9 +25,8 @@ #include "ED_asset_shelf.h" #include "UI_grid_view.hh" -#include "UI_interface.h" #include "UI_interface.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc b/source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc index 101b5c49b7b..366595ab990 100644 --- a/source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc +++ b/source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc @@ -22,7 +22,6 @@ #include "ED_asset_filter.hh" #include "ED_asset_list.hh" -#include "UI_interface.h" #include "UI_interface.hh" #include "UI_tree_view.hh" diff --git a/source/blender/editors/asset/intern/asset_temp_id_consumer.cc b/source/blender/editors/asset/intern/asset_temp_id_consumer.cc index 44cc748362f..9fa3ccebebd 100644 --- a/source/blender/editors/asset/intern/asset_temp_id_consumer.cc +++ b/source/blender/editors/asset/intern/asset_temp_id_consumer.cc @@ -16,7 +16,7 @@ #include "DNA_space_types.h" -#include "ED_asset.h" +#include "ED_asset.hh" #include "BKE_report.h" diff --git a/source/blender/editors/curve/curve_ops.cc b/source/blender/editors/curve/curve_ops.cc index f35f3f75dd5..007561735f0 100644 --- a/source/blender/editors/curve/curve_ops.cc +++ b/source/blender/editors/curve/curve_ops.cc @@ -17,7 +17,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_curve.h" +#include "ED_curve.hh" #include "ED_screen.hh" #include "curve_intern.h" diff --git a/source/blender/editors/curve/editcurve.cc b/source/blender/editors/curve/editcurve.cc index 173c8f018aa..acf7f8f8feb 100644 --- a/source/blender/editors/curve/editcurve.cc +++ b/source/blender/editors/curve/editcurve.cc @@ -41,14 +41,14 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_curve.h" -#include "ED_object.h" -#include "ED_outliner.h" +#include "ED_curve.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_transform.h" -#include "ED_transform_snap_object_context.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_transform.hh" +#include "ED_transform_snap_object_context.hh" +#include "ED_view3d.hh" #include "curve_intern.h" @@ -56,8 +56,8 @@ extern "C" { #include "curve_fit_nd.h" } -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/curve/editcurve_add.cc b/source/blender/editors/curve/editcurve_add.cc index fcffa151afd..a0fcaed479f 100644 --- a/source/blender/editors/curve/editcurve_add.cc +++ b/source/blender/editors/curve/editcurve_add.cc @@ -28,10 +28,10 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_curve.h" -#include "ED_object.h" +#include "ED_curve.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "curve_intern.h" diff --git a/source/blender/editors/curve/editcurve_paint.cc b/source/blender/editors/curve/editcurve_paint.cc index b0273cb323e..34bf83904af 100644 --- a/source/blender/editors/curve/editcurve_paint.cc +++ b/source/blender/editors/curve/editcurve_paint.cc @@ -25,10 +25,10 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_curve.h" +#include "ED_curve.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_view3d.h" +#include "ED_space_api.hh" +#include "ED_view3d.hh" #include "GPU_batch.h" #include "GPU_batch_presets.h" @@ -39,7 +39,7 @@ #include "curve_intern.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/curve/editcurve_pen.cc b/source/blender/editors/curve/editcurve_pen.cc index e91cdc640cf..141f579eff2 100644 --- a/source/blender/editors/curve/editcurve_pen.cc +++ b/source/blender/editors/curve/editcurve_pen.cc @@ -21,10 +21,10 @@ #include "WM_api.hh" -#include "ED_curve.h" +#include "ED_curve.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_view3d.hh" #include "BKE_object.h" diff --git a/source/blender/editors/curve/editcurve_query.cc b/source/blender/editors/curve/editcurve_query.cc index 8f83a84b522..4e253d06934 100644 --- a/source/blender/editors/curve/editcurve_query.cc +++ b/source/blender/editors/curve/editcurve_query.cc @@ -21,8 +21,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_curve.h" -#include "ED_view3d.h" +#include "ED_curve.hh" +#include "ED_view3d.hh" #include "curve_intern.h" diff --git a/source/blender/editors/curve/editcurve_select.cc b/source/blender/editors/curve/editcurve_select.cc index 23168713f3e..8e300b854c3 100644 --- a/source/blender/editors/curve/editcurve_select.cc +++ b/source/blender/editors/curve/editcurve_select.cc @@ -27,11 +27,11 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_curve.h" -#include "ED_object.h" +#include "ED_curve.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_view3d.hh" #include "curve_intern.h" diff --git a/source/blender/editors/curve/editcurve_undo.cc b/source/blender/editors/curve/editcurve_undo.cc index 8fa15038e83..921d3f0fb16 100644 --- a/source/blender/editors/curve/editcurve_undo.cc +++ b/source/blender/editors/curve/editcurve_undo.cc @@ -29,8 +29,8 @@ #include "DEG_depsgraph.h" -#include "ED_curve.h" -#include "ED_undo.h" +#include "ED_curve.hh" +#include "ED_undo.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/curve/editfont.cc b/source/blender/editors/curve/editfont.cc index 0e6d5c1fca2..124bab31d41 100644 --- a/source/blender/editors/curve/editfont.cc +++ b/source/blender/editors/curve/editfont.cc @@ -47,13 +47,13 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_curve.h" -#include "ED_object.h" -#include "ED_outliner.h" +#include "ED_curve.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "curve_intern.h" diff --git a/source/blender/editors/curve/editfont_undo.cc b/source/blender/editors/curve/editfont_undo.cc index 475ec69879e..c58a7212891 100644 --- a/source/blender/editors/curve/editfont_undo.cc +++ b/source/blender/editors/curve/editfont_undo.cc @@ -28,9 +28,9 @@ #include "DEG_depsgraph.h" -#include "ED_curve.h" -#include "ED_object.h" -#include "ED_undo.h" +#include "ED_curve.hh" +#include "ED_object.hh" +#include "ED_undo.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/curves/intern/curves_add.cc b/source/blender/editors/curves/intern/curves_add.cc index 2e358c692fc..f1c8d28cf45 100644 --- a/source/blender/editors/curves/intern/curves_add.cc +++ b/source/blender/editors/curves/intern/curves_add.cc @@ -16,8 +16,8 @@ #include "BLT_translation.h" #include "ED_curves.hh" -#include "ED_node.h" -#include "ED_object.h" +#include "ED_node.hh" +#include "ED_object.hh" #include "DNA_modifier_types.h" #include "DNA_node_types.h" diff --git a/source/blender/editors/curves/intern/curves_data.cc b/source/blender/editors/curves/intern/curves_data.cc index bf1936bfa4f..3e4a51af451 100644 --- a/source/blender/editors/curves/intern/curves_data.cc +++ b/source/blender/editors/curves/intern/curves_data.cc @@ -10,7 +10,7 @@ #include "DNA_object_types.h" #include "ED_curves.hh" -#include "ED_transverts.h" +#include "ED_transverts.hh" namespace blender::ed::curves { diff --git a/source/blender/editors/curves/intern/curves_ops.cc b/source/blender/editors/curves/intern/curves_ops.cc index 8b67c75dcdc..466c26def76 100644 --- a/source/blender/editors/curves/intern/curves_ops.cc +++ b/source/blender/editors/curves/intern/curves_ops.cc @@ -19,10 +19,10 @@ #include "BLT_translation.h" #include "ED_curves.hh" -#include "ED_object.h" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_view3d.hh" #include "WM_api.hh" @@ -57,8 +57,8 @@ #include "RNA_enum_types.h" #include "RNA_prototypes.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GEO_reverse_uv_sampler.hh" diff --git a/source/blender/editors/curves/intern/curves_selection.cc b/source/blender/editors/curves/intern/curves_selection.cc index e0ea8a68be1..f5ec05a1bf0 100644 --- a/source/blender/editors/curves/intern/curves_selection.cc +++ b/source/blender/editors/curves/intern/curves_selection.cc @@ -16,9 +16,9 @@ #include "BKE_curves.hh" #include "ED_curves.hh" -#include "ED_object.h" -#include "ED_select_utils.h" -#include "ED_view3d.h" +#include "ED_object.hh" +#include "ED_select_utils.hh" +#include "ED_view3d.hh" namespace blender::ed::curves { diff --git a/source/blender/editors/curves/intern/curves_undo.cc b/source/blender/editors/curves/intern/curves_undo.cc index b26e94d1d8a..1dd288330b6 100644 --- a/source/blender/editors/curves/intern/curves_undo.cc +++ b/source/blender/editors/curves/intern/curves_undo.cc @@ -19,7 +19,7 @@ #include "DEG_depsgraph.h" #include "ED_curves.hh" -#include "ED_undo.h" +#include "ED_undo.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 6d32b04b5af..66c91ebc3db 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -18,7 +18,7 @@ set(SRC set(LIB ) -# Order matches `UI_icons.h`, final name will be formatted: `icons{size}_{name}.dat`. +# Order matches `UI_icons.hh`, final name will be formatted: `icons{size}_{name}.dat`. set(ICON_NAMES question error diff --git a/source/blender/editors/geometry/geometry_attributes.cc b/source/blender/editors/geometry/geometry_attributes.cc index 4c3983e181c..0a3dafaac06 100644 --- a/source/blender/editors/geometry/geometry_attributes.cc +++ b/source/blender/editors/geometry/geometry_attributes.cc @@ -31,12 +31,12 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" -#include "ED_geometry.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_geometry.hh" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "geometry_intern.hh" diff --git a/source/blender/editors/geometry/geometry_ops.cc b/source/blender/editors/geometry/geometry_ops.cc index bd104e114d0..0a425047a4f 100644 --- a/source/blender/editors/geometry/geometry_ops.cc +++ b/source/blender/editors/geometry/geometry_ops.cc @@ -8,7 +8,7 @@ #include "WM_api.hh" -#include "ED_geometry.h" +#include "ED_geometry.hh" #include "geometry_intern.hh" diff --git a/source/blender/editors/geometry/node_group_operator.cc b/source/blender/editors/geometry/node_group_operator.cc index 3d0b301d06b..879dbe438fa 100644 --- a/source/blender/editors/geometry/node_group_operator.cc +++ b/source/blender/editors/geometry/node_group_operator.cc @@ -7,10 +7,10 @@ */ #include "ED_curves.hh" -#include "ED_object.h" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_view3d.hh" #include "WM_api.hh" @@ -42,12 +42,12 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" -#include "ED_asset.h" -#include "ED_geometry.h" -#include "ED_mesh.h" +#include "ED_asset.hh" +#include "ED_geometry.hh" +#include "ED_mesh.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/gizmo_library/gizmo_draw_utils.cc b/source/blender/editors/gizmo_library/gizmo_draw_utils.cc index 79bdf3aa698..0238045a5cc 100644 --- a/source/blender/editors/gizmo_library/gizmo_draw_utils.cc +++ b/source/blender/editors/gizmo_library/gizmo_draw_utils.cc @@ -11,7 +11,7 @@ #include "BKE_context.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "GPU_batch.h" #include "GPU_immediate.h" diff --git a/source/blender/editors/gizmo_library/gizmo_library_presets.cc b/source/blender/editors/gizmo_library/gizmo_library_presets.cc index 0a73927644a..595210df5f5 100644 --- a/source/blender/editors/gizmo_library/gizmo_library_presets.cc +++ b/source/blender/editors/gizmo_library/gizmo_library_presets.cc @@ -23,10 +23,10 @@ #include "WM_types.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" /* own includes */ -#include "ED_gizmo_library.h" /* own include */ +#include "ED_gizmo_library.hh" /* own include */ #include "gizmo_library_intern.h" /* own include */ /* TODO: this is to be used by RNA. might move to ED_gizmo_library. */ diff --git a/source/blender/editors/gizmo_library/gizmo_library_utils.cc b/source/blender/editors/gizmo_library/gizmo_library_utils.cc index 34a487751a1..e6a489f112e 100644 --- a/source/blender/editors/gizmo_library/gizmo_library_utils.cc +++ b/source/blender/editors/gizmo_library/gizmo_library_utils.cc @@ -25,7 +25,7 @@ #include "WM_types.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "CLG_log.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc index 7d447d638f7..c80ebe1b61d 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/arrow3d_gizmo.cc @@ -39,11 +39,11 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_interface.h" +#include "UI_interface.hh" /* own includes */ #include "../gizmo_geometry.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/blank3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/blank3d_gizmo.cc index 3d2e9fcd7f5..5928ac2902f 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/blank3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/blank3d_gizmo.cc @@ -12,7 +12,7 @@ #include "BKE_context.h" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc index a202b03546b..7a3950cda44 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/button2d_gizmo.cc @@ -36,13 +36,13 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" /* own includes */ #include "../gizmo_geometry.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc index 10ca160b97c..2cc7f1509e3 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/cage2d_gizmo.cc @@ -36,9 +36,9 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" /* own includes */ #include "../gizmo_library_intern.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc index bd5dac6b416..a41685a73d9 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/cage3d_gizmo.cc @@ -33,9 +33,9 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" /* own includes */ #include "../gizmo_library_intern.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc index 4934547fff9..13220e13bfb 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/dial3d_gizmo.cc @@ -35,10 +35,10 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "ED_transform.h" -#include "ED_view3d.h" +#include "ED_transform.hh" +#include "ED_view3d.hh" /* own includes */ #include "../gizmo_geometry.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc index 31d52c5fa64..a84cf829946 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/move3d_gizmo.cc @@ -35,10 +35,10 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "ED_transform_snap_object_context.h" -#include "ED_view3d.h" +#include "ED_transform_snap_object_context.hh" +#include "ED_view3d.hh" /* own includes */ #include "../gizmo_geometry.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc index 26ad0b20de5..b71b6d3346d 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/primitive3d_gizmo.cc @@ -34,7 +34,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" /* own includes */ #include "../gizmo_library_intern.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc index 055c206b19b..76f71e6ce9c 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc @@ -21,12 +21,12 @@ #include "BKE_global.h" #include "BKE_main.h" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "ED_transform_snap_object_context.h" -#include "ED_view3d.h" +#include "ED_transform_snap_object_context.hh" +#include "ED_view3d.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/gpencil_legacy/annotate_draw.cc b/source/blender/editors/gpencil_legacy/annotate_draw.cc index 1bfc0fe672c..f13d5cd9757 100644 --- a/source/blender/editors/gpencil_legacy/annotate_draw.cc +++ b/source/blender/editors/gpencil_legacy/annotate_draw.cc @@ -42,13 +42,13 @@ #include "GPU_matrix.h" #include "GPU_state.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_view3d.h" +#include "ED_space_api.hh" +#include "ED_view3d.hh" -#include "UI_interface_icons.h" -#include "UI_resources.h" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" /* ************************************************** */ /* GREASE PENCIL DRAWING */ diff --git a/source/blender/editors/gpencil_legacy/annotate_paint.cc b/source/blender/editors/gpencil_legacy/annotate_paint.cc index d11d34e43fb..10abe2ae0fc 100644 --- a/source/blender/editors/gpencil_legacy/annotate_paint.cc +++ b/source/blender/editors/gpencil_legacy/annotate_paint.cc @@ -37,12 +37,12 @@ #include "DNA_scene_types.h" #include "DNA_windowmanager_types.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" -#include "ED_clip.h" -#include "ED_gpencil_legacy.h" +#include "ED_clip.hh" +#include "ED_gpencil_legacy.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "GPU_immediate.h" #include "GPU_immediate_util.h" diff --git a/source/blender/editors/gpencil_legacy/drawgpencil.cc b/source/blender/editors/gpencil_legacy/drawgpencil.cc index 63ff593140e..4aab2eac8bb 100644 --- a/source/blender/editors/gpencil_legacy/drawgpencil.cc +++ b/source/blender/editors/gpencil_legacy/drawgpencil.cc @@ -53,13 +53,13 @@ #include "GPU_state.h" #include "GPU_uniform_buffer.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_view3d.h" +#include "ED_space_api.hh" +#include "ED_view3d.hh" -#include "UI_interface_icons.h" -#include "UI_resources.h" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/gpencil_legacy/editaction_gpencil.cc b/source/blender/editors/gpencil_legacy/editaction_gpencil.cc index d3c85a94cb8..c3cffd9245c 100644 --- a/source/blender/editors/gpencil_legacy/editaction_gpencil.cc +++ b/source/blender/editors/gpencil_legacy/editaction_gpencil.cc @@ -24,10 +24,10 @@ #include "BKE_gpencil_legacy.h" #include "BKE_report.h" -#include "ED_anim_api.h" -#include "ED_gpencil_legacy.h" -#include "ED_keyframes_edit.h" -#include "ED_markers.h" +#include "ED_anim_api.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_keyframes_edit.hh" +#include "ED_markers.hh" #include "WM_api.hh" diff --git a/source/blender/editors/gpencil_legacy/gpencil_add_blank.cc b/source/blender/editors/gpencil_legacy/gpencil_add_blank.cc index 5b37cdf3421..a686d414406 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_add_blank.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_add_blank.cc @@ -24,7 +24,7 @@ #include "DEG_depsgraph.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" /* Definition of the most important info from a color */ struct ColorTemplate { diff --git a/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc b/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc index a3a063299b2..84ff361b69b 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_add_lineart.cc @@ -27,7 +27,7 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" /* Definition of the most important info from a color */ struct ColorTemplate { diff --git a/source/blender/editors/gpencil_legacy/gpencil_add_monkey.cc b/source/blender/editors/gpencil_legacy/gpencil_add_monkey.cc index 8c289df30ef..1fa3cbeea81 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_add_monkey.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_add_monkey.cc @@ -24,7 +24,7 @@ #include "DEG_depsgraph.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" void ED_gpencil_stroke_init_data(bGPDstroke *gps, const float *array, diff --git a/source/blender/editors/gpencil_legacy/gpencil_add_stroke.cc b/source/blender/editors/gpencil_legacy/gpencil_add_stroke.cc index cf68fe66e18..b87c8ddcb13 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_add_stroke.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_add_stroke.cc @@ -24,7 +24,7 @@ #include "DEG_depsgraph.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" /* Definition of the most important info from a color */ struct ColorTemplate { diff --git a/source/blender/editors/gpencil_legacy/gpencil_armature.cc b/source/blender/editors/gpencil_legacy/gpencil_armature.cc index 6a9c648a8fc..6b4977cae78 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_armature.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_armature.cc @@ -42,9 +42,9 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_gpencil_legacy.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_gpencil_legacy.hh" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ANIM_bone_collections.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_bake_animation.cc b/source/blender/editors/gpencil_legacy/gpencil_bake_animation.cc index 88f11709ea8..18ec19a1c27 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_bake_animation.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_bake_animation.cc @@ -40,8 +40,8 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "ED_gpencil_legacy.h" -#include "ED_transform_snap_object_context.h" +#include "ED_gpencil_legacy.hh" +#include "ED_transform_snap_object_context.hh" #include "gpencil_intern.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_convert.cc b/source/blender/editors/gpencil_legacy/gpencil_convert.cc index 7c127da03f2..7480ad52b19 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_convert.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_convert.cc @@ -54,7 +54,7 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -62,14 +62,14 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" -#include "ED_clip.h" -#include "ED_gpencil_legacy.h" -#include "ED_keyframing.h" -#include "ED_object.h" -#include "ED_view3d.h" +#include "ED_clip.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_keyframing.hh" +#include "ED_object.hh" +#include "ED_view3d.hh" #include "gpencil_intern.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_data.cc b/source/blender/editors/gpencil_legacy/gpencil_data.cc index 2663808fcb6..2692842fde0 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_data.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_data.cc @@ -53,8 +53,8 @@ #include "BKE_report.h" #include "BKE_scene.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -63,8 +63,8 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_gpencil_legacy.h" -#include "ED_object.h" +#include "ED_gpencil_legacy.hh" +#include "ED_object.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_edit.cc b/source/blender/editors/gpencil_legacy/gpencil_edit.cc index 22a41171228..50cf2a8c39f 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_edit.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_edit.cc @@ -52,8 +52,8 @@ #include "BKE_scene.h" #include "BKE_workspace.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_message.hh" @@ -64,18 +64,18 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" -#include "ED_armature.h" -#include "ED_gpencil_legacy.h" -#include "ED_keyframing.h" -#include "ED_object.h" -#include "ED_outliner.h" +#include "ED_armature.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_keyframing.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_space_api.h" -#include "ED_transform_snap_object_context.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_space_api.hh" +#include "ED_transform_snap_object_context.hh" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_edit_curve.cc b/source/blender/editors/gpencil_legacy/gpencil_edit_curve.cc index 58a4bd1e257..3ebb4a44972 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_edit_curve.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_edit_curve.cc @@ -30,7 +30,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_fill.cc b/source/blender/editors/gpencil_legacy/gpencil_fill.cc index 466ec59e417..54a8f448804 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_fill.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_fill.cc @@ -39,11 +39,11 @@ #include "BKE_report.h" #include "BKE_screen.h" -#include "ED_gpencil_legacy.h" -#include "ED_keyframing.h" +#include "ED_gpencil_legacy.hh" +#include "ED_keyframing.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_view3d.h" +#include "ED_space_api.hh" +#include "ED_view3d.hh" #include "RNA_access.h" #include "RNA_define.h" @@ -56,7 +56,7 @@ #include "GPU_matrix.h" #include "GPU_state.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/gpencil_legacy/gpencil_intern.h b/source/blender/editors/gpencil_legacy/gpencil_intern.h index 273af7c30b2..d69014073dc 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_intern.h +++ b/source/blender/editors/gpencil_legacy/gpencil_intern.h @@ -10,7 +10,7 @@ #include "DNA_vec_types.h" -#include "ED_numinput.h" +#include "ED_numinput.hh" #define DEPTH_INVALID 1.0f diff --git a/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc b/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc index d92058f5a6b..8ff7342868f 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_interpolate.cc @@ -38,8 +38,8 @@ #include "BKE_gpencil_legacy.h" #include "BKE_report.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -48,7 +48,7 @@ #include "RNA_define.h" #include "RNA_prototypes.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "ED_screen.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_merge.cc b/source/blender/editors/gpencil_legacy/gpencil_merge.cc index 70b1df57d40..e15e2b93551 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_merge.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_merge.cc @@ -32,7 +32,7 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "ED_screen.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_mesh.cc b/source/blender/editors/gpencil_legacy/gpencil_mesh.cc index 2a5623353b2..6d68d754a97 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_mesh.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_mesh.cc @@ -38,8 +38,8 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "ED_gpencil_legacy.h" -#include "ED_transform_snap_object_context.h" +#include "ED_gpencil_legacy.hh" +#include "ED_transform_snap_object_context.hh" #include "gpencil_intern.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_ops.cc b/source/blender/editors/gpencil_legacy/gpencil_ops.cc index eaf3245aa12..796b7272ed7 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_ops.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_ops.cc @@ -27,7 +27,7 @@ #include "RNA_access.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "gpencil_intern.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_ops_versioning.cc b/source/blender/editors/gpencil_legacy/gpencil_ops_versioning.cc index 680a4923d00..bccc4e73876 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_ops_versioning.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_ops_versioning.cc @@ -33,7 +33,7 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_paint.cc index 224623099df..82327798e46 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_paint.cc @@ -50,14 +50,14 @@ #include "BKE_screen.h" #include "BKE_tracking.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" -#include "ED_clip.h" -#include "ED_gpencil_legacy.h" -#include "ED_keyframing.h" -#include "ED_object.h" +#include "ED_clip.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_keyframing.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "GPU_immediate.h" #include "GPU_immediate_util.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_primitive.cc b/source/blender/editors/gpencil_legacy/gpencil_primitive.cc index b28f5318b8e..6714ff73ea7 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_primitive.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_primitive.cc @@ -45,8 +45,8 @@ #include "BKE_paint.hh" #include "BKE_report.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -55,12 +55,12 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_gpencil_legacy.h" -#include "ED_keyframing.h" -#include "ED_object.h" +#include "ED_gpencil_legacy.hh" +#include "ED_keyframing.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_view3d.h" +#include "ED_space_api.hh" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc index b57c290bf9b..527787fe6a6 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_sculpt_paint.cc @@ -47,7 +47,7 @@ #include "BKE_object_deform.h" #include "BKE_report.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -57,12 +57,12 @@ #include "RNA_enum_types.h" #include "RNA_prototypes.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" -#include "ED_gpencil_legacy.h" -#include "ED_keyframing.h" +#include "ED_gpencil_legacy.hh" +#include "ED_keyframing.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_select.cc b/source/blender/editors/gpencil_legacy/gpencil_select.cc index 91af25c9d12..50b480bc246 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_select.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_select.cc @@ -35,8 +35,8 @@ #include "BKE_material.h" #include "BKE_report.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -44,11 +44,11 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" -#include "ED_gpencil_legacy.h" -#include "ED_select_utils.h" -#include "ED_view3d.h" +#include "ED_gpencil_legacy.hh" +#include "ED_select_utils.hh" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc b/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc index 899bf3165d8..34dc6db2278 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc @@ -37,8 +37,8 @@ #include "IMB_imbuf_types.h" -#include "ED_gpencil_legacy.h" -#include "ED_object.h" +#include "ED_gpencil_legacy.hh" +#include "ED_object.hh" #include "gpencil_intern.h" #include "gpencil_trace.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_undo.cc b/source/blender/editors/gpencil_legacy/gpencil_undo.cc index 9071b4c0678..fdf608b810f 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_undo.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_undo.cc @@ -23,7 +23,7 @@ #include "BKE_gpencil_legacy.h" #include "BKE_undo_system.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/gpencil_legacy/gpencil_utils.cc b/source/blender/editors/gpencil_legacy/gpencil_utils.cc index d8b4340276d..aaba4446338 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_utils.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_utils.cc @@ -60,16 +60,16 @@ #include "RNA_enum_types.h" #include "RNA_prototypes.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" -#include "ED_clip.h" -#include "ED_gpencil_legacy.h" -#include "ED_object.h" +#include "ED_clip.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_transform_snap_object_context.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_transform_snap_object_context.hh" +#include "ED_view3d.hh" #include "GPU_immediate.h" #include "GPU_immediate_util.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_uv.cc b/source/blender/editors/gpencil_legacy/gpencil_uv.cc index 836c7b46521..56bda640acf 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_uv.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_uv.cc @@ -26,14 +26,14 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" -#include "ED_gpencil_legacy.h" -#include "ED_numinput.h" +#include "ED_gpencil_legacy.hh" +#include "ED_numinput.hh" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "ED_util.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc b/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc index 3b3f63a1460..9caedf1f131 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_vertex_ops.cc @@ -29,7 +29,7 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "ED_screen.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc index 4d49face431..40589b82873 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_vertex_paint.cc @@ -32,11 +32,11 @@ #include "RNA_define.h" #include "RNA_prototypes.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc index 35f0788175b..b22ff0a8b30 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_weight_paint.cc @@ -41,11 +41,11 @@ #include "RNA_define.h" #include "RNA_prototypes.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_add.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_add.cc index c3f872dc9d5..121de5aa1d6 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_add.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_add.cc @@ -19,7 +19,7 @@ #include "DNA_material_types.h" #include "DNA_scene_types.h" -#include "ED_grease_pencil.h" +#include "ED_grease_pencil.hh" namespace blender::ed::greasepencil { diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc index 01bfed39774..e4a2828bc0f 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc @@ -22,7 +22,7 @@ #include "DEG_depsgraph.h" #include "ED_curves.hh" -#include "ED_grease_pencil.h" +#include "ED_grease_pencil.hh" #include "ED_screen.hh" #include "WM_api.hh" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_frames.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_frames.cc index 233a1dd122d..a69991174fa 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_frames.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_frames.cc @@ -16,8 +16,8 @@ #include "DNA_scene_types.h" -#include "ED_grease_pencil.h" -#include "ED_keyframes_edit.h" +#include "ED_grease_pencil.hh" +#include "ED_keyframes_edit.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc index 989989a452b..a5cff26261a 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_layers.cc @@ -11,7 +11,7 @@ #include "DEG_depsgraph.h" -#include "ED_grease_pencil.h" +#include "ED_grease_pencil.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc index 7b707b1ae9f..da3d2931335 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc @@ -6,7 +6,7 @@ * \ingroup edgreasepencil */ -#include "ED_grease_pencil.h" +#include "ED_grease_pencil.hh" void ED_operatortypes_grease_pencil() { diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc index b5503e9d454..ad78805dc44 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_select.cc @@ -16,9 +16,9 @@ #include "DEG_depsgraph.h" #include "ED_curves.hh" -#include "ED_grease_pencil.h" +#include "ED_grease_pencil.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/include/BIF_glutil.h b/source/blender/editors/include/BIF_glutil.hh similarity index 99% rename from source/blender/editors/include/BIF_glutil.h rename to source/blender/editors/include/BIF_glutil.hh index 3820b8053b3..d72d9e94490 100644 --- a/source/blender/editors/include/BIF_glutil.h +++ b/source/blender/editors/include/BIF_glutil.hh @@ -10,10 +10,6 @@ #include "GPU_texture.h" -#ifdef __cplusplus -extern "C" { -#endif - struct rcti; struct ColorManagedDisplaySettings; @@ -211,7 +207,3 @@ int ED_draw_imbuf_method(const struct ImBuf *ibuf); * Don't move to `GPU_immediate_util.h` because this uses user-prefs and isn't very low level. */ void immDrawBorderCorners(unsigned int pos, const struct rcti *border, float zoomx, float zoomy); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_anim_api.h b/source/blender/editors/include/ED_anim_api.hh similarity index 99% rename from source/blender/editors/include/ED_anim_api.h rename to source/blender/editors/include/ED_anim_api.hh index cb377c2c097..dc46f17d4ce 100644 --- a/source/blender/editors/include/ED_anim_api.h +++ b/source/blender/editors/include/ED_anim_api.hh @@ -8,9 +8,8 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif +#include "BLI_sys_types.h" +#include "BLI_utildefines.h" struct AnimData; struct Depsgraph; @@ -27,6 +26,7 @@ struct ReportList; struct ScrArea; struct SpaceLink; struct View2D; +struct rctf; struct bContext; struct wmKeyConfig; @@ -283,7 +283,7 @@ typedef enum eAnim_Update_Flags { * \{ */ /* filtering flags - under what circumstances should a channel be returned */ -typedef enum eAnimFilter_Flags { +enum eAnimFilter_Flags { /** * Data which channel represents is fits the dope-sheet filters * (i.e. scene visibility criteria). @@ -335,7 +335,7 @@ typedef enum eAnimFilter_Flags { /** Ignore ONLYSEL flag from #bDopeSheet.filterflag (internal use only!) */ ANIMFILTER_TMP_IGNORE_ONLYSEL = (1u << 31), -} eAnimFilter_Flags; +}; ENUM_OPERATORS(eAnimFilter_Flags, ANIMFILTER_TMP_IGNORE_ONLYSEL); /** \} */ @@ -801,7 +801,7 @@ struct FCurve *ANIM_graph_context_fcurve(const struct bContext *C); /** Needed for abstraction between the graph editor and the NLA editor. */ typedef bool (*PanelTypePollFn)(const struct bContext *C, struct PanelType *pt); -/** Avoid including `UI_interface.h` here. */ +/** Avoid including `UI_interface.hh` here. */ typedef void (*uiListPanelIDFromDataFunc)(void *data_link, char *r_idname); /** @@ -1125,7 +1125,3 @@ void animviz_motionpath_compute_range(struct Object *ob, struct Scene *scene); void animviz_get_object_motionpaths(struct Object *ob, ListBase *targets); /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.hh similarity index 99% rename from source/blender/editors/include/ED_armature.h rename to source/blender/editors/include/ED_armature.hh index 83e1779ce3b..c7ab6ea7969 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.hh @@ -12,10 +12,6 @@ #include "BLI_listbase.h" -#ifdef __cplusplus -extern "C" { -#endif - struct Base; struct Bone; struct Depsgraph; @@ -373,7 +369,3 @@ void ED_mesh_deform_bind_callback(struct Object *object, float *vertexcos, int verts_num, float cagemat[4][4]); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_asset.h b/source/blender/editors/include/ED_asset.hh similarity index 71% rename from source/blender/editors/include/ED_asset.h rename to source/blender/editors/include/ED_asset.hh index 28c2883ab99..fb3af07a47e 100644 --- a/source/blender/editors/include/ED_asset.h +++ b/source/blender/editors/include/ED_asset.hh @@ -11,19 +11,11 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - /* Barely anything here. Just general editor level functions. Actual asset level code is in * dedicated headers. */ void ED_operatortypes_asset(void); -#ifdef __cplusplus -} -#endif - #include "../asset/ED_asset_catalog.h" #include "../asset/ED_asset_handle.h" #include "../asset/ED_asset_library.h" @@ -32,10 +24,7 @@ void ED_operatortypes_asset(void); #include "../asset/ED_asset_temp_id_consumer.h" #include "../asset/ED_asset_type.h" -/* C++ only headers. */ -#ifdef __cplusplus -# include "../asset/ED_asset_catalog.hh" -# include "../asset/ED_asset_filter.hh" -# include "../asset/ED_asset_import.hh" -# include "../asset/ED_asset_list.hh" -#endif +#include "../asset/ED_asset_catalog.hh" +#include "../asset/ED_asset_filter.hh" +#include "../asset/ED_asset_import.hh" +#include "../asset/ED_asset_list.hh" diff --git a/source/blender/editors/include/ED_buttons.h b/source/blender/editors/include/ED_buttons.hh similarity index 94% rename from source/blender/editors/include/ED_buttons.h rename to source/blender/editors/include/ED_buttons.hh index 89ef0ac7cdb..b645ccfa689 100644 --- a/source/blender/editors/include/ED_buttons.h +++ b/source/blender/editors/include/ED_buttons.hh @@ -8,13 +8,10 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct ScrArea; struct SpaceProperties; struct bContext; +struct PointerRNA; /** * Fills an array with the tab context values for the properties editor. -1 signals a separator. @@ -35,7 +32,3 @@ void ED_buttons_set_context(const struct bContext *C, struct SpaceProperties *sbuts, PointerRNA *ptr, int context); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_clip.h b/source/blender/editors/include/ED_clip.hh similarity index 98% rename from source/blender/editors/include/ED_clip.h rename to source/blender/editors/include/ED_clip.hh index dbb63487359..2e855b94b7a 100644 --- a/source/blender/editors/include/ED_clip.h +++ b/source/blender/editors/include/ED_clip.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct ARegion; struct ImBuf; struct Main; @@ -171,7 +167,3 @@ void ED_clip_view_lock_state_restore_no_jump(const struct bContext *C, /* `clip_ops.cc` */ void ED_operatormacros_clip(void); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_curve.h b/source/blender/editors/include/ED_curve.hh similarity index 98% rename from source/blender/editors/include/ED_curve.h rename to source/blender/editors/include/ED_curve.hh index 9df86cdc0a8..83ec32b27a3 100644 --- a/source/blender/editors/include/ED_curve.h +++ b/source/blender/editors/include/ED_curve.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct BPoint; struct Base; struct BezTriple; @@ -126,7 +122,3 @@ void ED_font_undosys_type(struct UndoType *ut); /* debug only */ void printknots(struct Object *obedit); #endif - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_curves.hh b/source/blender/editors/include/ED_curves.hh index d701c47e620..69200f033d3 100644 --- a/source/blender/editors/include/ED_curves.hh +++ b/source/blender/editors/include/ED_curves.hh @@ -16,7 +16,7 @@ #include "BLI_vector.hh" #include "BLI_vector_set.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" struct bContext; struct Curves; @@ -157,7 +157,7 @@ void apply_selection_operation_at_index(GMutableSpan selection, int index, eSele * (De)select all the curves. * * \param action: One of SEL_TOGGLE, SEL_SELECT, SEL_DESELECT, or SEL_INVERT. See - * "ED_select_utils.h". + * "ED_select_utils.hh". */ void select_all(bke::CurvesGeometry &curves, eAttrDomain selection_domain, int action); diff --git a/source/blender/editors/include/ED_curves_sculpt.h b/source/blender/editors/include/ED_curves_sculpt.hh similarity index 73% rename from source/blender/editors/include/ED_curves_sculpt.h rename to source/blender/editors/include/ED_curves_sculpt.hh index a443ba246e3..f2743d11312 100644 --- a/source/blender/editors/include/ED_curves_sculpt.h +++ b/source/blender/editors/include/ED_curves_sculpt.hh @@ -8,12 +8,4 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - void ED_operatortypes_sculpt_curves(void); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_file_indexer.h b/source/blender/editors/include/ED_file_indexer.hh similarity index 98% rename from source/blender/editors/include/ED_file_indexer.h rename to source/blender/editors/include/ED_file_indexer.hh index c70f2c82fa4..c1db19f2805 100644 --- a/source/blender/editors/include/ED_file_indexer.h +++ b/source/blender/editors/include/ED_file_indexer.hh @@ -10,10 +10,6 @@ #include "BLO_readfile.h" -#ifdef __cplusplus -extern "C" { -#endif - /** * File indexing for the file/asset browser. * @@ -138,7 +134,3 @@ void ED_file_indexer_entries_extend_from_datablock_infos( FileIndexerEntries *indexer_entries, struct LinkNode * /*BLODataBlockInfo*/ datablock_infos, int idcode); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_fileselect.h b/source/blender/editors/include/ED_fileselect.hh similarity index 99% rename from source/blender/editors/include/ED_fileselect.h rename to source/blender/editors/include/ED_fileselect.hh index 2c8ea76a43c..77c7b441547 100644 --- a/source/blender/editors/include/ED_fileselect.h +++ b/source/blender/editors/include/ED_fileselect.hh @@ -10,10 +10,6 @@ #include "DNA_uuid_types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct ARegion; struct FileAssetSelectParams; struct FileDirEntry; @@ -273,7 +269,3 @@ void ED_fsmenu_entry_set_name(struct FSMenuEntry *fsentry, const char *name); int ED_fsmenu_entry_get_icon(struct FSMenuEntry *fsentry); void ED_fsmenu_entry_set_icon(struct FSMenuEntry *fsentry, int icon); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_geometry.h b/source/blender/editors/include/ED_geometry.hh similarity index 88% rename from source/blender/editors/include/ED_geometry.h rename to source/blender/editors/include/ED_geometry.hh index a1ba3491512..4634537f778 100644 --- a/source/blender/editors/include/ED_geometry.h +++ b/source/blender/editors/include/ED_geometry.hh @@ -8,19 +8,13 @@ #pragma once +#include "BLI_string_ref.hh" + #include "DNA_customdata_types.h" #include "BKE_attribute.h" #include "BKE_screen.h" -#ifdef __cplusplus -# include "BLI_string_ref.hh" -#endif - -#ifdef __cplusplus -extern "C" { -#endif - struct Mesh; struct ReportList; @@ -37,11 +31,6 @@ bool ED_geometry_attribute_convert(struct Mesh *mesh, eCustomDataType dst_type, eAttrDomain dst_domain, ReportList *reports); -#ifdef __cplusplus -} -#endif - -#ifdef __cplusplus namespace blender::ed::geometry { @@ -53,5 +42,3 @@ void ui_template_node_operator_asset_menu_items(uiLayout &layout, void ui_template_node_operator_asset_root_items(uiLayout &layout, bContext &C); } // namespace blender::ed::geometry - -#endif diff --git a/source/blender/editors/include/ED_gizmo_library.h b/source/blender/editors/include/ED_gizmo_library.hh similarity index 99% rename from source/blender/editors/include/ED_gizmo_library.h rename to source/blender/editors/include/ED_gizmo_library.hh index cc0d340f30c..fa2c58fb6d1 100644 --- a/source/blender/editors/include/ED_gizmo_library.h +++ b/source/blender/editors/include/ED_gizmo_library.hh @@ -12,10 +12,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "DNA_scene_types.h" /* initialize gizmos */ @@ -254,7 +250,3 @@ void ED_gizmotypes_snap_3d_data_get(const struct bContext *C, float r_nor[3], int r_elem_index[3], eSnapMode *r_snap_elem); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_gizmo_utils.h b/source/blender/editors/include/ED_gizmo_utils.hh similarity index 93% rename from source/blender/editors/include/ED_gizmo_utils.h rename to source/blender/editors/include/ED_gizmo_utils.hh index 4a0fe1d5ff5..90fa0302a04 100644 --- a/source/blender/editors/include/ED_gizmo_utils.h +++ b/source/blender/editors/include/ED_gizmo_utils.hh @@ -10,10 +10,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct bContext; struct wmGizmoGroupType; @@ -29,7 +25,3 @@ bool ED_gizmo_poll_or_unlink_delayed_from_tool_ex(const struct bContext *C, /** Use this as poll function directly for: #wmGizmoGroupType.poll */ bool ED_gizmo_poll_or_unlink_delayed_from_tool(const struct bContext *C, struct wmGizmoGroupType *gzgt); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_gpencil_legacy.h b/source/blender/editors/include/ED_gpencil_legacy.hh similarity index 99% rename from source/blender/editors/include/ED_gpencil_legacy.h rename to source/blender/editors/include/ED_gpencil_legacy.hh index ce4bc42e993..1a2eadb114d 100644 --- a/source/blender/editors/include/ED_gpencil_legacy.h +++ b/source/blender/editors/include/ED_gpencil_legacy.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct ID; struct ListBase; struct PointerRNA; @@ -650,7 +646,3 @@ float ED_gpencil_radial_control_scale(struct bContext *C, struct Brush *brush, float initial_value, const int mval[2]); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_grease_pencil.h b/source/blender/editors/include/ED_grease_pencil.hh similarity index 93% rename from source/blender/editors/include/ED_grease_pencil.h rename to source/blender/editors/include/ED_grease_pencil.hh index 5e5fda35284..eef76ae44f3 100644 --- a/source/blender/editors/include/ED_grease_pencil.h +++ b/source/blender/editors/include/ED_grease_pencil.hh @@ -9,6 +9,12 @@ #pragma once #include "BKE_attribute.h" +#include "BKE_grease_pencil.hh" + +#include "BLI_generic_span.hh" +#include "BLI_math_matrix_types.hh" + +#include "ED_keyframes_edit.hh" struct bContext; @@ -19,10 +25,6 @@ struct KeyframeEditData; struct wmKeyConfig; -#ifdef __cplusplus -extern "C" { -#endif - enum { LAYER_REORDER_ABOVE, LAYER_REORDER_BELOW, @@ -46,19 +48,6 @@ eAttrDomain ED_grease_pencil_selection_domain_get(struct bContext *C); /** \} */ -#ifdef __cplusplus -} -#endif - -#ifdef __cplusplus - -# include "BKE_grease_pencil.hh" - -# include "BLI_generic_span.hh" -# include "BLI_math_matrix_types.hh" - -# include "ED_keyframes_edit.h" - namespace blender::ed::greasepencil { bool remove_all_selected_frames(GreasePencil &grease_pencil, bke::greasepencil::Layer &layer); @@ -111,4 +100,3 @@ int64_t ramer_douglas_peucker_simplify(IndexRange range, MutableSpan dst); } // namespace blender::ed::greasepencil -#endif diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.hh similarity index 99% rename from source/blender/editors/include/ED_image.h rename to source/blender/editors/include/ED_image.hh index 3eee6ee7b0b..b960b99501d 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.hh @@ -11,10 +11,6 @@ #include "DNA_listBase.h" #include "DNA_space_types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct ARegion; struct ImBuf; struct Image; @@ -225,7 +221,3 @@ ListBase ED_image_filesel_detect_sequences(struct Main *bmain, bool ED_image_tools_paint_poll(struct bContext *C); void ED_paint_cursor_start(struct Paint *p, bool (*poll)(struct bContext *C)); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_info.h b/source/blender/editors/include/ED_info.hh similarity index 95% rename from source/blender/editors/include/ED_info.h rename to source/blender/editors/include/ED_info.hh index 82e6ced5c1f..02fbe26d91b 100644 --- a/source/blender/editors/include/ED_info.h +++ b/source/blender/editors/include/ED_info.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct Main; struct wmWindowManager; @@ -42,7 +38,3 @@ void ED_info_draw_stats(struct Main *bmain, int x, int *y, int height); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_keyframes_draw.h b/source/blender/editors/include/ED_keyframes_draw.hh similarity index 98% rename from source/blender/editors/include/ED_keyframes_draw.h rename to source/blender/editors/include/ED_keyframes_draw.hh index d31330fc8a3..b5a9a211f34 100644 --- a/source/blender/editors/include/ED_keyframes_draw.h +++ b/source/blender/editors/include/ED_keyframes_draw.hh @@ -8,9 +8,7 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif +#include "BLI_sys_types.h" struct AnimData; struct AnimKeylistDrawList; @@ -119,7 +117,3 @@ void draw_masklay_channel(struct AnimKeylistDrawList *draw_list, struct AnimKeylistDrawList *ED_keylist_draw_list_create(void); void ED_keylist_draw_list_flush(struct AnimKeylistDrawList *draw_list, struct View2D *v2d); void ED_keylist_draw_list_free(struct AnimKeylistDrawList *draw_list); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_keyframes_edit.h b/source/blender/editors/include/ED_keyframes_edit.hh similarity index 99% rename from source/blender/editors/include/ED_keyframes_edit.h rename to source/blender/editors/include/ED_keyframes_edit.hh index 45f57ca33d8..d67a73a2f6f 100644 --- a/source/blender/editors/include/ED_keyframes_edit.h +++ b/source/blender/editors/include/ED_keyframes_edit.hh @@ -8,11 +8,7 @@ #pragma once -#include "ED_anim_api.h" /* for enum eAnimFilter_Flags */ - -#ifdef __cplusplus -extern "C" { -#endif +#include "ED_anim_api.hh" /* for enum eAnimFilter_Flags */ struct BezTriple; struct ButterworthCoefficients; @@ -498,7 +494,3 @@ eKeyPasteError paste_animedit_keys(struct bAnimContext *ac, /* ************************************************ */ /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_keyframes_keylist.h b/source/blender/editors/include/ED_keyframes_keylist.hh similarity index 99% rename from source/blender/editors/include/ED_keyframes_keylist.h rename to source/blender/editors/include/ED_keyframes_keylist.hh index 3a6e26532a4..da59e1652c0 100644 --- a/source/blender/editors/include/ED_keyframes_keylist.h +++ b/source/blender/editors/include/ED_keyframes_keylist.hh @@ -10,10 +10,6 @@ #include "BLI_range.h" -#ifdef __cplusplus -extern "C" { -#endif - struct AnimData; struct CacheFile; struct FCurve; @@ -200,7 +196,3 @@ bool actkeyblock_is_valid(const ActKeyColumn *ac); /** Checks if #ActKeyColumn can be used as a block (i.e. drawn/used to detect "holds"). */ int actkeyblock_get_valid_hold(const ActKeyColumn *ac); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_keyframing.h b/source/blender/editors/include/ED_keyframing.hh similarity index 99% rename from source/blender/editors/include/ED_keyframing.h rename to source/blender/editors/include/ED_keyframing.hh index 8f723ee7de2..f01816c4c4b 100644 --- a/source/blender/editors/include/ED_keyframing.h +++ b/source/blender/editors/include/ED_keyframing.hh @@ -11,10 +11,6 @@ #include "DNA_anim_types.h" #include "RNA_types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct ID; struct ListBase; struct Main; @@ -681,7 +677,3 @@ bool ED_autokeyframe_property(struct bContext *C, #define ANIM_KS_WHOLE_CHARACTER_SELECTED_ID "WholeCharacterSelected" /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_lattice.h b/source/blender/editors/include/ED_lattice.hh similarity index 100% rename from source/blender/editors/include/ED_lattice.h rename to source/blender/editors/include/ED_lattice.hh diff --git a/source/blender/editors/include/ED_markers.h b/source/blender/editors/include/ED_markers.hh similarity index 97% rename from source/blender/editors/include/ED_markers.h rename to source/blender/editors/include/ED_markers.hh index 93b40fb7580..1a602830731 100644 --- a/source/blender/editors/include/ED_markers.h +++ b/source/blender/editors/include/ED_markers.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct Scene; struct TimeMarker; struct bAnimContext; @@ -108,7 +104,3 @@ void ED_keymap_marker(struct wmKeyConfig *keyconf); void debug_markers_print_list(struct ListBase *markers); /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_mask.h b/source/blender/editors/include/ED_mask.hh similarity index 98% rename from source/blender/editors/include/ED_mask.h rename to source/blender/editors/include/ED_mask.hh index d5567dc53fc..e1591ad1ae7 100644 --- a/source/blender/editors/include/ED_mask.h +++ b/source/blender/editors/include/ED_mask.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #include "DNA_mask_types.h" struct Depsgraph; @@ -187,6 +183,3 @@ void paste_gpdata(void); void mirror_masklayer_frames(struct MaskLayer *mask_layer, short mode); #endif -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_mball.h b/source/blender/editors/include/ED_mball.hh similarity index 97% rename from source/blender/editors/include/ED_mball.h rename to source/blender/editors/include/ED_mball.hh index 711e6ff78d3..97fa32be500 100644 --- a/source/blender/editors/include/ED_mball.h +++ b/source/blender/editors/include/ED_mball.hh @@ -8,9 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif struct Base; struct MetaElem; @@ -74,6 +71,3 @@ void ED_mball_undosys_type(struct UndoType *ut); #define MBALLSEL_RADIUS (1u << 31) #define MBALLSEL_ANY (MBALLSEL_STIFF | MBALLSEL_RADIUS) -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.hh similarity index 99% rename from source/blender/editors/include/ED_mesh.h rename to source/blender/editors/include/ED_mesh.hh index 0068880207c..27abeb513b9 100644 --- a/source/blender/editors/include/ED_mesh.h +++ b/source/blender/editors/include/ED_mesh.hh @@ -8,9 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif #include "BLI_compiler_attrs.h" @@ -716,6 +713,3 @@ void EDBM_mesh_elem_index_ensure_multi(struct Object **objects, uint objects_len #define USE_LOOPSLIDE_HACK -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_node.hh b/source/blender/editors/include/ED_node.hh index bd8b504b0fd..b681daf502f 100644 --- a/source/blender/editors/include/ED_node.hh +++ b/source/blender/editors/include/ED_node.hh @@ -5,7 +5,7 @@ #pragma once #include "BLI_vector_set.hh" -#include "ED_node.h" +#include "ED_node_c.hh" struct SpaceNode; struct ARegion; diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node_c.hh similarity index 98% rename from source/blender/editors/include/ED_node.h rename to source/blender/editors/include/ED_node_c.hh index 732d5fb8225..68d3d6f5791 100644 --- a/source/blender/editors/include/ED_node.h +++ b/source/blender/editors/include/ED_node_c.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct ID; struct Main; struct Scene; @@ -25,12 +21,12 @@ struct bNodeTree; struct bNodeTreeType; struct bNodeType; -typedef enum { +enum NodeBorder { NODE_TOP = 1, NODE_BOTTOM = 2, NODE_LEFT = 4, NODE_RIGHT = 8, -} NodeBorder; +}; ENUM_OPERATORS(NodeBorder, NODE_RIGHT) #define NODE_GRID_STEP_SIZE U.widget_unit /* Based on the grid nodes snap to. */ @@ -171,7 +167,3 @@ bool ED_space_node_color_sample(struct Main *bmain, struct ARegion *region, const int mval[2], float r_col[3]); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_numinput.h b/source/blender/editors/include/ED_numinput.hh similarity index 97% rename from source/blender/editors/include/ED_numinput.h rename to source/blender/editors/include/ED_numinput.hh index cc4bb2e6e7a..5f3e211e124 100644 --- a/source/blender/editors/include/ED_numinput.h +++ b/source/blender/editors/include/ED_numinput.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - #define NUM_STR_REP_LEN 64 #define NUM_MAX_ELEMENTS 3 @@ -106,7 +102,3 @@ bool user_string_to_number(bContext *C, char **r_error); /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.hh similarity index 99% rename from source/blender/editors/include/ED_object.h rename to source/blender/editors/include/ED_object.hh index 23dba4617e3..02fe223ba19 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.hh @@ -13,10 +13,6 @@ #include "DNA_userdef_enums.h" #include "DNA_windowmanager_types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct Base; struct Depsgraph; struct EnumPropertyItem; @@ -740,7 +736,3 @@ void ED_object_data_xform_by_mat4(struct XFormObjectData *xod, const float mat[4 void ED_object_data_xform_restore(struct XFormObjectData *xod); void ED_object_data_xform_tag_update(struct XFormObjectData *xod); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_outliner.h b/source/blender/editors/include/ED_outliner.hh similarity index 95% rename from source/blender/editors/include/ED_outliner.h rename to source/blender/editors/include/ED_outliner.hh index ecb33967e40..6be3e68fb6e 100644 --- a/source/blender/editors/include/ED_outliner.h +++ b/source/blender/editors/include/ED_outliner.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct Base; struct ListBase; struct SpaceOutliner; @@ -52,7 +48,3 @@ void ED_outliner_select_sync_from_outliner(struct bContext *C, * Copy sync select dirty flag from window manager to all outliners to be synced lazily on draw. */ void ED_outliner_select_sync_flag_outliners(const struct bContext *C); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_paint.h b/source/blender/editors/include/ED_paint.hh similarity index 98% rename from source/blender/editors/include/ED_paint.h rename to source/blender/editors/include/ED_paint.hh index f773671797a..18019f15dd4 100644 --- a/source/blender/editors/include/ED_paint.h +++ b/source/blender/editors/include/ED_paint.hh @@ -10,10 +10,6 @@ #include "DNA_view3d_enums.h" -#ifdef __cplusplus -extern "C" { -#endif - struct bToolRef; struct PaintModeSettings; struct ImBuf; @@ -132,7 +128,3 @@ bool ED_paint_tool_use_canvas(struct bContext *C, struct bToolRef *tref); /* Store the last used tool in the sculpt session. */ void ED_paint_tool_update_sticky_shading_color(struct bContext *C, struct Object *ob); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_particle.h b/source/blender/editors/include/ED_particle.hh similarity index 97% rename from source/blender/editors/include/ED_particle.h rename to source/blender/editors/include/ED_particle.hh index ccfbced6035..68b90164f62 100644 --- a/source/blender/editors/include/ED_particle.h +++ b/source/blender/editors/include/ED_particle.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct Object; struct PTCacheEdit; struct ParticleEditSettings; @@ -73,7 +69,3 @@ bool PE_deselect_all_visible(struct bContext *C); /** Export for ED_undo_sys. */ void ED_particle_undosys_type(struct UndoType *ut); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_physics.h b/source/blender/editors/include/ED_physics.hh similarity index 94% rename from source/blender/editors/include/ED_physics.h rename to source/blender/editors/include/ED_physics.hh index 4f54cc20531..0ffa99e582b 100644 --- a/source/blender/editors/include/ED_physics.h +++ b/source/blender/editors/include/ED_physics.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct ReportList; struct bContext; struct wmKeyConfig; @@ -46,7 +42,3 @@ void ED_rigidbody_constraint_remove(struct Main *bmain, struct Scene *scene, str /* operators */ void ED_operatortypes_physics(void); void ED_keymap_physics(struct wmKeyConfig *keyconf); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_render.h b/source/blender/editors/include/ED_render.hh similarity index 98% rename from source/blender/editors/include/ED_render.h rename to source/blender/editors/include/ED_render.hh index b26214b150a..be645229e46 100644 --- a/source/blender/editors/include/ED_render.h +++ b/source/blender/editors/include/ED_render.hh @@ -11,10 +11,6 @@ #include "DNA_ID_enums.h" #include "DNA_vec_types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct DEGEditorUpdateContext; struct Depsgraph; struct ID; @@ -109,7 +105,3 @@ void ED_preview_draw(const struct bContext *C, void *idp, void *parentp, void *s void ED_render_clear_mtex_copybuf(void); void ED_render_internal_init(void); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_scene.h b/source/blender/editors/include/ED_scene.hh similarity index 100% rename from source/blender/editors/include/ED_scene.h rename to source/blender/editors/include/ED_scene.hh diff --git a/source/blender/editors/include/ED_screen_types.h b/source/blender/editors/include/ED_screen_types.hh similarity index 98% rename from source/blender/editors/include/ED_screen_types.h rename to source/blender/editors/include/ED_screen_types.hh index ca7c418e86f..58ed70683c0 100644 --- a/source/blender/editors/include/ED_screen_types.h +++ b/source/blender/editors/include/ED_screen_types.hh @@ -8,9 +8,9 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif +#include "BLI_rect.h" + +struct ARegion; /* ----------------------------------------------------- */ @@ -122,7 +122,3 @@ enum { */ AZONE_REGION_SCROLL, }; - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_sculpt.h b/source/blender/editors/include/ED_sculpt.hh similarity index 97% rename from source/blender/editors/include/ED_sculpt.h rename to source/blender/editors/include/ED_sculpt.hh index d77d3ab985a..7b4ba4b8004 100644 --- a/source/blender/editors/include/ED_sculpt.h +++ b/source/blender/editors/include/ED_sculpt.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct ARegion; struct Object; struct UndoType; @@ -67,7 +63,3 @@ int ED_sculpt_face_sets_active_update_and_get(struct bContext *C, * if there is no multi-res sculpt active regular undo is used. */ void ED_sculpt_undo_push_multires_mesh_begin(struct bContext *C, const char *str); void ED_sculpt_undo_push_multires_mesh_end(struct bContext *C, const char *str); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_select_utils.h b/source/blender/editors/include/ED_select_utils.hh similarity index 97% rename from source/blender/editors/include/ED_select_utils.h rename to source/blender/editors/include/ED_select_utils.hh index 5dfe19023c2..d0ef866b4bd 100644 --- a/source/blender/editors/include/ED_select_utils.h +++ b/source/blender/editors/include/ED_select_utils.hh @@ -10,10 +10,6 @@ #include "BLI_compiler_attrs.h" -#ifdef __cplusplus -extern "C" { -#endif - struct KDTree_1d; struct wmOperatorType; @@ -114,7 +110,3 @@ void ED_select_pick_params_from_operator(struct PointerRNA *ptr, struct SelectPi */ const char *ED_select_pick_get_name(struct wmOperatorType *ot, PointerRNA *ptr); const char *ED_select_circle_get_name(struct wmOperatorType *ot, PointerRNA *ptr); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_sequencer.h b/source/blender/editors/include/ED_sequencer.hh similarity index 95% rename from source/blender/editors/include/ED_sequencer.h rename to source/blender/editors/include/ED_sequencer.hh index 44fa705fc66..55d191a61d1 100644 --- a/source/blender/editors/include/ED_sequencer.h +++ b/source/blender/editors/include/ED_sequencer.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct Scene; struct Sequence; struct SpaceSeq; @@ -52,7 +48,3 @@ void ED_operatormacros_sequencer(void); Sequence *ED_sequencer_special_preview_get(void); void ED_sequencer_special_preview_set(struct bContext *C, const int mval[2]); void ED_sequencer_special_preview_clear(void); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_sound.h b/source/blender/editors/include/ED_sound.hh similarity index 73% rename from source/blender/editors/include/ED_sound.h rename to source/blender/editors/include/ED_sound.hh index 63419cb3a1b..7a51569ad10 100644 --- a/source/blender/editors/include/ED_sound.h +++ b/source/blender/editors/include/ED_sound.hh @@ -8,12 +8,4 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - void ED_operatortypes_sound(void); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_space_api.h b/source/blender/editors/include/ED_space_api.hh similarity index 97% rename from source/blender/editors/include/ED_space_api.h rename to source/blender/editors/include/ED_space_api.hh index 71f7be86ed0..20e9aabc9c2 100644 --- a/source/blender/editors/include/ED_space_api.h +++ b/source/blender/editors/include/ED_space_api.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct ARegionType; struct bContext; @@ -75,7 +71,3 @@ bool ED_region_draw_cb_exit(struct ARegionType *art, void *handle); void ED_region_draw_cb_remove_by_type(struct ARegionType *art, void *draw_fn, void (*free)(void *)); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_spreadsheet.h b/source/blender/editors/include/ED_spreadsheet.hh similarity index 77% rename from source/blender/editors/include/ED_spreadsheet.h rename to source/blender/editors/include/ED_spreadsheet.hh index 4eae8d6efa2..ff0a090e5df 100644 --- a/source/blender/editors/include/ED_spreadsheet.h +++ b/source/blender/editors/include/ED_spreadsheet.hh @@ -7,12 +7,4 @@ struct ID; struct SpaceSpreadsheet; -#ifdef __cplusplus -extern "C" { -#endif - struct ID *ED_spreadsheet_get_current_id(const struct SpaceSpreadsheet *sspreadsheet); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_text.h b/source/blender/editors/include/ED_text.hh similarity index 94% rename from source/blender/editors/include/ED_text.h rename to source/blender/editors/include/ED_text.hh index f5f0b3416a1..55cada9031c 100644 --- a/source/blender/editors/include/ED_text.h +++ b/source/blender/editors/include/ED_text.hh @@ -8,9 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif struct ARegion; struct SpaceText; @@ -48,6 +45,3 @@ const char *ED_text_format_comment_line_prefix(struct Text *text); bool ED_text_is_syntax_highlight_supported(struct Text *text); -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_time_scrub_ui.h b/source/blender/editors/include/ED_time_scrub_ui.hh similarity index 93% rename from source/blender/editors/include/ED_time_scrub_ui.h rename to source/blender/editors/include/ED_time_scrub_ui.hh index 2efba040219..af59f4b41db 100644 --- a/source/blender/editors/include/ED_time_scrub_ui.h +++ b/source/blender/editors/include/ED_time_scrub_ui.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct bContext; struct bDopeSheet; struct wmEvent; @@ -32,7 +28,3 @@ void ED_time_scrub_channel_search_draw(const struct bContext *C, struct ARegion *region, struct bDopeSheet *dopesheet); void ED_time_scrub_region_rect_get(const struct ARegion *region, struct rcti *rect); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_transform.h b/source/blender/editors/include/ED_transform.hh similarity index 99% rename from source/blender/editors/include/ED_transform.h rename to source/blender/editors/include/ED_transform.hh index 4a23a36a036..6a0015411ec 100644 --- a/source/blender/editors/include/ED_transform.h +++ b/source/blender/editors/include/ED_transform.hh @@ -8,9 +8,7 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif +#include "BLI_sys_types.h" /* ******************* Registration Function ********************** */ @@ -224,7 +222,3 @@ bool ED_transform_snap_sequencer_to_closest_strip_calc(struct Scene *scene, float *r_snap_frame); void ED_draw_sequencer_snap_point(struct bContext *C, float snap_point); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_transform_snap_object_context.h b/source/blender/editors/include/ED_transform_snap_object_context.hh similarity index 99% rename from source/blender/editors/include/ED_transform_snap_object_context.h rename to source/blender/editors/include/ED_transform_snap_object_context.hh index 4549e27bb64..16b4a29faba 100644 --- a/source/blender/editors/include/ED_transform_snap_object_context.h +++ b/source/blender/editors/include/ED_transform_snap_object_context.hh @@ -12,10 +12,6 @@ //#define DEBUG_SNAP_TIME -#ifdef __cplusplus -extern "C" { -#endif - struct BMEdge; struct BMFace; struct BMVert; @@ -201,7 +197,3 @@ void ED_transform_snap_object_time_average_print(void); #else # define ED_transform_snap_object_time_average_print() void(0) #endif - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_transverts.h b/source/blender/editors/include/ED_transverts.hh similarity index 96% rename from source/blender/editors/include/ED_transverts.h rename to source/blender/editors/include/ED_transverts.hh index 60ecee30955..2471678911e 100644 --- a/source/blender/editors/include/ED_transverts.h +++ b/source/blender/editors/include/ED_transverts.hh @@ -8,10 +8,6 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - struct Object; struct bContext; @@ -67,7 +63,3 @@ enum { /** Calculated when #TM_CALC_NORMALS is set, avoid nonzero check. */ TX_VERT_USE_NORMAL = (1 << 2), }; - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_undo.h b/source/blender/editors/include/ED_undo.hh similarity index 98% rename from source/blender/editors/include/ED_undo.h rename to source/blender/editors/include/ED_undo.hh index 7f2e27c13c8..caf924f430a 100644 --- a/source/blender/editors/include/ED_undo.h +++ b/source/blender/editors/include/ED_undo.hh @@ -9,10 +9,7 @@ #pragma once #include "BLI_compiler_attrs.h" - -#ifdef __cplusplus -extern "C" { -#endif +#include "BLI_sys_types.h" struct Base; struct CLG_LogRef; @@ -130,7 +127,3 @@ struct MemFile *ED_undosys_stack_memfile_get_active(struct UndoStack *ustack); * (currently we only do that in #MemFileWriteData when writing a new step). */ void ED_undosys_stack_memfile_id_changed_tag(struct UndoStack *ustack, struct ID *id); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_userpref.h b/source/blender/editors/include/ED_userpref.hh similarity index 73% rename from source/blender/editors/include/ED_userpref.h rename to source/blender/editors/include/ED_userpref.hh index aaedd2c50e1..ebc5ad826bc 100644 --- a/source/blender/editors/include/ED_userpref.h +++ b/source/blender/editors/include/ED_userpref.hh @@ -8,12 +8,4 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - void ED_operatortypes_userpref(void); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_util_imbuf.h b/source/blender/editors/include/ED_util_imbuf.hh similarity index 91% rename from source/blender/editors/include/ED_util_imbuf.h rename to source/blender/editors/include/ED_util_imbuf.hh index 58c88189ecf..33a1096f8d1 100644 --- a/source/blender/editors/include/ED_util_imbuf.h +++ b/source/blender/editors/include/ED_util_imbuf.hh @@ -11,10 +11,6 @@ #include "BLI_compiler_attrs.h" #include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif - struct ARegion; struct bContext; struct wmEvent; @@ -28,7 +24,3 @@ int ED_imbuf_sample_invoke(struct bContext *C, struct wmOperator *op, const stru int ED_imbuf_sample_modal(struct bContext *C, struct wmOperator *op, const struct wmEvent *event); void ED_imbuf_sample_cancel(struct bContext *C, struct wmOperator *op); bool ED_imbuf_sample_poll(struct bContext *C); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.hh similarity index 99% rename from source/blender/editors/include/ED_uvedit.h rename to source/blender/editors/include/ED_uvedit.hh index 8df91465f82..4f7637d427e 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.hh @@ -10,10 +10,6 @@ #include "BKE_customdata.h" -#ifdef __cplusplus -extern "C" { -#endif - struct ARegion; struct ARegionType; struct BMEditMesh; @@ -367,7 +363,3 @@ int bm_mesh_calc_uv_islands(const Scene *scene, bool uv_coords_isect_udim(const struct Image *image, const int udim_grid[2], const float coords[2]); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.hh similarity index 99% rename from source/blender/editors/include/ED_view3d.h rename to source/blender/editors/include/ED_view3d.hh index 45cca579734..f09743d184b 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.hh @@ -12,10 +12,6 @@ #include "BLI_utildefines.h" #include "DNA_scene_types.h" -#ifdef __cplusplus -extern "C" { -#endif - /* ********* exports for space_view3d/ module ********** */ struct ARegion; struct BMEdge; @@ -1388,7 +1384,3 @@ bool ED_view3d_is_region_xr_mirror_active(const struct wmWindowManager *wm, const struct View3D *v3d, const struct ARegion *region); #endif - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/ED_view3d_offscreen.h b/source/blender/editors/include/ED_view3d_offscreen.hh similarity index 98% rename from source/blender/editors/include/ED_view3d_offscreen.h rename to source/blender/editors/include/ED_view3d_offscreen.hh index e137748aded..54fca53ecca 100644 --- a/source/blender/editors/include/ED_view3d_offscreen.h +++ b/source/blender/editors/include/ED_view3d_offscreen.hh @@ -13,10 +13,6 @@ #include "IMB_imbuf_types.h" -#ifdef __cplusplus -extern "C" { -#endif - /* ********* exports for space_view3d/ module for offscreen rendering ********** */ struct ARegion; struct Depsgraph; @@ -107,7 +103,3 @@ struct ImBuf *ED_view3d_draw_offscreen_imbuf_simple(struct Depsgraph *depsgraph, const char *viewname, struct GPUOffScreen *ofs, char err_out[256]); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/UI_grid_view.hh b/source/blender/editors/include/UI_grid_view.hh index ffd46343a06..6e8018db061 100644 --- a/source/blender/editors/include/UI_grid_view.hh +++ b/source/blender/editors/include/UI_grid_view.hh @@ -16,7 +16,7 @@ #include "BLI_vector.hh" #include "UI_abstract_view.hh" -#include "UI_resources.h" +#include "UI_resources.hh" struct bContext; struct uiBlock; diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.hh similarity index 100% rename from source/blender/editors/include/UI_icons.h rename to source/blender/editors/include/UI_icons.hh diff --git a/source/blender/editors/include/UI_interface.hh b/source/blender/editors/include/UI_interface.hh index 8dbe3cf3c8a..4c0bcab26e7 100644 --- a/source/blender/editors/include/UI_interface.hh +++ b/source/blender/editors/include/UI_interface.hh @@ -15,7 +15,9 @@ #include "BLI_string_ref.hh" #include "BLI_vector.hh" -#include "UI_resources.h" +#include "UI_resources.hh" + +#include "UI_interface_c.hh" namespace blender::nodes::geo_eval_log { struct GeometryAttributeInfo; diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface_c.hh similarity index 99% rename from source/blender/editors/include/UI_interface.h rename to source/blender/editors/include/UI_interface_c.hh index 8cc1f7e41e6..5e048100c38 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface_c.hh @@ -17,7 +17,7 @@ #include "BLI_string_utf8_symbols.h" #include "BLI_sys_types.h" /* size_t */ #include "BLI_utildefines.h" -#include "UI_interface_icons.h" +#include "UI_interface_icons.hh" #include "WM_types.hh" #ifdef __cplusplus diff --git a/source/blender/editors/include/UI_interface_icons.h b/source/blender/editors/include/UI_interface_icons.hh similarity index 95% rename from source/blender/editors/include/UI_interface_icons.h rename to source/blender/editors/include/UI_interface_icons.hh index 89279a364ee..0ce0a76b4bd 100644 --- a/source/blender/editors/include/UI_interface_icons.h +++ b/source/blender/editors/include/UI_interface_icons.hh @@ -8,12 +8,10 @@ #pragma once -/* Required for #eIconSizes which can't be forward declared if this file is included in C++. */ -#include "DNA_ID_enums.h" +#include "BLI_sys_types.h" -#ifdef __cplusplus -extern "C" { -#endif +/* Required for #eIconSizes. */ +#include "DNA_ID_enums.h" struct Collection; struct ID; @@ -134,7 +132,3 @@ int UI_icon_color_from_collection(const struct Collection *collection); void UI_icon_text_overlay_init_from_count(struct IconTextOverlay *text_overlay, const int icon_indicator_number); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/UI_resources.h b/source/blender/editors/include/UI_resources.hh similarity index 99% rename from source/blender/editors/include/UI_resources.h rename to source/blender/editors/include/UI_resources.hh index 75bc05880c8..4378987c8cb 100644 --- a/source/blender/editors/include/UI_resources.h +++ b/source/blender/editors/include/UI_resources.hh @@ -18,7 +18,7 @@ typedef enum { /* ui */ -#include "UI_icons.h" +#include "UI_icons.hh" BIFICONID_LAST, } BIFIconID; @@ -27,10 +27,6 @@ typedef enum { /* use to denote intentionally unset theme color */ #define TH_UNDEFINED -1 -#ifdef __cplusplus -extern "C" { -#endif - typedef enum ThemeColorID { TH_REDALERT, @@ -497,7 +493,3 @@ int UI_ThemeMenuShadowWidth(void); const unsigned char *UI_ThemeGetColorPtr(struct bTheme *btheme, int spacetype, int colorid); void UI_make_axis_color(const unsigned char src_col[3], unsigned char dst_col[3], char axis); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/include/UI_tree_view.hh b/source/blender/editors/include/UI_tree_view.hh index a53213d6db9..746b994aa65 100644 --- a/source/blender/editors/include/UI_tree_view.hh +++ b/source/blender/editors/include/UI_tree_view.hh @@ -20,7 +20,7 @@ #include "BLI_vector.hh" #include "UI_abstract_view.hh" -#include "UI_resources.h" +#include "UI_resources.hh" struct bContext; struct uiBlock; diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.hh similarity index 99% rename from source/blender/editors/include/UI_view2d.h rename to source/blender/editors/include/UI_view2d.hh index 77feb5adae6..2407a45a198 100644 --- a/source/blender/editors/include/UI_view2d.h +++ b/source/blender/editors/include/UI_view2d.hh @@ -13,10 +13,6 @@ #include "BLI_compiler_attrs.h" #include "BLI_rect.h" -#ifdef __cplusplus -extern "C" { -#endif - /* -------------------------------------------------------------------- */ /** \name General Defines * \{ */ @@ -610,7 +606,3 @@ void UI_view2d_edge_pan_operator_init(struct bContext *C, struct wmOperator *op); /** \} */ - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_color.cc b/source/blender/editors/interface/eyedroppers/eyedropper_color.cc index 38a378e879a..484608ba38c 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_color.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_color.cc @@ -32,7 +32,7 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "IMB_colormanagement.h" #include "IMB_imbuf_types.h" @@ -44,9 +44,9 @@ #include "interface_intern.hh" -#include "ED_clip.h" -#include "ED_image.h" -#include "ED_node.h" +#include "ED_clip.hh" +#include "ED_image.hh" +#include "ED_node.hh" #include "ED_screen.hh" #include "RE_pipeline.h" diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc b/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc index 640f66df4aa..3345f0c83eb 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_colorband.cc @@ -29,7 +29,7 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc b/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc index d92994a99a7..4c49f9ac357 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc @@ -29,15 +29,15 @@ #include "RNA_access.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "ED_outliner.h" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_view3d.h" +#include "ED_space_api.hh" +#include "ED_view3d.hh" #include "eyedropper_intern.hh" #include "interface_intern.hh" diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc b/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc index aec2e18ed6a..28a1fccc29e 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc @@ -30,14 +30,14 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_view3d.h" +#include "ED_space_api.hh" +#include "ED_view3d.hh" #include "eyedropper_intern.hh" #include "interface_intern.hh" diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc b/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc index 00a0c4ddaf9..f85498b62f6 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_driver.cc @@ -27,12 +27,12 @@ #include "RNA_define.h" #include "RNA_path.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "ED_keyframing.h" +#include "ED_keyframing.hh" #include "eyedropper_intern.hh" #include "interface_intern.hh" diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc b/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc index 7772440480d..bb1321aeedc 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_gpencil_color.cc @@ -30,7 +30,7 @@ #include "BKE_paint.hh" #include "BKE_report.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "IMB_colormanagement.h" @@ -40,9 +40,9 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "ED_screen.hh" -#include "ED_undo.h" +#include "ED_undo.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc b/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc index 04d5adb555f..7b48338c046 100644 --- a/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc +++ b/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc @@ -15,7 +15,7 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index be2654dc60e..77a8c493f97 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -43,7 +43,7 @@ #include "BKE_screen.h" #include "BKE_unit.h" -#include "ED_asset.h" +#include "ED_asset.hh" #include "GPU_matrix.h" #include "GPU_state.h" @@ -51,10 +51,9 @@ #include "BLF_api.h" #include "BLT_translation.h" -#include "UI_interface.h" #include "UI_interface.hh" -#include "UI_interface_icons.h" -#include "UI_view2d.h" +#include "UI_interface_icons.hh" +#include "UI_view2d.hh" #include "IMB_imbuf.h" @@ -68,7 +67,7 @@ # include "BPY_extern_run.h" #endif -#include "ED_numinput.h" +#include "ED_numinput.hh" #include "ED_screen.hh" #include "IMB_colormanagement.h" @@ -4222,7 +4221,7 @@ static uiBut *ui_def_but(uiBlock *block, but->flag |= UI_BUT_DISABLED; } - /* keep track of UI_interface.h */ + /* keep track of UI_interface.hh */ if (ELEM(but->type, UI_BTYPE_BLOCK, UI_BTYPE_BUT, diff --git a/source/blender/editors/interface/interface_align.cc b/source/blender/editors/interface/interface_align.cc index fc3493ce06c..6f8fec089bf 100644 --- a/source/blender/editors/interface/interface_align.cc +++ b/source/blender/editors/interface/interface_align.cc @@ -13,7 +13,7 @@ #include "BLI_math.h" #include "BLI_rect.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "interface_intern.hh" diff --git a/source/blender/editors/interface/interface_anim.cc b/source/blender/editors/interface/interface_anim.cc index ac0935e59ad..850dde591a2 100644 --- a/source/blender/editors/interface/interface_anim.cc +++ b/source/blender/editors/interface/interface_anim.cc @@ -32,9 +32,9 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_keyframing.h" +#include "ED_keyframing.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "RNA_access.h" #include "RNA_path.h" diff --git a/source/blender/editors/interface/interface_context_menu.cc b/source/blender/editors/interface/interface_context_menu.cc index de01bbedf4e..90ce4c99403 100644 --- a/source/blender/editors/interface/interface_context_menu.cc +++ b/source/blender/editors/interface/interface_context_menu.cc @@ -26,11 +26,10 @@ #include "BKE_idprop.h" #include "BKE_screen.h" -#include "ED_asset.h" -#include "ED_keyframing.h" +#include "ED_asset.hh" +#include "ED_keyframing.hh" #include "ED_screen.hh" -#include "UI_interface.h" #include "UI_interface.hh" #include "interface_intern.hh" diff --git a/source/blender/editors/interface/interface_context_path.cc b/source/blender/editors/interface/interface_context_path.cc index 825190ee667..b44a326b1d1 100644 --- a/source/blender/editors/interface/interface_context_path.cc +++ b/source/blender/editors/interface/interface_context_path.cc @@ -14,9 +14,8 @@ #include "ED_screen.hh" -#include "UI_interface.h" #include "UI_interface.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "RNA_prototypes.h" diff --git a/source/blender/editors/interface/interface_drag.cc b/source/blender/editors/interface/interface_drag.cc index b0f9a34589f..7f5bfa1f49c 100644 --- a/source/blender/editors/interface/interface_drag.cc +++ b/source/blender/editors/interface/interface_drag.cc @@ -6,7 +6,7 @@ * \ingroup edinterface */ -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" diff --git a/source/blender/editors/interface/interface_draw.cc b/source/blender/editors/interface/interface_draw.cc index 268446ea627..b94bec0a467 100644 --- a/source/blender/editors/interface/interface_draw.cc +++ b/source/blender/editors/interface/interface_draw.cc @@ -33,7 +33,7 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "BLF_api.h" @@ -46,7 +46,7 @@ #include "GPU_shader_shared.h" #include "GPU_state.h" -#include "UI_interface.h" +#include "UI_interface.hh" /* own include */ #include "interface_intern.hh" diff --git a/source/blender/editors/interface/interface_dropboxes.cc b/source/blender/editors/interface/interface_dropboxes.cc index 7c3d67a257c..3f7e02de344 100644 --- a/source/blender/editors/interface/interface_dropboxes.cc +++ b/source/blender/editors/interface/interface_dropboxes.cc @@ -21,7 +21,6 @@ #include "WM_api.hh" -#include "UI_interface.h" #include "UI_interface.hh" using namespace blender::ui; diff --git a/source/blender/editors/interface/interface_handlers.cc b/source/blender/editors/interface/interface_handlers.cc index ed47b440d6b..f8beac16bc4 100644 --- a/source/blender/editors/interface/interface_handlers.cc +++ b/source/blender/editors/interface/interface_handlers.cc @@ -53,10 +53,10 @@ #include "IMB_colormanagement.h" #include "ED_screen.hh" -#include "ED_undo.h" +#include "ED_undo.hh" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "BLF_api.h" diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc index 39e8b2ee19a..7e109956b23 100644 --- a/source/blender/editors/interface/interface_icons.cc +++ b/source/blender/editors/interface/interface_icons.cc @@ -50,15 +50,15 @@ #include "IMB_imbuf_types.h" #include "IMB_thumbs.h" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "ED_datafiles.h" -#include "ED_keyframes_draw.h" -#include "ED_keyframes_keylist.h" -#include "ED_render.h" +#include "ED_keyframes_draw.hh" +#include "ED_keyframes_keylist.hh" +#include "ED_render.hh" -#include "UI_interface.h" -#include "UI_interface_icons.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -161,7 +161,7 @@ static const IconType icontypes[] = { # define DEF_ICON_VECTOR(name) {ICON_TYPE_VECTOR, 0}, # define DEF_ICON_COLOR(name) {ICON_TYPE_COLOR_TEXTURE, 0}, # define DEF_ICON_BLANK(name) {ICON_TYPE_BLANK, 0}, -# include "UI_icons.h" +# include "UI_icons.hh" }; /* **************************************************** */ diff --git a/source/blender/editors/interface/interface_icons_event.cc b/source/blender/editors/interface/interface_icons_event.cc index 9fd22ef67a7..dd751717965 100644 --- a/source/blender/editors/interface/interface_icons_event.cc +++ b/source/blender/editors/interface/interface_icons_event.cc @@ -18,7 +18,7 @@ #include "BLF_api.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "interface_intern.hh" diff --git a/source/blender/editors/interface/interface_intern.hh b/source/blender/editors/interface/interface_intern.hh index 5985452f204..09e0548300f 100644 --- a/source/blender/editors/interface/interface_intern.hh +++ b/source/blender/editors/interface/interface_intern.hh @@ -16,8 +16,8 @@ #include "DNA_listBase.h" #include "RNA_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" struct AnimationEvalContext; struct ARegion; @@ -82,7 +82,7 @@ enum { * active button can be polled on non-active buttons to (e.g. for disabling). */ UI_BUT_ACTIVE_OVERRIDE = (1 << 7), - /* WARNING: rest of #uiBut.flag in UI_interface.h */ + /* WARNING: rest of #uiBut.flag in UI_interface.hh */ }; /** #uiBut.pie_dir */ @@ -855,7 +855,7 @@ struct uiPopupBlockHandle { /* `interface_region_tooltip.cc` */ -/* exposed as public API in UI_interface.h */ +/* exposed as public API in UI_interface.hh */ /* `interface_region_color_picker.cc` */ diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc index f3658e4614b..49266a08411 100644 --- a/source/blender/editors/interface/interface_layout.cc +++ b/source/blender/editors/interface/interface_layout.cc @@ -37,7 +37,7 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc index a4bf804db64..c0fe93fc55c 100644 --- a/source/blender/editors/interface/interface_ops.cc +++ b/source/blender/editors/interface/interface_ops.cc @@ -48,7 +48,6 @@ #include "RNA_prototypes.h" #include "RNA_types.h" -#include "UI_interface.h" #include "UI_interface.hh" #include "interface_intern.hh" @@ -56,17 +55,17 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_object.h" -#include "ED_paint.h" +#include "ED_object.hh" +#include "ED_paint.hh" /* for Copy As Driver */ -#include "ED_keyframing.h" +#include "ED_keyframing.hh" /* only for UI_OT_editsource */ #include "BKE_main.h" #include "BLI_ghash.h" #include "ED_screen.hh" -#include "ED_text.h" +#include "ED_text.hh" using namespace blender::ui; diff --git a/source/blender/editors/interface/interface_panel.cc b/source/blender/editors/interface/interface_panel.cc index ff51aeb686c..8a37cb0c168 100644 --- a/source/blender/editors/interface/interface_panel.cc +++ b/source/blender/editors/interface/interface_panel.cc @@ -39,10 +39,10 @@ #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "GPU_batch_presets.h" #include "GPU_immediate.h" diff --git a/source/blender/editors/interface/interface_query.cc b/source/blender/editors/interface/interface_query.cc index caa20910fcd..7af1b6187b5 100644 --- a/source/blender/editors/interface/interface_query.cc +++ b/source/blender/editors/interface/interface_query.cc @@ -16,8 +16,8 @@ #include "DNA_screen_types.h" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "RNA_access.h" diff --git a/source/blender/editors/interface/interface_region_color_picker.cc b/source/blender/editors/interface/interface_region_color_picker.cc index 5dadf4dde66..46ba16305c8 100644 --- a/source/blender/editors/interface/interface_region_color_picker.cc +++ b/source/blender/editors/interface/interface_region_color_picker.cc @@ -27,7 +27,7 @@ #include "RNA_access.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/interface/interface_region_hud.cc b/source/blender/editors/interface/interface_region_hud.cc index 492224ef8be..405d1bff79a 100644 --- a/source/blender/editors/interface/interface_region_hud.cc +++ b/source/blender/editors/interface/interface_region_hud.cc @@ -28,13 +28,13 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "BLT_translation.h" #include "ED_screen.hh" -#include "ED_undo.h" +#include "ED_undo.hh" #include "GPU_framebuffer.h" #include "interface_intern.hh" diff --git a/source/blender/editors/interface/interface_region_menu_pie.cc b/source/blender/editors/interface/interface_region_menu_pie.cc index 43e0b27f629..102671178bc 100644 --- a/source/blender/editors/interface/interface_region_menu_pie.cc +++ b/source/blender/editors/interface/interface_region_menu_pie.cc @@ -31,7 +31,7 @@ #include "RNA_path.h" #include "RNA_prototypes.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/interface/interface_region_menu_popup.cc b/source/blender/editors/interface/interface_region_menu_popup.cc index 8da1820eb37..f2c97a0d20e 100644 --- a/source/blender/editors/interface/interface_region_menu_popup.cc +++ b/source/blender/editors/interface/interface_region_menu_popup.cc @@ -34,7 +34,7 @@ #include "RNA_access.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/interface/interface_region_popover.cc b/source/blender/editors/interface/interface_region_popover.cc index 510e60213a7..4b42d2a6b56 100644 --- a/source/blender/editors/interface/interface_region_popover.cc +++ b/source/blender/editors/interface/interface_region_popover.cc @@ -44,7 +44,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "interface_intern.hh" #include "interface_regions_intern.hh" diff --git a/source/blender/editors/interface/interface_region_popup.cc b/source/blender/editors/interface/interface_region_popup.cc index 76b9270c14c..806ab243ce6 100644 --- a/source/blender/editors/interface/interface_region_popup.cc +++ b/source/blender/editors/interface/interface_region_popup.cc @@ -27,7 +27,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/interface/interface_region_search.cc b/source/blender/editors/interface/interface_region_search.cc index 114a9cc50e5..408052b5e25 100644 --- a/source/blender/editors/interface/interface_region_search.cc +++ b/source/blender/editors/interface/interface_region_search.cc @@ -33,9 +33,9 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_view2d.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/interface/interface_region_tooltip.cc b/source/blender/editors/interface/interface_region_tooltip.cc index 72dc6c4ac01..b25e360395c 100644 --- a/source/blender/editors/interface/interface_region_tooltip.cc +++ b/source/blender/editors/interface/interface_region_tooltip.cc @@ -42,7 +42,7 @@ #include "RNA_access.h" #include "RNA_path.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLF_api.h" #include "BLT_translation.h" diff --git a/source/blender/editors/interface/interface_style.cc b/source/blender/editors/interface/interface_style.cc index 5b94e2e2962..6f8ed198e37 100644 --- a/source/blender/editors/interface/interface_style.cc +++ b/source/blender/editors/interface/interface_style.cc @@ -27,7 +27,7 @@ #include "BLT_translation.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "ED_datafiles.h" diff --git a/source/blender/editors/interface/interface_template_asset_view.cc b/source/blender/editors/interface/interface_template_asset_view.cc index 03966405dec..7d4cd739b97 100644 --- a/source/blender/editors/interface/interface_template_asset_view.cc +++ b/source/blender/editors/interface/interface_template_asset_view.cc @@ -19,7 +19,7 @@ #include "BLO_readfile.h" -#include "ED_asset.h" +#include "ED_asset.hh" #include "ED_screen.hh" #include "MEM_guardedalloc.h" @@ -27,7 +27,6 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" #include "UI_interface.hh" #include "WM_api.hh" diff --git a/source/blender/editors/interface/interface_template_attribute_search.cc b/source/blender/editors/interface/interface_template_attribute_search.cc index ca2d40f7c98..91bd718e3c4 100644 --- a/source/blender/editors/interface/interface_template_attribute_search.cc +++ b/source/blender/editors/interface/interface_template_attribute_search.cc @@ -20,9 +20,8 @@ #include "NOD_geometry_nodes_log.hh" -#include "UI_interface.h" #include "UI_interface.hh" -#include "UI_resources.h" +#include "UI_resources.hh" using blender::nodes::geo_eval_log::GeometryAttributeInfo; diff --git a/source/blender/editors/interface/interface_template_grease_pencil_layer_tree.cc b/source/blender/editors/interface/interface_template_grease_pencil_layer_tree.cc index 66a5e721426..3577e3bb17e 100644 --- a/source/blender/editors/interface/interface_template_grease_pencil_layer_tree.cc +++ b/source/blender/editors/interface/interface_template_grease_pencil_layer_tree.cc @@ -11,14 +11,13 @@ #include "BLT_translation.h" -#include "UI_interface.h" #include "UI_interface.hh" #include "UI_tree_view.hh" #include "RNA_access.h" #include "RNA_prototypes.h" -#include "ED_undo.h" +#include "ED_undo.hh" #include diff --git a/source/blender/editors/interface/interface_template_light_linking.cc b/source/blender/editors/interface/interface_template_light_linking.cc index 3695d07959f..1a3cdcf1dbe 100644 --- a/source/blender/editors/interface/interface_template_light_linking.cc +++ b/source/blender/editors/interface/interface_template_light_linking.cc @@ -6,7 +6,7 @@ * \ingroup edinterface */ -#include "UI_interface.h" +#include "UI_interface.hh" #include #include @@ -22,14 +22,13 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" #include "UI_interface.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "UI_tree_view.hh" #include "WM_api.hh" -#include "ED_undo.h" +#include "ED_undo.hh" namespace blender::ui::light_linking { diff --git a/source/blender/editors/interface/interface_template_list.cc b/source/blender/editors/interface/interface_template_list.cc index a31e60aef94..6c5dd082a72 100644 --- a/source/blender/editors/interface/interface_template_list.cc +++ b/source/blender/editors/interface/interface_template_list.cc @@ -21,7 +21,7 @@ #include "BLT_translation.h" -#include "ED_asset.h" +#include "ED_asset.hh" #include "ED_screen.hh" #include "MEM_guardedalloc.h" @@ -29,9 +29,8 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" #include "UI_interface.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "WM_api.hh" diff --git a/source/blender/editors/interface/interface_template_search_menu.cc b/source/blender/editors/interface/interface_template_search_menu.cc index 8e8f35242bd..c19dbc71d77 100644 --- a/source/blender/editors/interface/interface_template_search_menu.cc +++ b/source/blender/editors/interface/interface_template_search_menu.cc @@ -48,7 +48,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "interface_intern.hh" /* For key-map item access. */ diff --git a/source/blender/editors/interface/interface_template_search_operator.cc b/source/blender/editors/interface/interface_template_search_operator.cc index 8ea0b13d193..a641dab25d8 100644 --- a/source/blender/editors/interface/interface_template_search_operator.cc +++ b/source/blender/editors/interface/interface_template_search_operator.cc @@ -29,7 +29,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "interface_intern.hh" /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/interface/interface_templates.cc b/source/blender/editors/interface/interface_templates.cc index a6116cbb86f..23762c9bc49 100644 --- a/source/blender/editors/interface/interface_templates.cc +++ b/source/blender/editors/interface/interface_templates.cc @@ -72,12 +72,12 @@ #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "ED_fileselect.h" -#include "ED_info.h" -#include "ED_object.h" -#include "ED_render.h" +#include "ED_fileselect.hh" +#include "ED_info.hh" +#include "ED_object.hh" +#include "ED_render.hh" #include "ED_screen.hh" -#include "ED_undo.h" +#include "ED_undo.hh" #include "RE_engine.h" @@ -87,9 +87,9 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_view2d.hh" #include "interface_intern.hh" #include "PIL_time.h" diff --git a/source/blender/editors/interface/interface_utils.cc b/source/blender/editors/interface/interface_utils.cc index d358b6c61dd..cb234194fe2 100644 --- a/source/blender/editors/interface/interface_utils.cc +++ b/source/blender/editors/interface/interface_utils.cc @@ -35,10 +35,10 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/interface/interface_widgets.cc b/source/blender/editors/interface/interface_widgets.cc index 165dedcf1c2..cb43bc26f4f 100644 --- a/source/blender/editors/interface/interface_widgets.cc +++ b/source/blender/editors/interface/interface_widgets.cc @@ -29,9 +29,9 @@ #include "ED_node.hh" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_view2d.hh" #include "interface_intern.hh" diff --git a/source/blender/editors/interface/resources.cc b/source/blender/editors/interface/resources.cc index ae6323b51dd..d3a268f39ea 100644 --- a/source/blender/editors/interface/resources.cc +++ b/source/blender/editors/interface/resources.cc @@ -31,8 +31,8 @@ #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_interface_icons.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" #include "GPU_framebuffer.h" #include "interface_intern.hh" diff --git a/source/blender/editors/interface/view2d.cc b/source/blender/editors/interface/view2d.cc index 1b5bd796ab3..83843484700 100644 --- a/source/blender/editors/interface/view2d.cc +++ b/source/blender/editors/interface/view2d.cc @@ -41,8 +41,8 @@ #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "interface_intern.hh" #include "view2d_intern.hh" @@ -228,7 +228,7 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy) do_init = (v2d->flag & V2D_IS_INIT) == 0; - /* see eView2D_CommonViewTypes in UI_view2d.h for available view presets */ + /* see eView2D_CommonViewTypes in UI_view2d.hh for available view presets */ switch (type) { /* 'standard view' - optimum setup for 'standard' view behavior, * that should be used new views as basis for their diff --git a/source/blender/editors/interface/view2d_draw.cc b/source/blender/editors/interface/view2d_draw.cc index 39353b0cd62..c491335ace7 100644 --- a/source/blender/editors/interface/view2d_draw.cc +++ b/source/blender/editors/interface/view2d_draw.cc @@ -31,8 +31,8 @@ #include "BLF_api.h" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "interface_intern.hh" diff --git a/source/blender/editors/interface/view2d_edge_pan.cc b/source/blender/editors/interface/view2d_edge_pan.cc index f7392735aa9..618eb5fba7e 100644 --- a/source/blender/editors/interface/view2d_edge_pan.cc +++ b/source/blender/editors/interface/view2d_edge_pan.cc @@ -20,8 +20,8 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/interface/view2d_gizmo_navigate.cc b/source/blender/editors/interface/view2d_gizmo_navigate.cc index 5bc56d4cdec..9de1c136a60 100644 --- a/source/blender/editors/interface/view2d_gizmo_navigate.cc +++ b/source/blender/editors/interface/view2d_gizmo_navigate.cc @@ -11,11 +11,11 @@ #include "BKE_context.h" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "MEM_guardedalloc.h" @@ -24,7 +24,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" /* -------------------------------------------------------------------- */ /** \name View2D Navigation Gizmo Group diff --git a/source/blender/editors/interface/view2d_ops.cc b/source/blender/editors/interface/view2d_ops.cc index f356bde66ed..f7974217157 100644 --- a/source/blender/editors/interface/view2d_ops.cc +++ b/source/blender/editors/interface/view2d_ops.cc @@ -28,8 +28,8 @@ #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "PIL_time.h" /* USER_ZOOM_CONTINUE */ diff --git a/source/blender/editors/interface/views/abstract_view_item.cc b/source/blender/editors/interface/views/abstract_view_item.cc index aad067dc327..6bc9bb77814 100644 --- a/source/blender/editors/interface/views/abstract_view_item.cc +++ b/source/blender/editors/interface/views/abstract_view_item.cc @@ -13,7 +13,7 @@ #include "WM_api.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "interface_intern.hh" #include "UI_abstract_view.hh" diff --git a/source/blender/editors/interface/views/grid_view.cc b/source/blender/editors/interface/views/grid_view.cc index 23c8e8c7471..04a40431db1 100644 --- a/source/blender/editors/interface/views/grid_view.cc +++ b/source/blender/editors/interface/views/grid_view.cc @@ -15,7 +15,7 @@ #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "interface_intern.hh" #include "UI_grid_view.hh" diff --git a/source/blender/editors/interface/views/tree_view.cc b/source/blender/editors/interface/views/tree_view.cc index 142b8cd3f96..28218961b38 100644 --- a/source/blender/editors/interface/views/tree_view.cc +++ b/source/blender/editors/interface/views/tree_view.cc @@ -17,7 +17,7 @@ #include "interface_intern.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/io/io_alembic.cc b/source/blender/editors/io/io_alembic.cc index cfd377386f8..87411bd40e3 100644 --- a/source/blender/editors/io/io_alembic.cc +++ b/source/blender/editors/io/io_alembic.cc @@ -40,11 +40,11 @@ # include "RNA_define.h" # include "RNA_enum_types.h" -# include "ED_fileselect.h" -# include "ED_object.h" +# include "ED_fileselect.hh" +# include "ED_object.hh" -# include "UI_interface.h" -# include "UI_resources.h" +# include "UI_interface.hh" +# include "UI_resources.hh" # include "WM_api.hh" # include "WM_types.hh" diff --git a/source/blender/editors/io/io_cache.cc b/source/blender/editors/io/io_cache.cc index 7a23756a502..288e65ee449 100644 --- a/source/blender/editors/io/io_cache.cc +++ b/source/blender/editors/io/io_cache.cc @@ -26,7 +26,7 @@ #include "DEG_depsgraph.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/io/io_collada.cc b/source/blender/editors/io/io_collada.cc index 63461e658ed..9478b060a23 100644 --- a/source/blender/editors/io/io_collada.cc +++ b/source/blender/editors/io/io_collada.cc @@ -20,14 +20,14 @@ # include "DEG_depsgraph.h" -# include "ED_fileselect.h" -# include "ED_object.h" +# include "ED_fileselect.hh" +# include "ED_object.hh" # include "RNA_access.h" # include "RNA_define.h" -# include "UI_interface.h" -# include "UI_resources.h" +# include "UI_interface.hh" +# include "UI_resources.hh" # include "WM_api.hh" # include "WM_types.hh" diff --git a/source/blender/editors/io/io_gpencil_export.cc b/source/blender/editors/io/io_gpencil_export.cc index bd217a73353..017b8b0df31 100644 --- a/source/blender/editors/io/io_gpencil_export.cc +++ b/source/blender/editors/io/io_gpencil_export.cc @@ -21,13 +21,13 @@ # include "BLT_translation.h" -# include "ED_fileselect.h" +# include "ED_fileselect.hh" # include "RNA_access.h" # include "RNA_define.h" -# include "UI_interface.h" -# include "UI_resources.h" +# include "UI_interface.hh" +# include "UI_resources.hh" # include "WM_api.hh" # include "WM_types.hh" diff --git a/source/blender/editors/io/io_gpencil_import.cc b/source/blender/editors/io/io_gpencil_import.cc index 3cbf545082e..c95ec6e1a57 100644 --- a/source/blender/editors/io/io_gpencil_import.cc +++ b/source/blender/editors/io/io_gpencil_import.cc @@ -24,8 +24,8 @@ # include "RNA_access.h" # include "RNA_define.h" -# include "UI_interface.h" -# include "UI_resources.h" +# include "UI_interface.hh" +# include "UI_resources.hh" # include "WM_api.hh" # include "WM_types.hh" @@ -33,7 +33,7 @@ # include "DEG_depsgraph.h" # include "DEG_depsgraph_query.h" -# include "ED_gpencil_legacy.h" +# include "ED_gpencil_legacy.hh" # include "io_gpencil.hh" diff --git a/source/blender/editors/io/io_obj.cc b/source/blender/editors/io/io_obj.cc index aa0050f854d..26c0cb0f955 100644 --- a/source/blender/editors/io/io_obj.cc +++ b/source/blender/editors/io/io_obj.cc @@ -20,16 +20,16 @@ # include "BLT_translation.h" -# include "ED_fileselect.h" -# include "ED_outliner.h" +# include "ED_fileselect.hh" +# include "ED_outliner.hh" # include "MEM_guardedalloc.h" # include "RNA_access.h" # include "RNA_define.h" -# include "UI_interface.h" -# include "UI_resources.h" +# include "UI_interface.hh" +# include "UI_resources.hh" # include "WM_api.hh" # include "WM_types.hh" diff --git a/source/blender/editors/io/io_ply_ops.cc b/source/blender/editors/io/io_ply_ops.cc index 2955d6a0c15..7ab221a73b3 100644 --- a/source/blender/editors/io/io_ply_ops.cc +++ b/source/blender/editors/io/io_ply_ops.cc @@ -17,8 +17,8 @@ # include "DNA_space_types.h" -# include "ED_fileselect.h" -# include "ED_outliner.h" +# include "ED_fileselect.hh" +# include "ED_outliner.hh" # include "RNA_access.h" # include "RNA_define.h" @@ -27,8 +27,8 @@ # include "MEM_guardedalloc.h" -# include "UI_interface.h" -# include "UI_resources.h" +# include "UI_interface.hh" +# include "UI_resources.hh" # include "DEG_depsgraph.h" diff --git a/source/blender/editors/io/io_stl_ops.cc b/source/blender/editors/io/io_stl_ops.cc index 58906f6e1e9..c8f3764d240 100644 --- a/source/blender/editors/io/io_stl_ops.cc +++ b/source/blender/editors/io/io_stl_ops.cc @@ -16,7 +16,7 @@ # include "DNA_space_types.h" -# include "ED_outliner.h" +# include "ED_outliner.hh" # include "RNA_access.h" # include "RNA_define.h" diff --git a/source/blender/editors/io/io_usd.cc b/source/blender/editors/io/io_usd.cc index 8dbc780c93d..51f6c8a7c40 100644 --- a/source/blender/editors/io/io_usd.cc +++ b/source/blender/editors/io/io_usd.cc @@ -23,8 +23,8 @@ # include "BLT_translation.h" -# include "ED_fileselect.h" -# include "ED_object.h" +# include "ED_fileselect.hh" +# include "ED_object.hh" # include "MEM_guardedalloc.h" @@ -33,8 +33,8 @@ # include "RNA_enum_types.h" -# include "UI_interface.h" -# include "UI_resources.h" +# include "UI_interface.hh" +# include "UI_resources.hh" # include "WM_api.hh" # include "WM_types.hh" diff --git a/source/blender/editors/lattice/editlattice_select.cc b/source/blender/editors/lattice/editlattice_select.cc index 21a1c82a083..8151815968f 100644 --- a/source/blender/editors/lattice/editlattice_select.cc +++ b/source/blender/editors/lattice/editlattice_select.cc @@ -31,11 +31,11 @@ #include "BKE_layer.h" #include "BKE_report.h" -#include "ED_lattice.h" -#include "ED_object.h" +#include "ED_lattice.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_view3d.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/lattice/editlattice_undo.cc b/source/blender/editors/lattice/editlattice_undo.cc index e3403596541..f75190c18ac 100644 --- a/source/blender/editors/lattice/editlattice_undo.cc +++ b/source/blender/editors/lattice/editlattice_undo.cc @@ -32,9 +32,9 @@ #include "DEG_depsgraph.h" -#include "ED_lattice.h" -#include "ED_object.h" -#include "ED_undo.h" +#include "ED_lattice.hh" +#include "ED_object.hh" +#include "ED_undo.hh" #include "ED_util.hh" #include "WM_api.hh" diff --git a/source/blender/editors/lattice/lattice_ops.cc b/source/blender/editors/lattice/lattice_ops.cc index f8d74b9e909..e8b0328af60 100644 --- a/source/blender/editors/lattice/lattice_ops.cc +++ b/source/blender/editors/lattice/lattice_ops.cc @@ -10,7 +10,7 @@ #include "WM_api.hh" -#include "ED_lattice.h" +#include "ED_lattice.hh" #include "ED_screen.hh" #include "lattice_intern.h" diff --git a/source/blender/editors/mask/mask_add.cc b/source/blender/editors/mask/mask_add.cc index e4ed58122dc..64787b5652a 100644 --- a/source/blender/editors/mask/mask_add.cc +++ b/source/blender/editors/mask/mask_add.cc @@ -23,9 +23,9 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_mask.h" /* own include */ +#include "ED_mask.hh" /* own include */ #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mask/mask_draw.cc b/source/blender/editors/mask/mask_draw.cc index 01b450447cf..41c71c7f91b 100644 --- a/source/blender/editors/mask/mask_draw.cc +++ b/source/blender/editors/mask/mask_draw.cc @@ -21,21 +21,21 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "ED_clip.h" -#include "ED_mask.h" /* own include */ +#include "ED_clip.hh" +#include "ED_mask.hh" /* own include */ #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "GPU_immediate.h" #include "GPU_matrix.h" #include "GPU_shader.h" #include "GPU_state.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/mask/mask_edit.cc b/source/blender/editors/mask/mask_edit.cc index 2f12e69052a..d1775ef853b 100644 --- a/source/blender/editors/mask/mask_edit.cc +++ b/source/blender/editors/mask/mask_edit.cc @@ -14,10 +14,10 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" -#include "ED_image.h" -#include "ED_mask.h" /* own include */ -#include "ED_sequencer.h" +#include "ED_clip.hh" +#include "ED_image.hh" +#include "ED_mask.hh" /* own include */ +#include "ED_sequencer.hh" #include "RNA_access.h" diff --git a/source/blender/editors/mask/mask_editaction.cc b/source/blender/editors/mask/mask_editaction.cc index b8adad618ae..1c6e1517a12 100644 --- a/source/blender/editors/mask/mask_editaction.cc +++ b/source/blender/editors/mask/mask_editaction.cc @@ -23,10 +23,10 @@ #include "BKE_fcurve.h" #include "BKE_mask.h" -#include "ED_anim_api.h" -#include "ED_keyframes_edit.h" -#include "ED_markers.h" -#include "ED_mask.h" /* own include */ +#include "ED_anim_api.hh" +#include "ED_keyframes_edit.hh" +#include "ED_markers.hh" +#include "ED_mask.hh" /* own include */ /* ***************************************** */ /* NOTE ABOUT THIS FILE: diff --git a/source/blender/editors/mask/mask_intern.h b/source/blender/editors/mask/mask_intern.h index 1b3dfac8454..18bea91ffb4 100644 --- a/source/blender/editors/mask/mask_intern.h +++ b/source/blender/editors/mask/mask_intern.h @@ -8,7 +8,7 @@ #pragma once -#include "ED_clip.h" +#include "ED_clip.hh" struct Mask; struct bContext; diff --git a/source/blender/editors/mask/mask_ops.cc b/source/blender/editors/mask/mask_ops.cc index 6f2748ecfa3..4db45a875ea 100644 --- a/source/blender/editors/mask/mask_ops.cc +++ b/source/blender/editors/mask/mask_ops.cc @@ -25,12 +25,12 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" -#include "ED_image.h" -#include "ED_keyframing.h" -#include "ED_mask.h" +#include "ED_clip.hh" +#include "ED_image.hh" +#include "ED_keyframing.hh" +#include "ED_mask.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mask/mask_query.cc b/source/blender/editors/mask/mask_query.cc index a636fcaf56d..f6b43a430f9 100644 --- a/source/blender/editors/mask/mask_query.cc +++ b/source/blender/editors/mask/mask_query.cc @@ -20,11 +20,11 @@ #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "ED_clip.h" -#include "ED_image.h" -#include "ED_mask.h" /* own include */ +#include "ED_clip.hh" +#include "ED_image.hh" +#include "ED_mask.hh" /* own include */ -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "mask_intern.h" /* own include */ diff --git a/source/blender/editors/mask/mask_relationships.cc b/source/blender/editors/mask/mask_relationships.cc index 8a6cd866ba2..e8655d5ea2a 100644 --- a/source/blender/editors/mask/mask_relationships.cc +++ b/source/blender/editors/mask/mask_relationships.cc @@ -21,8 +21,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" /* frame remapping functions */ -#include "ED_mask.h" +#include "ED_clip.hh" /* frame remapping functions */ +#include "ED_mask.hh" #include "ED_screen.hh" #include "mask_intern.h" /* own include */ diff --git a/source/blender/editors/mask/mask_select.cc b/source/blender/editors/mask/mask_select.cc index 397009bcfc5..a7c37b52b06 100644 --- a/source/blender/editors/mask/mask_select.cc +++ b/source/blender/editors/mask/mask_select.cc @@ -25,9 +25,9 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" -#include "ED_mask.h" /* own include */ -#include "ED_select_utils.h" +#include "ED_clip.hh" +#include "ED_mask.hh" /* own include */ +#include "ED_select_utils.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mask/mask_shapekey.cc b/source/blender/editors/mask/mask_shapekey.cc index e91056ce93f..23a5ba7703f 100644 --- a/source/blender/editors/mask/mask_shapekey.cc +++ b/source/blender/editors/mask/mask_shapekey.cc @@ -27,7 +27,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_mask.h" /* own include */ +#include "ED_mask.hh" /* own include */ #include "mask_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/editface.cc b/source/blender/editors/mesh/editface.cc index 3c15f4c9daa..ce0bf5db8f9 100644 --- a/source/blender/editors/mesh/editface.cc +++ b/source/blender/editors/mesh/editface.cc @@ -31,10 +31,10 @@ #include "BKE_mesh_mapping.hh" #include "BKE_object.h" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_view3d.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/mesh/editmesh_add.cc b/source/blender/editors/mesh/editmesh_add.cc index 8a235d09c61..82a6316cdf2 100644 --- a/source/blender/editors/mesh/editmesh_add.cc +++ b/source/blender/editors/mesh/editmesh_add.cc @@ -23,8 +23,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/editmesh_add_gizmo.cc b/source/blender/editors/mesh/editmesh_add_gizmo.cc index c4acc4cfce6..5c93560ddd6 100644 --- a/source/blender/editors/mesh/editmesh_add_gizmo.cc +++ b/source/blender/editors/mesh/editmesh_add_gizmo.cc @@ -19,13 +19,13 @@ #include "BKE_editmesh.h" #include "BKE_scene.h" -#include "ED_gizmo_library.h" -#include "ED_gizmo_utils.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_gizmo_library.hh" +#include "ED_gizmo_utils.hh" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_undo.h" -#include "ED_view3d.h" +#include "ED_undo.hh" +#include "ED_view3d.hh" #include "RNA_access.h" #include "RNA_define.h" @@ -33,7 +33,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/mesh/editmesh_attribute.cc b/source/blender/editors/mesh/editmesh_attribute.cc index beb47c157ca..26228b5130d 100644 --- a/source/blender/editors/mesh/editmesh_attribute.cc +++ b/source/blender/editors/mesh/editmesh_attribute.cc @@ -25,18 +25,18 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_transform.h" -#include "ED_view3d.h" +#include "ED_transform.hh" +#include "ED_view3d.hh" #include "BLT_translation.h" #include "DNA_object_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "bmesh_tools.h" diff --git a/source/blender/editors/mesh/editmesh_automerge.cc b/source/blender/editors/mesh/editmesh_automerge.cc index 176ee59827a..cfcefb98b65 100644 --- a/source/blender/editors/mesh/editmesh_automerge.cc +++ b/source/blender/editors/mesh/editmesh_automerge.cc @@ -15,7 +15,7 @@ #include "DNA_object_types.h" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "tools/bmesh_intersect_edges.h" diff --git a/source/blender/editors/mesh/editmesh_bevel.cc b/source/blender/editors/mesh/editmesh_bevel.cc index 7840d49c5c2..73ffb50cbc0 100644 --- a/source/blender/editors/mesh/editmesh_bevel.cc +++ b/source/blender/editors/mesh/editmesh_bevel.cc @@ -31,16 +31,16 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" -#include "ED_mesh.h" -#include "ED_numinput.h" +#include "ED_mesh.hh" +#include "ED_numinput.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_transform.h" +#include "ED_space_api.hh" +#include "ED_transform.hh" #include "ED_util.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/editmesh_bisect.cc b/source/blender/editors/mesh/editmesh_bisect.cc index 7bdf49f6b67..b69a2d7b282 100644 --- a/source/blender/editors/mesh/editmesh_bisect.cc +++ b/source/blender/editors/mesh/editmesh_bisect.cc @@ -26,20 +26,20 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_gizmo_utils.h" -#include "ED_mesh.h" +#include "ED_gizmo_utils.hh" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "mesh_intern.h" /* own include */ #define USE_GIZMO #ifdef USE_GIZMO -# include "ED_gizmo_library.h" -# include "ED_undo.h" +# include "ED_gizmo_library.hh" +# include "ED_undo.hh" #endif static int mesh_bisect_exec(bContext *C, wmOperator *op); diff --git a/source/blender/editors/mesh/editmesh_extrude.cc b/source/blender/editors/mesh/editmesh_extrude.cc index 56f562a6445..3d24e18c2bb 100644 --- a/source/blender/editors/mesh/editmesh_extrude.cc +++ b/source/blender/editors/mesh/editmesh_extrude.cc @@ -23,10 +23,10 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_transform.h" -#include "ED_view3d.h" +#include "ED_transform.hh" +#include "ED_view3d.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/mesh/editmesh_extrude_screw.cc b/source/blender/editors/mesh/editmesh_extrude_screw.cc index e8b966d7b7a..228907f9632 100644 --- a/source/blender/editors/mesh/editmesh_extrude_screw.cc +++ b/source/blender/editors/mesh/editmesh_extrude_screw.cc @@ -22,9 +22,9 @@ #include "WM_types.hh" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/editmesh_extrude_spin.cc b/source/blender/editors/mesh/editmesh_extrude_spin.cc index 4a12d3d9556..c23a8b52c28 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin.cc +++ b/source/blender/editors/mesh/editmesh_extrude_spin.cc @@ -21,9 +21,9 @@ #include "WM_types.hh" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.cc b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.cc index c924d47b481..ea90a941f9a 100644 --- a/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.cc +++ b/source/blender/editors/mesh/editmesh_extrude_spin_gizmo.cc @@ -21,20 +21,20 @@ #include "WM_toolsystem.h" #include "WM_types.hh" -#include "ED_gizmo_utils.h" +#include "ED_gizmo_utils.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "MEM_guardedalloc.h" #include "mesh_intern.h" /* own include */ -#include "ED_transform.h" +#include "ED_transform.hh" -#include "ED_gizmo_library.h" -#include "ED_undo.h" +#include "ED_gizmo_library.hh" +#include "ED_undo.hh" /** * Orient the handles towards the selection (can be slow with high-poly mesh!). diff --git a/source/blender/editors/mesh/editmesh_inset.cc b/source/blender/editors/mesh/editmesh_inset.cc index f5965c0e30a..553099f9f0d 100644 --- a/source/blender/editors/mesh/editmesh_inset.cc +++ b/source/blender/editors/mesh/editmesh_inset.cc @@ -27,15 +27,15 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" -#include "ED_mesh.h" -#include "ED_numinput.h" +#include "ED_mesh.hh" +#include "ED_numinput.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_transform.h" +#include "ED_space_api.hh" +#include "ED_transform.hh" #include "ED_util.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/editmesh_intersect.cc b/source/blender/editors/mesh/editmesh_intersect.cc index bd9854dd4ae..65a16a56417 100644 --- a/source/blender/editors/mesh/editmesh_intersect.cc +++ b/source/blender/editors/mesh/editmesh_intersect.cc @@ -27,10 +27,10 @@ #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "ED_screen.hh" #include "intern/bmesh_private.h" diff --git a/source/blender/editors/mesh/editmesh_knife.cc b/source/blender/editors/mesh/editmesh_knife.cc index 2f7e7c152db..9c332cb5ab2 100644 --- a/source/blender/editors/mesh/editmesh_knife.cc +++ b/source/blender/editors/mesh/editmesh_knife.cc @@ -41,20 +41,20 @@ #include "GPU_matrix.h" #include "GPU_state.h" -#include "ED_mesh.h" -#include "ED_numinput.h" +#include "ED_mesh.hh" +#include "ED_numinput.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_transform.h" -#include "ED_view3d.h" +#include "ED_space_api.hh" +#include "ED_transform.hh" +#include "ED_view3d.hh" #include "WM_api.hh" #include "WM_types.hh" #include "DNA_object_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/editmesh_knife_project.cc b/source/blender/editors/mesh/editmesh_knife_project.cc index 05b98e6f95c..a7be7b36b36 100644 --- a/source/blender/editors/mesh/editmesh_knife_project.cc +++ b/source/blender/editors/mesh/editmesh_knife_project.cc @@ -34,9 +34,9 @@ #include "WM_types.hh" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/editmesh_loopcut.cc b/source/blender/editors/mesh/editmesh_loopcut.cc index 2ecc7e72ea9..dbf59c38ca0 100644 --- a/source/blender/editors/mesh/editmesh_loopcut.cc +++ b/source/blender/editors/mesh/editmesh_loopcut.cc @@ -24,13 +24,13 @@ #include "BKE_report.h" #include "BKE_unit.h" -#include "UI_interface.h" +#include "UI_interface.hh" -#include "ED_mesh.h" -#include "ED_numinput.h" +#include "ED_mesh.hh" +#include "ED_numinput.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_view3d.h" +#include "ED_space_api.hh" +#include "ED_view3d.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/editmesh_mask_extract.cc b/source/blender/editors/mesh/editmesh_mask_extract.cc index 51753e8c37d..eb3cb49fced 100644 --- a/source/blender/editors/mesh/editmesh_mask_extract.cc +++ b/source/blender/editors/mesh/editmesh_mask_extract.cc @@ -34,12 +34,12 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_sculpt.h" -#include "ED_undo.h" -#include "ED_view3d.h" +#include "ED_sculpt.hh" +#include "ED_undo.hh" +#include "ED_view3d.hh" #include "bmesh_tools.h" diff --git a/source/blender/editors/mesh/editmesh_path.cc b/source/blender/editors/mesh/editmesh_path.cc index ab7d06f4a3f..8699793705a 100644 --- a/source/blender/editors/mesh/editmesh_path.cc +++ b/source/blender/editors/mesh/editmesh_path.cc @@ -27,12 +27,12 @@ #include "BKE_layer.h" #include "BKE_report.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_uvedit.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_uvedit.hh" +#include "ED_view3d.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/editmesh_polybuild.cc b/source/blender/editors/mesh/editmesh_polybuild.cc index 2e40e832c96..a79fb1a09f8 100644 --- a/source/blender/editors/mesh/editmesh_polybuild.cc +++ b/source/blender/editors/mesh/editmesh_polybuild.cc @@ -23,12 +23,12 @@ #include "WM_types.hh" -#include "ED_mesh.h" -#include "ED_object.h" -#include "ED_scene.h" +#include "ED_mesh.hh" +#include "ED_object.hh" +#include "ED_scene.hh" #include "ED_screen.hh" -#include "ED_transform.h" -#include "ED_view3d.h" +#include "ED_transform.hh" +#include "ED_view3d.hh" #include "bmesh.h" diff --git a/source/blender/editors/mesh/editmesh_preselect_edgering.cc b/source/blender/editors/mesh/editmesh_preselect_edgering.cc index e9d8b8c3171..9321a508ec2 100644 --- a/source/blender/editors/mesh/editmesh_preselect_edgering.cc +++ b/source/blender/editors/mesh/editmesh_preselect_edgering.cc @@ -19,9 +19,9 @@ #include "GPU_matrix.h" #include "GPU_state.h" -#include "ED_mesh.h" +#include "ED_mesh.hh" -#include "UI_resources.h" +#include "UI_resources.hh" /* -------------------------------------------------------------------- */ /** \name Mesh Edge Ring Pre-Select diff --git a/source/blender/editors/mesh/editmesh_preselect_elem.cc b/source/blender/editors/mesh/editmesh_preselect_elem.cc index ca7100402ea..967ce3def37 100644 --- a/source/blender/editors/mesh/editmesh_preselect_elem.cc +++ b/source/blender/editors/mesh/editmesh_preselect_elem.cc @@ -18,8 +18,8 @@ #include "DNA_object_types.h" -#include "ED_mesh.h" -#include "ED_view3d.h" +#include "ED_mesh.hh" +#include "ED_view3d.hh" /* -------------------------------------------------------------------- */ /** \name Mesh Element Pre-Select diff --git a/source/blender/editors/mesh/editmesh_rip.cc b/source/blender/editors/mesh/editmesh_rip.cc index 30e94ef6120..2a685fd225d 100644 --- a/source/blender/editors/mesh/editmesh_rip.cc +++ b/source/blender/editors/mesh/editmesh_rip.cc @@ -25,10 +25,10 @@ #include "WM_types.hh" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_transform.h" -#include "ED_view3d.h" +#include "ED_transform.hh" +#include "ED_view3d.hh" #include "bmesh.h" #include "bmesh_tools.h" diff --git a/source/blender/editors/mesh/editmesh_rip_edge.cc b/source/blender/editors/mesh/editmesh_rip_edge.cc index 6a2cd10dca1..ad68a5a75dd 100644 --- a/source/blender/editors/mesh/editmesh_rip_edge.cc +++ b/source/blender/editors/mesh/editmesh_rip_edge.cc @@ -21,10 +21,10 @@ #include "WM_types.hh" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_transform.h" -#include "ED_view3d.h" +#include "ED_transform.hh" +#include "ED_view3d.hh" #include "bmesh.h" diff --git a/source/blender/editors/mesh/editmesh_select.cc b/source/blender/editors/mesh/editmesh_select.cc index 5d55da38465..2e22ba907b1 100644 --- a/source/blender/editors/mesh/editmesh_select.cc +++ b/source/blender/editors/mesh/editmesh_select.cc @@ -35,12 +35,12 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_transform.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_transform.hh" +#include "ED_view3d.hh" #include "BLT_translation.h" @@ -48,7 +48,7 @@ #include "DNA_meshdata_types.h" #include "DNA_object_types.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "bmesh_tools.h" diff --git a/source/blender/editors/mesh/editmesh_select_similar.cc b/source/blender/editors/mesh/editmesh_select_similar.cc index 82ab5a047df..849877ff5ce 100644 --- a/source/blender/editors/mesh/editmesh_select_similar.cc +++ b/source/blender/editors/mesh/editmesh_select_similar.cc @@ -32,9 +32,9 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/editmesh_tools.cc b/source/blender/editors/mesh/editmesh_tools.cc index 0caa0cecd29..35dd9aeae52 100644 --- a/source/blender/editors/mesh/editmesh_tools.cc +++ b/source/blender/editors/mesh/editmesh_tools.cc @@ -57,19 +57,19 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_mesh.h" -#include "ED_object.h" -#include "ED_outliner.h" +#include "ED_mesh.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_transform.h" -#include "ED_uvedit.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_transform.hh" +#include "ED_uvedit.hh" +#include "ED_view3d.hh" #include "RE_texture.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/editmesh_undo.cc b/source/blender/editors/mesh/editmesh_undo.cc index 3759ca00ecc..f0f72d2d634 100644 --- a/source/blender/editors/mesh/editmesh_undo.cc +++ b/source/blender/editors/mesh/editmesh_undo.cc @@ -35,9 +35,9 @@ #include "DEG_depsgraph.h" -#include "ED_mesh.h" -#include "ED_object.h" -#include "ED_undo.h" +#include "ED_mesh.hh" +#include "ED_object.hh" +#include "ED_undo.hh" #include "ED_util.hh" #include "WM_api.hh" diff --git a/source/blender/editors/mesh/editmesh_utils.cc b/source/blender/editors/mesh/editmesh_utils.cc index 1bd8e2e1022..7494dfa7b34 100644 --- a/source/blender/editors/mesh/editmesh_utils.cc +++ b/source/blender/editors/mesh/editmesh_utils.cc @@ -36,11 +36,11 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_transform_snap_object_context.h" -#include "ED_uvedit.h" -#include "ED_view3d.h" +#include "ED_transform_snap_object_context.hh" +#include "ED_uvedit.hh" +#include "ED_view3d.hh" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/mesh_data.cc b/source/blender/editors/mesh/mesh_data.cc index 221c3a6e736..3f50c2878ac 100644 --- a/source/blender/editors/mesh/mesh_data.cc +++ b/source/blender/editors/mesh/mesh_data.cc @@ -38,12 +38,12 @@ #include "BLT_translation.h" -#include "ED_mesh.h" -#include "ED_object.h" -#include "ED_paint.h" +#include "ED_mesh.hh" +#include "ED_object.hh" +#include "ED_paint.hh" #include "ED_screen.hh" -#include "ED_uvedit.h" -#include "ED_view3d.h" +#include "ED_uvedit.hh" +#include "ED_view3d.hh" #include "GEO_mesh_split_edges.hh" diff --git a/source/blender/editors/mesh/mesh_mirror.cc b/source/blender/editors/mesh/mesh_mirror.cc index 6b00ecfe5c4..c55368b6033 100644 --- a/source/blender/editors/mesh/mesh_mirror.cc +++ b/source/blender/editors/mesh/mesh_mirror.cc @@ -20,7 +20,7 @@ #include "BKE_mesh.hh" #include "BLI_kdtree.h" -#include "ED_mesh.h" +#include "ED_mesh.hh" /* -------------------------------------------------------------------- */ /** \name Mesh Spatial Mirror API diff --git a/source/blender/editors/mesh/mesh_ops.cc b/source/blender/editors/mesh/mesh_ops.cc index 3291480d50e..09e116263e6 100644 --- a/source/blender/editors/mesh/mesh_ops.cc +++ b/source/blender/editors/mesh/mesh_ops.cc @@ -13,7 +13,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "ED_screen.hh" #include "mesh_intern.h" /* own include */ diff --git a/source/blender/editors/mesh/meshtools.cc b/source/blender/editors/mesh/meshtools.cc index b953dcc89d3..72fb78dd31a 100644 --- a/source/blender/editors/mesh/meshtools.cc +++ b/source/blender/editors/mesh/meshtools.cc @@ -48,9 +48,9 @@ #include "DRW_select_buffer.h" -#include "ED_mesh.h" -#include "ED_object.h" -#include "ED_view3d.h" +#include "ED_mesh.hh" +#include "ED_object.hh" +#include "ED_view3d.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/metaball/editmball_undo.cc b/source/blender/editors/metaball/editmball_undo.cc index 5f619d3808f..c2580714ca2 100644 --- a/source/blender/editors/metaball/editmball_undo.cc +++ b/source/blender/editors/metaball/editmball_undo.cc @@ -31,9 +31,9 @@ #include "DEG_depsgraph.h" -#include "ED_mball.h" -#include "ED_object.h" -#include "ED_undo.h" +#include "ED_mball.hh" +#include "ED_object.hh" +#include "ED_undo.hh" #include "ED_util.hh" #include "WM_api.hh" diff --git a/source/blender/editors/metaball/mball_edit.cc b/source/blender/editors/metaball/mball_edit.cc index b0d41aa328e..9206da22a07 100644 --- a/source/blender/editors/metaball/mball_edit.cc +++ b/source/blender/editors/metaball/mball_edit.cc @@ -34,11 +34,11 @@ #include "GPU_select.h" -#include "ED_mball.h" -#include "ED_object.h" +#include "ED_mball.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_view3d.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/metaball/mball_ops.cc b/source/blender/editors/metaball/mball_ops.cc index 20bdb6b4bb9..d06ff57e7f9 100644 --- a/source/blender/editors/metaball/mball_ops.cc +++ b/source/blender/editors/metaball/mball_ops.cc @@ -13,7 +13,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_mball.h" +#include "ED_mball.hh" #include "ED_screen.hh" #include "mball_intern.h" diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc index 60def03e0cb..0e779a56b36 100644 --- a/source/blender/editors/object/object_add.cc +++ b/source/blender/editors/object/object_add.cc @@ -96,29 +96,29 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "ED_armature.h" -#include "ED_curve.h" +#include "ED_armature.hh" +#include "ED_curve.hh" #include "ED_curves.hh" -#include "ED_gpencil_legacy.h" -#include "ED_grease_pencil.h" -#include "ED_mball.h" -#include "ED_mesh.h" -#include "ED_node.h" -#include "ED_object.h" -#include "ED_outliner.h" -#include "ED_physics.h" -#include "ED_render.h" +#include "ED_gpencil_legacy.hh" +#include "ED_grease_pencil.hh" +#include "ED_mball.hh" +#include "ED_mesh.hh" +#include "ED_node.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" +#include "ED_physics.hh" +#include "ED_render.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_transform.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_transform.hh" +#include "ED_view3d.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "object_intern.h" diff --git a/source/blender/editors/object/object_bake.cc b/source/blender/editors/object/object_bake.cc index 2f8bed67d77..716f4508fa2 100644 --- a/source/blender/editors/object/object_bake.cc +++ b/source/blender/editors/object/object_bake.cc @@ -49,9 +49,9 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_object.h" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_uvedit.h" +#include "ED_uvedit.hh" #include "object_intern.h" diff --git a/source/blender/editors/object/object_bake_api.cc b/source/blender/editors/object/object_bake_api.cc index 2e02d844a4d..3bf5f06c1b2 100644 --- a/source/blender/editors/object/object_bake_api.cc +++ b/source/blender/editors/object/object_bake_api.cc @@ -56,10 +56,10 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_uvedit.h" +#include "ED_uvedit.hh" #include "object_intern.h" diff --git a/source/blender/editors/object/object_bake_simulation.cc b/source/blender/editors/object/object_bake_simulation.cc index 08ec2ebe423..c7d807ff56c 100644 --- a/source/blender/editors/object/object_bake_simulation.cc +++ b/source/blender/editors/object/object_bake_simulation.cc @@ -56,7 +56,7 @@ #include "WM_api.hh" -#include "UI_interface.h" +#include "UI_interface.hh" namespace blender::ed::object::bake_simulation { diff --git a/source/blender/editors/object/object_collection.cc b/source/blender/editors/object/object_collection.cc index 622696ca9a2..f8f52de1409 100644 --- a/source/blender/editors/object/object_collection.cc +++ b/source/blender/editors/object/object_collection.cc @@ -26,7 +26,7 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_object.h" +#include "ED_object.hh" #include "ED_screen.hh" #include "WM_api.hh" @@ -37,7 +37,7 @@ #include "RNA_enum_types.h" #include "RNA_prototypes.h" -#include "UI_interface_icons.h" +#include "UI_interface_icons.hh" #include "object_intern.h" diff --git a/source/blender/editors/object/object_constraint.cc b/source/blender/editors/object/object_constraint.cc index f521773b54d..0488e5d6630 100644 --- a/source/blender/editors/object/object_constraint.cc +++ b/source/blender/editors/object/object_constraint.cc @@ -55,12 +55,12 @@ #include "RNA_path.h" #include "RNA_prototypes.h" -#include "ED_keyframing.h" -#include "ED_object.h" +#include "ED_keyframing.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "object_intern.h" diff --git a/source/blender/editors/object/object_data_transfer.cc b/source/blender/editors/object/object_data_transfer.cc index 0bc4a28b0be..56dbc17c369 100644 --- a/source/blender/editors/object/object_data_transfer.cc +++ b/source/blender/editors/object/object_data_transfer.cc @@ -38,7 +38,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_object.h" +#include "ED_object.hh" #include "object_intern.h" diff --git a/source/blender/editors/object/object_data_transform.cc b/source/blender/editors/object/object_data_transform.cc index 7878eba3ff9..01751de102d 100644 --- a/source/blender/editors/object/object_data_transform.cc +++ b/source/blender/editors/object/object_data_transform.cc @@ -46,9 +46,9 @@ #include "WM_types.hh" -#include "ED_armature.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_armature.hh" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/object/object_edit.cc b/source/blender/editors/object/object_edit.cc index b7e66c3748e..b3504efe0e9 100644 --- a/source/blender/editors/object/object_edit.cc +++ b/source/blender/editors/object/object_edit.cc @@ -71,33 +71,33 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_anim_api.h" -#include "ED_armature.h" -#include "ED_curve.h" -#include "ED_gpencil_legacy.h" -#include "ED_image.h" -#include "ED_keyframes_keylist.h" -#include "ED_lattice.h" -#include "ED_mball.h" -#include "ED_mesh.h" -#include "ED_object.h" -#include "ED_outliner.h" +#include "ED_anim_api.hh" +#include "ED_armature.hh" +#include "ED_curve.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_image.hh" +#include "ED_keyframes_keylist.hh" +#include "ED_lattice.hh" +#include "ED_mball.hh" +#include "ED_mesh.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_undo.h" +#include "ED_undo.hh" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" #include "RNA_types.h" -#include "UI_interface_icons.h" +#include "UI_interface_icons.hh" #include "CLG_log.h" /* For menu/popup icons etc. */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_message.hh" diff --git a/source/blender/editors/object/object_gpencil_modifier.cc b/source/blender/editors/object/object_gpencil_modifier.cc index faf61772b97..90374ad75da 100644 --- a/source/blender/editors/object/object_gpencil_modifier.cc +++ b/source/blender/editors/object/object_gpencil_modifier.cc @@ -42,12 +42,12 @@ #include "RNA_enum_types.h" #include "RNA_prototypes.h" -#include "ED_object.h" +#include "ED_object.hh" #include "ED_screen.hh" #include "BLT_translation.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/object/object_hook.cc b/source/blender/editors/object/object_hook.cc index 8148a00c93a..376da6b4da9 100644 --- a/source/blender/editors/object/object_hook.cc +++ b/source/blender/editors/object/object_hook.cc @@ -44,14 +44,14 @@ #include "RNA_enum_types.h" #include "RNA_prototypes.h" -#include "ED_curve.h" -#include "ED_mesh.h" +#include "ED_curve.hh" +#include "ED_mesh.hh" #include "ED_screen.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "object_intern.h" diff --git a/source/blender/editors/object/object_light_linking_ops.cc b/source/blender/editors/object/object_light_linking_ops.cc index 23175435cc6..23e16d075cc 100644 --- a/source/blender/editors/object/object_light_linking_ops.cc +++ b/source/blender/editors/object/object_light_linking_ops.cc @@ -11,13 +11,13 @@ #include "BKE_context.h" #include "BKE_light_linking.h" -#include "ED_object.h" +#include "ED_object.hh" #include "ED_screen.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "DNA_collection_types.h" diff --git a/source/blender/editors/object/object_modes.cc b/source/blender/editors/object/object_modes.cc index 30cc3a6aa9d..202bbf03b40 100644 --- a/source/blender/editors/object/object_modes.cc +++ b/source/blender/editors/object/object_modes.cc @@ -42,16 +42,16 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "ED_armature.h" -#include "ED_gpencil_legacy.h" +#include "ED_armature.hh" +#include "ED_gpencil_legacy.hh" #include "ED_screen.hh" -#include "ED_transform_snap_object_context.h" -#include "ED_undo.h" -#include "ED_view3d.h" +#include "ED_transform_snap_object_context.hh" +#include "ED_undo.hh" +#include "ED_view3d.hh" #include "WM_toolsystem.h" -#include "ED_object.h" /* own include */ +#include "ED_object.hh" /* own include */ #include "object_intern.h" /* -------------------------------------------------------------------- */ diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc index 10c96bd3600..bda48dac023 100644 --- a/source/blender/editors/object/object_modifier.cc +++ b/source/blender/editors/object/object_modifier.cc @@ -83,15 +83,15 @@ #include "RNA_enum_types.h" #include "RNA_prototypes.h" -#include "ED_armature.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_armature.hh" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_sculpt.h" +#include "ED_sculpt.hh" #include "ANIM_bone_collections.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/object/object_ops.cc b/source/blender/editors/object/object_ops.cc index 9878b4c53bd..e613e56fe70 100644 --- a/source/blender/editors/object/object_ops.cc +++ b/source/blender/editors/object/object_ops.cc @@ -18,7 +18,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_object.h" +#include "ED_object.hh" #include "object_intern.h" diff --git a/source/blender/editors/object/object_random.cc b/source/blender/editors/object/object_random.cc index b2d4469c2db..e9e65cfec68 100644 --- a/source/blender/editors/object/object_random.cc +++ b/source/blender/editors/object/object_random.cc @@ -24,7 +24,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_transverts.h" +#include "ED_transverts.hh" #include "object_intern.h" diff --git a/source/blender/editors/object/object_relations.cc b/source/blender/editors/object/object_relations.cc index 7526e8ecc3d..e77245f8f97 100644 --- a/source/blender/editors/object/object_relations.cc +++ b/source/blender/editors/object/object_relations.cc @@ -84,21 +84,21 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_armature.h" -#include "ED_curve.h" -#include "ED_gpencil_legacy.h" -#include "ED_keyframing.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_armature.hh" +#include "ED_curve.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_keyframing.hh" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "MOD_nodes.hh" diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc index 801f9374d7b..955b0797fe8 100644 --- a/source/blender/editors/object/object_remesh.cc +++ b/source/blender/editors/object/object_remesh.cc @@ -47,13 +47,13 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_sculpt.h" -#include "ED_space_api.h" -#include "ED_undo.h" -#include "ED_view3d.h" +#include "ED_sculpt.hh" +#include "ED_space_api.hh" +#include "ED_undo.hh" +#include "ED_view3d.hh" #include "RNA_access.h" #include "RNA_define.h" @@ -69,7 +69,7 @@ #include "WM_toolsystem.h" #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLF_api.h" diff --git a/source/blender/editors/object/object_select.cc b/source/blender/editors/object/object_select.cc index a74eeb2827b..bc59448f801 100644 --- a/source/blender/editors/object/object_select.cc +++ b/source/blender/editors/object/object_select.cc @@ -54,17 +54,17 @@ #include "WM_message.hh" #include "WM_types.hh" -#include "ED_armature.h" -#include "ED_keyframing.h" -#include "ED_object.h" -#include "ED_outliner.h" +#include "ED_armature.hh" +#include "ED_keyframing.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "ANIM_bone_collections.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/object/object_shader_fx.cc b/source/blender/editors/object/object_shader_fx.cc index 0250acf1197..23097a34a14 100644 --- a/source/blender/editors/object/object_shader_fx.cc +++ b/source/blender/editors/object/object_shader_fx.cc @@ -41,10 +41,10 @@ #include "RNA_enum_types.h" #include "RNA_prototypes.h" -#include "ED_object.h" +#include "ED_object.hh" #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/object/object_shapekey.cc b/source/blender/editors/object/object_shapekey.cc index 54413a541ea..a3928298bfa 100644 --- a/source/blender/editors/object/object_shapekey.cc +++ b/source/blender/editors/object/object_shapekey.cc @@ -43,8 +43,8 @@ #include "BLI_sys_types.h" /* for intptr_t support */ -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/object/object_transform.cc b/source/blender/editors/object/object_transform.cc index bd0e8f45c69..2b5bcd4d9a0 100644 --- a/source/blender/editors/object/object_transform.cc +++ b/source/blender/editors/object/object_transform.cc @@ -61,13 +61,13 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_armature.h" -#include "ED_gpencil_legacy.h" -#include "ED_keyframing.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_armature.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_keyframing.hh" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/object/object_utils.cc b/source/blender/editors/object/object_utils.cc index eef88188468..9ed13271082 100644 --- a/source/blender/editors/object/object_utils.cc +++ b/source/blender/editors/object/object_utils.cc @@ -32,8 +32,8 @@ #include "WM_types.hh" -#include "ED_curve.h" -#include "ED_object.h" /* own include */ +#include "ED_curve.hh" +#include "ED_object.hh" /* own include */ #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/object/object_vgroup.cc b/source/blender/editors/object/object_vgroup.cc index 490bab72756..e8e2eee7790 100644 --- a/source/blender/editors/object/object_vgroup.cc +++ b/source/blender/editors/object/object_vgroup.cc @@ -61,11 +61,11 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "object_intern.h" diff --git a/source/blender/editors/object/object_volume.cc b/source/blender/editors/object/object_volume.cc index 6cff8ca7b28..122abb70712 100644 --- a/source/blender/editors/object/object_volume.cc +++ b/source/blender/editors/object/object_volume.cc @@ -28,8 +28,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_image.h" -#include "ED_object.h" +#include "ED_image.hh" +#include "ED_object.hh" #include "ED_screen.hh" #include "object_intern.h" diff --git a/source/blender/editors/object/object_warp.cc b/source/blender/editors/object/object_warp.cc index 4cd695a6270..831fc6f0599 100644 --- a/source/blender/editors/object/object_warp.cc +++ b/source/blender/editors/object/object_warp.cc @@ -20,7 +20,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_transverts.h" +#include "ED_transverts.hh" #include "object_intern.h" diff --git a/source/blender/editors/physics/dynamicpaint_ops.cc b/source/blender/editors/physics/dynamicpaint_ops.cc index cf7b72a1933..f507ee2df0d 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.cc +++ b/source/blender/editors/physics/dynamicpaint_ops.cc @@ -38,8 +38,8 @@ #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" #include "RNA_access.h" diff --git a/source/blender/editors/physics/particle_edit.cc b/source/blender/editors/physics/particle_edit.cc index a9d486cadad..27b1f58677e 100644 --- a/source/blender/editors/physics/particle_edit.cc +++ b/source/blender/editors/physics/particle_edit.cc @@ -45,19 +45,19 @@ #include "DEG_depsgraph.h" -#include "ED_mesh.h" -#include "ED_object.h" -#include "ED_particle.h" -#include "ED_physics.h" +#include "ED_mesh.hh" +#include "ED_object.hh" +#include "ED_particle.hh" +#include "ED_physics.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_view3d.hh" #include "GPU_immediate.h" #include "GPU_immediate_util.h" #include "GPU_state.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_message.hh" diff --git a/source/blender/editors/physics/particle_edit_undo.cc b/source/blender/editors/physics/particle_edit_undo.cc index 8d766f2a23c..6dc9d7205d3 100644 --- a/source/blender/editors/physics/particle_edit_undo.cc +++ b/source/blender/editors/physics/particle_edit_undo.cc @@ -29,10 +29,10 @@ #include "DEG_depsgraph.h" -#include "ED_object.h" -#include "ED_particle.h" -#include "ED_physics.h" -#include "ED_undo.h" +#include "ED_object.hh" +#include "ED_particle.hh" +#include "ED_physics.hh" +#include "ED_undo.hh" #include "particle_edit_utildefines.h" diff --git a/source/blender/editors/physics/particle_object.cc b/source/blender/editors/physics/particle_object.cc index 5e32e52dfc8..a7033dd33c6 100644 --- a/source/blender/editors/physics/particle_object.cc +++ b/source/blender/editors/physics/particle_object.cc @@ -47,11 +47,11 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_object.h" -#include "ED_particle.h" +#include "ED_object.hh" +#include "ED_particle.hh" #include "ED_screen.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "particle_edit_utildefines.h" diff --git a/source/blender/editors/physics/physics_fluid.cc b/source/blender/editors/physics/physics_fluid.cc index ef261197143..ab29705ec7b 100644 --- a/source/blender/editors/physics/physics_fluid.cc +++ b/source/blender/editors/physics/physics_fluid.cc @@ -33,7 +33,7 @@ #include "DEG_depsgraph.h" -#include "ED_object.h" +#include "ED_object.hh" #include "ED_screen.hh" #include "PIL_time.h" diff --git a/source/blender/editors/physics/physics_ops.cc b/source/blender/editors/physics/physics_ops.cc index 5d1dfa590e2..bdb7a1a861e 100644 --- a/source/blender/editors/physics/physics_ops.cc +++ b/source/blender/editors/physics/physics_ops.cc @@ -10,7 +10,7 @@ #include "WM_api.hh" -#include "ED_physics.h" +#include "ED_physics.hh" #include "physics_intern.h" /* own include */ diff --git a/source/blender/editors/physics/physics_pointcache.cc b/source/blender/editors/physics/physics_pointcache.cc index cebcbc50b63..bac4d497f9f 100644 --- a/source/blender/editors/physics/physics_pointcache.cc +++ b/source/blender/editors/physics/physics_pointcache.cc @@ -23,7 +23,7 @@ #include "DEG_depsgraph.h" -#include "ED_particle.h" +#include "ED_particle.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/physics/rigidbody_constraint.cc b/source/blender/editors/physics/rigidbody_constraint.cc index 6ecbe8263f2..4e01628c95b 100644 --- a/source/blender/editors/physics/rigidbody_constraint.cc +++ b/source/blender/editors/physics/rigidbody_constraint.cc @@ -33,8 +33,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_object.h" -#include "ED_physics.h" +#include "ED_object.hh" +#include "ED_physics.hh" #include "ED_screen.hh" #include "physics_intern.h" diff --git a/source/blender/editors/physics/rigidbody_object.cc b/source/blender/editors/physics/rigidbody_object.cc index 1f28325f042..1dd0f1ae90a 100644 --- a/source/blender/editors/physics/rigidbody_object.cc +++ b/source/blender/editors/physics/rigidbody_object.cc @@ -36,8 +36,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_object.h" -#include "ED_physics.h" +#include "ED_object.hh" +#include "ED_physics.hh" #include "ED_screen.hh" #include "physics_intern.h" diff --git a/source/blender/editors/render/render_internal.cc b/source/blender/editors/render/render_internal.cc index 6e778d7bf4a..ff4f5f51bcf 100644 --- a/source/blender/editors/render/render_internal.cc +++ b/source/blender/editors/render/render_internal.cc @@ -51,11 +51,11 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_render.h" +#include "ED_render.hh" #include "ED_screen.hh" #include "ED_util.hh" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "RE_engine.h" #include "RE_pipeline.h" diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc index 68c5765f84a..a4f1d8feebd 100644 --- a/source/blender/editors/render/render_opengl.cc +++ b/source/blender/editors/render/render_opengl.cc @@ -52,10 +52,10 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "ED_screen.hh" -#include "ED_view3d.h" -#include "ED_view3d_offscreen.h" +#include "ED_view3d.hh" +#include "ED_view3d_offscreen.hh" #include "IMB_colormanagement.h" #include "IMB_imbuf.h" diff --git a/source/blender/editors/render/render_ops.cc b/source/blender/editors/render/render_ops.cc index 55336d2c5bb..a62eb7a7975 100644 --- a/source/blender/editors/render/render_ops.cc +++ b/source/blender/editors/render/render_ops.cc @@ -10,7 +10,7 @@ #include "BLI_utildefines.h" -#include "ED_render.h" +#include "ED_render.hh" #include "WM_api.hh" diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc index 760360858ea..95cffd79d82 100644 --- a/source/blender/editors/render/render_preview.cc +++ b/source/blender/editors/render/render_preview.cc @@ -72,7 +72,7 @@ #include "IMB_imbuf_types.h" #include "IMB_thumbs.h" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "GPU_shader.h" @@ -84,12 +84,12 @@ #include "WM_types.hh" #include "ED_datafiles.h" -#include "ED_render.h" +#include "ED_render.hh" #include "ED_screen.hh" -#include "ED_view3d.h" -#include "ED_view3d_offscreen.h" +#include "ED_view3d.hh" +#include "ED_view3d_offscreen.hh" -#include "UI_interface_icons.h" +#include "UI_interface_icons.hh" #ifndef NDEBUG /* Used for database init assert(). */ diff --git a/source/blender/editors/render/render_shading.cc b/source/blender/editors/render/render_shading.cc index 8e5aa640be1..bb7ca2111d9 100644 --- a/source/blender/editors/render/render_shading.cc +++ b/source/blender/editors/render/render_shading.cc @@ -75,19 +75,19 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_curve.h" -#include "ED_mesh.h" -#include "ED_node.h" -#include "ED_object.h" -#include "ED_paint.h" -#include "ED_render.h" -#include "ED_scene.h" +#include "ED_curve.hh" +#include "ED_mesh.hh" +#include "ED_node.hh" +#include "ED_object.hh" +#include "ED_paint.hh" +#include "ED_render.hh" +#include "ED_scene.hh" #include "ED_screen.hh" #include "RNA_define.h" #include "RNA_prototypes.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "RE_engine.h" #include "RE_pipeline.h" diff --git a/source/blender/editors/render/render_update.cc b/source/blender/editors/render/render_update.cc index c02c84ed08b..5b6aa8974b6 100644 --- a/source/blender/editors/render/render_update.cc +++ b/source/blender/editors/render/render_update.cc @@ -40,10 +40,10 @@ #include "RE_engine.h" #include "RE_pipeline.h" -#include "ED_node.h" -#include "ED_paint.h" -#include "ED_render.h" -#include "ED_view3d.h" +#include "ED_node.hh" +#include "ED_paint.hh" +#include "ED_render.hh" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/render/render_view.cc b/source/blender/editors/render/render_view.cc index ce687d4384e..d61967bfd32 100644 --- a/source/blender/editors/render/render_view.cc +++ b/source/blender/editors/render/render_view.cc @@ -29,7 +29,7 @@ #include "WM_types.hh" #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "wm_window.hh" diff --git a/source/blender/editors/scene/scene_edit.cc b/source/blender/editors/scene/scene_edit.cc index bd9c1e0fc1d..224856cf694 100644 --- a/source/blender/editors/scene/scene_edit.cc +++ b/source/blender/editors/scene/scene_edit.cc @@ -29,9 +29,9 @@ #include "BLT_translation.h" -#include "ED_object.h" -#include "ED_render.h" -#include "ED_scene.h" +#include "ED_object.hh" +#include "ED_render.hh" +#include "ED_scene.hh" #include "ED_screen.hh" #include "ED_util.hh" diff --git a/source/blender/editors/screen/area.cc b/source/blender/editors/screen/area.cc index 95ddb1ed1c3..de8203d8c5c 100644 --- a/source/blender/editors/screen/area.cc +++ b/source/blender/editors/screen/area.cc @@ -34,13 +34,13 @@ #include "WM_toolsystem.h" #include "WM_types.hh" -#include "ED_asset.h" +#include "ED_asset.hh" #include "ED_asset_shelf.h" -#include "ED_buttons.h" +#include "ED_buttons.hh" #include "ED_screen.hh" -#include "ED_screen_types.h" -#include "ED_space_api.h" -#include "ED_time_scrub_ui.h" +#include "ED_screen_types.hh" +#include "ED_space_api.hh" +#include "ED_time_scrub_ui.hh" #include "GPU_framebuffer.h" #include "GPU_immediate.h" @@ -53,10 +53,10 @@ #include "IMB_imbuf_types.h" #include "IMB_metadata.h" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "screen_intern.h" diff --git a/source/blender/editors/screen/area_query.cc b/source/blender/editors/screen/area_query.cc index 490f747e4b2..d0686feedb0 100644 --- a/source/blender/editors/screen/area_query.cc +++ b/source/blender/editors/screen/area_query.cc @@ -18,8 +18,8 @@ #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" bool ED_region_overlap_isect_x(const ARegion *region, const int event_x) { diff --git a/source/blender/editors/screen/area_utils.cc b/source/blender/editors/screen/area_utils.cc index 1daf07b3a0e..b8d47fb1f3f 100644 --- a/source/blender/editors/screen/area_utils.cc +++ b/source/blender/editors/screen/area_utils.cc @@ -22,8 +22,8 @@ #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_interface_icons.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" /* -------------------------------------------------------------------- */ /** \name Generic Tool System Region Callbacks diff --git a/source/blender/editors/screen/glutil.cc b/source/blender/editors/screen/glutil.cc index 61873e0b5f7..b3708e8bb57 100644 --- a/source/blender/editors/screen/glutil.cc +++ b/source/blender/editors/screen/glutil.cc @@ -17,7 +17,7 @@ #include "BKE_context.h" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "IMB_colormanagement.h" #include "IMB_imbuf_types.h" @@ -31,7 +31,7 @@ # include "GPU_state.h" #endif -#include "UI_interface.h" +#include "UI_interface.hh" /* ******************************************** */ diff --git a/source/blender/editors/screen/screen_context.cc b/source/blender/editors/screen/screen_context.cc index 380546c29d1..5ee4af38cb2 100644 --- a/source/blender/editors/screen/screen_context.cc +++ b/source/blender/editors/screen/screen_context.cc @@ -39,17 +39,17 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "ED_anim_api.h" -#include "ED_armature.h" -#include "ED_clip.h" -#include "ED_gpencil_legacy.h" +#include "ED_anim_api.hh" +#include "ED_armature.hh" +#include "ED_clip.hh" +#include "ED_gpencil_legacy.hh" #include "SEQ_channels.h" #include "SEQ_select.h" #include "SEQ_sequencer.h" #include "SEQ_transform.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "screen_intern.h" diff --git a/source/blender/editors/screen/screen_draw.cc b/source/blender/editors/screen/screen_draw.cc index 4d66957b25f..33375953dbd 100644 --- a/source/blender/editors/screen/screen_draw.cc +++ b/source/blender/editors/screen/screen_draw.cc @@ -22,8 +22,8 @@ #include "WM_api.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "screen_intern.h" diff --git a/source/blender/editors/screen/screen_edit.cc b/source/blender/editors/screen/screen_edit.cc index a381fc19561..85e15670c56 100644 --- a/source/blender/editors/screen/screen_edit.cc +++ b/source/blender/editors/screen/screen_edit.cc @@ -34,12 +34,12 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" -#include "ED_node.h" +#include "ED_clip.hh" +#include "ED_node.hh" #include "ED_screen.hh" -#include "ED_screen_types.h" +#include "ED_screen_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_message.hh" #include "WM_toolsystem.h" diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc index f497b56bb0f..5c1f04411ee 100644 --- a/source/blender/editors/screen/screen_ops.cc +++ b/source/blender/editors/screen/screen_ops.cc @@ -53,29 +53,29 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "ED_anim_api.h" -#include "ED_armature.h" -#include "ED_clip.h" -#include "ED_fileselect.h" -#include "ED_image.h" -#include "ED_keyframes_keylist.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_anim_api.hh" +#include "ED_armature.hh" +#include "ED_clip.hh" +#include "ED_fileselect.hh" +#include "ED_image.hh" +#include "ED_keyframes_keylist.hh" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_screen_types.h" -#include "ED_sequencer.h" -#include "ED_undo.h" +#include "ED_screen_types.hh" +#include "ED_sequencer.hh" +#include "ED_undo.hh" #include "ED_util.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" #include "RNA_prototypes.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "GPU_capabilities.h" diff --git a/source/blender/editors/screen/screen_user_menu.cc b/source/blender/editors/screen/screen_user_menu.cc index 0c40a48f1b3..cc2f11a15c0 100644 --- a/source/blender/editors/screen/screen_user_menu.cc +++ b/source/blender/editors/screen/screen_user_menu.cc @@ -31,8 +31,8 @@ #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_path.h" diff --git a/source/blender/editors/screen/screendump.cc b/source/blender/editors/screen/screendump.cc index 16d2124a7cd..7ef46a82eda 100644 --- a/source/blender/editors/screen/screendump.cc +++ b/source/blender/editors/screen/screendump.cc @@ -36,7 +36,7 @@ #include "RNA_define.h" #include "RNA_prototypes.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/screen/workspace_edit.cc b/source/blender/editors/screen/workspace_edit.cc index a7fd30b80aa..84e74480d77 100644 --- a/source/blender/editors/screen/workspace_edit.cc +++ b/source/blender/editors/screen/workspace_edit.cc @@ -29,14 +29,14 @@ #include "DNA_workspace_types.h" #include "ED_datafiles.h" -#include "ED_object.h" +#include "ED_object.hh" #include "ED_screen.hh" #include "RNA_access.h" #include "RNA_define.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc index 52263e1cd7a..f0286d595d1 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_add.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_add.cc @@ -40,7 +40,7 @@ #include "DNA_space_types.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "GEO_add_curves_on_mesh.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc b/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc index 2eecfbb7d30..682b13c5693 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_brush.cc @@ -13,9 +13,9 @@ #include "BKE_object.h" #include "BKE_report.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLI_length_parameterize.hh" #include "BLI_task.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc index 666740ea179..c2b6285b68e 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_comb.cc @@ -38,9 +38,9 @@ #include "DNA_space_types.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc b/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc index 7b56d057290..68140458113 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_delete.cc @@ -34,7 +34,7 @@ #include "DNA_space_types.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "WM_api.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc index 2887edee561..9dbaad557d8 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_density.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_density.cc @@ -17,7 +17,7 @@ #include "BKE_report.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc index 4bbcaf7006e..7d264ef014f 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_grow_shrink.cc @@ -26,7 +26,7 @@ #include "DNA_space_types.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "WM_api.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_intern.hh b/source/blender/editors/sculpt_paint/curves_sculpt_intern.hh index 31415193287..421819a1f46 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_intern.hh +++ b/source/blender/editors/sculpt_paint/curves_sculpt_intern.hh @@ -17,7 +17,7 @@ #include "BKE_curves.hh" #include "ED_curves.hh" -#include "ED_curves_sculpt.h" +#include "ED_curves_sculpt.hh" struct ARegion; struct RegionView3D; diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc index acc985ddc7e..834f6324167 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_ops.cc @@ -21,12 +21,12 @@ #include "WM_toolsystem.h" #include "ED_curves.hh" -#include "ED_curves_sculpt.h" -#include "ED_image.h" -#include "ED_object.h" +#include "ED_curves_sculpt.hh" +#include "ED_image.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_view3d.h" +#include "ED_space_api.hh" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" @@ -42,8 +42,8 @@ #include "curves_sculpt_intern.hh" #include "paint_intern.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_immediate.h" #include "GPU_immediate_util.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc b/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc index 15112211636..1976b65ed3d 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_pinch.cc @@ -27,7 +27,7 @@ #include "DNA_space_types.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "WM_api.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc b/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc index 09ebfb3cfa8..a117635e3c9 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_puff.cc @@ -11,7 +11,7 @@ #include "BKE_mesh_runtime.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_selection.cc b/source/blender/editors/sculpt_paint/curves_sculpt_selection.cc index ff0fd512b47..0940b0e7ec1 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_selection.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_selection.cc @@ -6,7 +6,7 @@ #include "curves_sculpt_intern.hh" -#include "ED_curves_sculpt.h" +#include "ED_curves_sculpt.hh" namespace blender::ed::sculpt_paint { diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc b/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc index f842aec53d1..21399f9bfe9 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_selection_paint.cc @@ -19,7 +19,7 @@ #include "DEG_depsgraph.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "WM_api.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc index 35f1abd7b86..e19cfb9699a 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_slide.cc @@ -31,7 +31,7 @@ #include "DNA_space_types.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "WM_api.hh" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc b/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc index 5bc533b0313..b08da497117 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_smooth.cc @@ -7,7 +7,7 @@ #include "BKE_crazyspace.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc b/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc index 2f75c9cd490..68c8f4a4744 100644 --- a/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc +++ b/source/blender/editors/sculpt_paint/curves_sculpt_snake_hook.cc @@ -35,7 +35,7 @@ #include "DNA_space_types.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "WM_api.hh" diff --git a/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc b/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc index 8aa33643019..bc827da77dd 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc @@ -10,10 +10,10 @@ #include "DNA_brush_types.h" #include "DNA_grease_pencil_types.h" -#include "ED_grease_pencil.h" -#include "ED_image.h" -#include "ED_keyframing.h" -#include "ED_object.h" +#include "ED_grease_pencil.hh" +#include "ED_image.hh" +#include "ED_keyframing.hh" +#include "ED_object.hh" #include "ED_screen.hh" #include "RNA_access.h" diff --git a/source/blender/editors/sculpt_paint/grease_pencil_erase.cc b/source/blender/editors/sculpt_paint/grease_pencil_erase.cc index ee0514b6347..56cb6470b99 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_erase.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_erase.cc @@ -23,7 +23,7 @@ #include "DEG_depsgraph_query.h" #include "DNA_brush_enums.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/sculpt_paint/grease_pencil_paint.cc b/source/blender/editors/sculpt_paint/grease_pencil_paint.cc index 7fd572cf1dc..b2d76f4a3af 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_paint.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_paint.cc @@ -10,7 +10,7 @@ #include "DEG_depsgraph_query.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/sculpt_paint/paint_canvas.cc b/source/blender/editors/sculpt_paint/paint_canvas.cc index 5d5cbc7ec6b..6ab164226db 100644 --- a/source/blender/editors/sculpt_paint/paint_canvas.cc +++ b/source/blender/editors/sculpt_paint/paint_canvas.cc @@ -13,7 +13,7 @@ #include "WM_toolsystem.h" -#include "ED_paint.h" +#include "ED_paint.hh" namespace blender::ed::sculpt_paint::canvas { static TexPaintSlot *get_active_slot(Object *ob) @@ -35,8 +35,6 @@ static TexPaintSlot *get_active_slot(Object *ob) } // namespace blender::ed::sculpt_paint::canvas -extern "C" { - using namespace blender::ed::sculpt_paint::canvas; /* Does the paint tool with the given idname uses a canvas. */ @@ -141,4 +139,3 @@ eV3DShadingColorType ED_paint_shading_color_override(bContext *C, return color_type; } -} diff --git a/source/blender/editors/sculpt_paint/paint_cursor.cc b/source/blender/editors/sculpt_paint/paint_cursor.cc index 4b51d053e66..a1686597005 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.cc +++ b/source/blender/editors/sculpt_paint/paint_cursor.cc @@ -41,8 +41,8 @@ #include "IMB_colormanagement.h" #include "IMB_imbuf_types.h" -#include "ED_image.h" -#include "ED_view3d.h" +#include "ED_image.hh" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" @@ -52,7 +52,7 @@ #include "GPU_state.h" #include "GPU_texture.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "paint_intern.hh" /* still needed for sculpt_stroke_get_location, should be diff --git a/source/blender/editors/sculpt_paint/paint_curve.cc b/source/blender/editors/sculpt_paint/paint_curve.cc index be7e0921fbd..38d17b8cfc3 100644 --- a/source/blender/editors/sculpt_paint/paint_curve.cc +++ b/source/blender/editors/sculpt_paint/paint_curve.cc @@ -25,8 +25,8 @@ #include "BKE_main.h" #include "BKE_paint.hh" -#include "ED_paint.h" -#include "ED_view3d.h" +#include "ED_paint.hh" +#include "ED_view3d.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -34,7 +34,7 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "paint_intern.hh" diff --git a/source/blender/editors/sculpt_paint/paint_curve_undo.cc b/source/blender/editors/sculpt_paint/paint_curve_undo.cc index 99fc19c3c52..5d1215c88f4 100644 --- a/source/blender/editors/sculpt_paint/paint_curve_undo.cc +++ b/source/blender/editors/sculpt_paint/paint_curve_undo.cc @@ -16,8 +16,8 @@ #include "BKE_paint.hh" #include "BKE_undo_system.h" -#include "ED_paint.h" -#include "ED_undo.h" +#include "ED_paint.hh" +#include "ED_undo.hh" #include "WM_api.hh" diff --git a/source/blender/editors/sculpt_paint/paint_hide.cc b/source/blender/editors/sculpt_paint/paint_hide.cc index 18aed2ef41a..aeea60615e1 100644 --- a/source/blender/editors/sculpt_paint/paint_hide.cc +++ b/source/blender/editors/sculpt_paint/paint_hide.cc @@ -33,7 +33,7 @@ #include "WM_types.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/sculpt_paint/paint_image.cc b/source/blender/editors/sculpt_paint/paint_image.cc index 00484b13229..929ed23877f 100644 --- a/source/blender/editors/sculpt_paint/paint_image.cc +++ b/source/blender/editors/sculpt_paint/paint_image.cc @@ -46,12 +46,12 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" -#include "ED_image.h" -#include "ED_object.h" -#include "ED_paint.h" +#include "ED_image.hh" +#include "ED_object.hh" +#include "ED_paint.hh" #include "ED_screen.hh" #include "WM_api.hh" diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.cc b/source/blender/editors/sculpt_paint/paint_image_2d.cc index 27d26dafd64..105d6a3f567 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.cc +++ b/source/blender/editors/sculpt_paint/paint_image_2d.cc @@ -30,7 +30,7 @@ #include "DEG_depsgraph.h" -#include "ED_paint.h" +#include "ED_paint.hh" #include "ED_screen.hh" #include "IMB_colormanagement.h" @@ -40,7 +40,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "paint_intern.hh" diff --git a/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc b/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc index fb9ca56b9bf..d70021a7857 100644 --- a/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc +++ b/source/blender/editors/sculpt_paint/paint_image_ops_paint.cc @@ -18,8 +18,8 @@ #include "BKE_paint.hh" #include "BKE_undo_system.h" -#include "ED_paint.h" -#include "ED_view3d.h" +#include "ED_paint.hh" +#include "ED_view3d.hh" #include "GPU_immediate.h" #include "GPU_state.h" @@ -31,7 +31,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_image.h" +#include "ED_image.hh" #include "paint_intern.hh" diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc index b82bbf9bcd1..be33cdc8c06 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc @@ -78,22 +78,22 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "ED_image.h" -#include "ED_node.h" -#include "ED_object.h" -#include "ED_paint.h" +#include "ED_image.hh" +#include "ED_node.hh" +#include "ED_object.hh" +#include "ED_paint.hh" #include "ED_screen.hh" -#include "ED_uvedit.h" -#include "ED_view3d.h" -#include "ED_view3d_offscreen.h" +#include "ED_uvedit.hh" +#include "ED_view3d.hh" +#include "ED_view3d_offscreen.hh" #include "GPU_capabilities.h" #include "GPU_init_exit.h" #include "NOD_shader.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/sculpt_paint/paint_intern.hh b/source/blender/editors/sculpt_paint/paint_intern.hh index 85be1248e90..09445c06840 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.hh +++ b/source/blender/editors/sculpt_paint/paint_intern.hh @@ -14,7 +14,7 @@ #include "BLI_math.h" #include "BLI_rect.h" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "DNA_scene_types.h" @@ -470,7 +470,7 @@ void PAINT_OT_hide_show(wmOperatorType *ot); /* `paint_mask.cc` */ /* The gesture API doesn't write to this enum type, - * it writes to eSelectOp from ED_select_utils.h. + * it writes to eSelectOp from ED_select_utils.hh. * We must thus map the modes here to the desired * eSelectOp modes. * diff --git a/source/blender/editors/sculpt_paint/paint_mask.cc b/source/blender/editors/sculpt_paint/paint_mask.cc index 21b10ab55b3..ad248f57ca8 100644 --- a/source/blender/editors/sculpt_paint/paint_mask.cc +++ b/source/blender/editors/sculpt_paint/paint_mask.cc @@ -46,8 +46,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_sculpt.h" -#include "ED_view3d.h" +#include "ED_sculpt.hh" +#include "ED_view3d.hh" #include "bmesh.h" #include "tools/bmesh_boolean.h" diff --git a/source/blender/editors/sculpt_paint/paint_ops.cc b/source/blender/editors/sculpt_paint/paint_ops.cc index 4bc4eac4a52..f8626e9b3bc 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.cc +++ b/source/blender/editors/sculpt_paint/paint_ops.cc @@ -35,8 +35,8 @@ #include "BKE_paint.hh" #include "BKE_report.h" -#include "ED_image.h" -#include "ED_paint.h" +#include "ED_image.hh" +#include "ED_paint.hh" #include "ED_screen.hh" #include "WM_api.hh" diff --git a/source/blender/editors/sculpt_paint/paint_stroke.cc b/source/blender/editors/sculpt_paint/paint_stroke.cc index 83cef29eb4e..ecb2ec611b9 100644 --- a/source/blender/editors/sculpt_paint/paint_stroke.cc +++ b/source/blender/editors/sculpt_paint/paint_stroke.cc @@ -39,7 +39,7 @@ #include "GPU_state.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_utils.cc b/source/blender/editors/sculpt_paint/paint_utils.cc index 2dbafd6cec6..0a8fbd22621 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.cc +++ b/source/blender/editors/sculpt_paint/paint_utils.cc @@ -56,12 +56,12 @@ #include "RE_texture.h" -#include "ED_image.h" +#include "ED_image.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "BLI_sys_types.h" -#include "ED_mesh.h" /* for face mask functions */ +#include "ED_mesh.hh" /* for face mask functions */ #include "DRW_select_buffer.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex.cc b/source/blender/editors/sculpt_paint/paint_vertex.cc index 6604a6a14fe..79b30ded7f7 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex.cc @@ -54,11 +54,11 @@ #include "WM_toolsystem.h" #include "WM_types.hh" -#include "ED_image.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_image.hh" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" /* For IMB_BlendMode only. */ #include "IMB_imbuf.h" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc index b7a1102f83b..92820aa1d11 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_color_ops.cc @@ -33,7 +33,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "paint_intern.hh" /* own include */ #include "sculpt_intern.hh" diff --git a/source/blender/editors/sculpt_paint/paint_vertex_proj.cc b/source/blender/editors/sculpt_paint/paint_vertex_proj.cc index 03539fe5a8e..f8c909855b3 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_proj.cc @@ -26,7 +26,7 @@ #include "DEG_depsgraph_query.h" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "paint_intern.hh" /* own include */ diff --git a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc index c43261cacd0..b104575ac36 100644 --- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc +++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.cc @@ -41,13 +41,13 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_armature.h" -#include "ED_mesh.h" +#include "ED_armature.hh" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "paint_intern.hh" /* own include */ diff --git a/source/blender/editors/sculpt_paint/paint_weight.cc b/source/blender/editors/sculpt_paint/paint_weight.cc index 92d03a07b8c..6ba08476dee 100644 --- a/source/blender/editors/sculpt_paint/paint_weight.cc +++ b/source/blender/editors/sculpt_paint/paint_weight.cc @@ -54,11 +54,11 @@ #include "WM_toolsystem.h" #include "WM_types.hh" -#include "ED_image.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_image.hh" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" /* For IMB_BlendMode only. */ #include "IMB_imbuf.h" diff --git a/source/blender/editors/sculpt_paint/sculpt.cc b/source/blender/editors/sculpt_paint/sculpt.cc index d00efa02a4f..c189f06a714 100644 --- a/source/blender/editors/sculpt_paint/sculpt.cc +++ b/source/blender/editors/sculpt_paint/sculpt.cc @@ -65,10 +65,10 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_paint.h" +#include "ED_paint.hh" #include "ED_screen.hh" -#include "ED_sculpt.h" -#include "ED_view3d.h" +#include "ED_sculpt.hh" +#include "ED_view3d.hh" #include "paint_intern.hh" #include "sculpt_intern.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_automasking.cc b/source/blender/editors/sculpt_paint/sculpt_automasking.cc index 9bc58336ab0..0053eafc2fc 100644 --- a/source/blender/editors/sculpt_paint/sculpt_automasking.cc +++ b/source/blender/editors/sculpt_paint/sculpt_automasking.cc @@ -39,9 +39,9 @@ #include "WM_toolsystem.h" #include "WM_types.hh" -#include "ED_object.h" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_sculpt.h" +#include "ED_sculpt.hh" #include "paint_intern.hh" #include "sculpt_intern.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_brush_types.cc b/source/blender/editors/sculpt_paint/sculpt_brush_types.cc index f0d7c1b9efe..89a70d20f7d 100644 --- a/source/blender/editors/sculpt_paint/sculpt_brush_types.cc +++ b/source/blender/editors/sculpt_paint/sculpt_brush_types.cc @@ -30,7 +30,7 @@ #include "BKE_paint.hh" #include "BKE_pbvh_api.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "paint_intern.hh" #include "sculpt_intern.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_cloth.cc b/source/blender/editors/sculpt_paint/sculpt_cloth.cc index bbbcc5c34ed..11dca0272ed 100644 --- a/source/blender/editors/sculpt_paint/sculpt_cloth.cc +++ b/source/blender/editors/sculpt_paint/sculpt_cloth.cc @@ -47,7 +47,7 @@ #include "GPU_matrix.h" #include "GPU_state.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "bmesh.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_detail.cc b/source/blender/editors/sculpt_paint/sculpt_detail.cc index cc028244b1f..07b2726751a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_detail.cc +++ b/source/blender/editors/sculpt_paint/sculpt_detail.cc @@ -31,8 +31,8 @@ #include "WM_types.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_view3d.h" +#include "ED_space_api.hh" +#include "ED_view3d.hh" #include "sculpt_intern.hh" #include "RNA_access.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc index 28b453714d2..6edabc1c646 100644 --- a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc @@ -36,11 +36,11 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_undo.h" +#include "ED_undo.hh" #include "sculpt_intern.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "bmesh.h" #include "bmesh_tools.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_expand.cc b/source/blender/editors/sculpt_paint/sculpt_expand.cc index 492c369594e..d8de73d48d8 100644 --- a/source/blender/editors/sculpt_paint/sculpt_expand.cc +++ b/source/blender/editors/sculpt_paint/sculpt_expand.cc @@ -43,7 +43,7 @@ #include "RNA_define.h" #include "ED_screen.hh" -#include "ED_sculpt.h" +#include "ED_sculpt.hh" #include "paint_intern.hh" #include "sculpt_intern.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_face_set.cc b/source/blender/editors/sculpt_paint/sculpt_face_set.cc index ca306740616..6cdd23b5eec 100644 --- a/source/blender/editors/sculpt_paint/sculpt_face_set.cc +++ b/source/blender/editors/sculpt_paint/sculpt_face_set.cc @@ -48,7 +48,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_sculpt.h" +#include "ED_sculpt.hh" #include "sculpt_intern.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_color.cc b/source/blender/editors/sculpt_paint/sculpt_filter_color.cc index c2675716375..4de6cf9bee8 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_color.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_color.cc @@ -28,14 +28,14 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_paint.h" +#include "ED_paint.hh" #include "sculpt_intern.hh" #include "RNA_access.h" #include "RNA_define.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include #include diff --git a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc index 2ac3f4b6fed..d075350a18a 100644 --- a/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc +++ b/source/blender/editors/sculpt_paint/sculpt_filter_mesh.cc @@ -33,7 +33,7 @@ #include "ED_screen.hh" #include "ED_util.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "paint_intern.hh" #include "sculpt_intern.hh" @@ -42,8 +42,8 @@ #include "RNA_define.h" #include "RNA_prototypes.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "bmesh.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.hh b/source/blender/editors/sculpt_paint/sculpt_intern.hh index e4ffa9f5e17..04c22903aaf 100644 --- a/source/blender/editors/sculpt_paint/sculpt_intern.hh +++ b/source/blender/editors/sculpt_paint/sculpt_intern.hh @@ -28,7 +28,7 @@ #include "BLI_threads.h" #include "BLI_vector.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include diff --git a/source/blender/editors/sculpt_paint/sculpt_ops.cc b/source/blender/editors/sculpt_paint/sculpt_ops.cc index f1006009919..7677326517c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_ops.cc +++ b/source/blender/editors/sculpt_paint/sculpt_ops.cc @@ -52,10 +52,10 @@ #include "WM_toolsystem.h" #include "WM_types.hh" -#include "ED_image.h" -#include "ED_object.h" +#include "ED_image.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_sculpt.h" +#include "ED_sculpt.hh" #include "paint_intern.hh" #include "sculpt_intern.hh" @@ -63,8 +63,8 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "bmesh.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc index b438fff9185..70e311f1999 100644 --- a/source/blender/editors/sculpt_paint/sculpt_paint_image.cc +++ b/source/blender/editors/sculpt_paint/sculpt_paint_image.cc @@ -8,7 +8,7 @@ #include "DNA_image_types.h" #include "DNA_object_types.h" -#include "ED_paint.h" +#include "ED_paint.hh" #include "BLI_math.h" #include "BLI_math_color_blend.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_transform.cc b/source/blender/editors/sculpt_paint/sculpt_transform.cc index 72b9b56068d..5068ed5107c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_transform.cc +++ b/source/blender/editors/sculpt_paint/sculpt_transform.cc @@ -25,8 +25,8 @@ #include "WM_types.hh" #include "ED_screen.hh" -#include "ED_sculpt.h" -#include "ED_view3d.h" +#include "ED_sculpt.hh" +#include "ED_view3d.hh" #include "paint_intern.hh" #include "sculpt_intern.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.cc b/source/blender/editors/sculpt_paint/sculpt_undo.cc index b2a75ac2713..52ef93b5a8c 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_undo.cc @@ -74,10 +74,10 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_geometry.h" -#include "ED_object.h" -#include "ED_sculpt.h" -#include "ED_undo.h" +#include "ED_geometry.hh" +#include "ED_object.hh" +#include "ED_sculpt.hh" +#include "ED_undo.hh" #include "bmesh.h" #include "sculpt_intern.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.cc b/source/blender/editors/sculpt_paint/sculpt_uv.cc index ec91f8cafd6..04deafd75cb 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.cc +++ b/source/blender/editors/sculpt_paint/sculpt_uv.cc @@ -29,10 +29,10 @@ #include "DEG_depsgraph.h" -#include "ED_image.h" -#include "ED_mesh.h" +#include "ED_image.hh" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_uvedit.h" +#include "ED_uvedit.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -43,7 +43,7 @@ #include "paint_intern.hh" #include "uvedit_intern.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" /* When set, the UV element is on the boundary of the graph. * i.e. Instead of a 2-dimensional laplace operator, use a 1-dimensional version. diff --git a/source/blender/editors/sound/sound_ops.cc b/source/blender/editors/sound/sound_ops.cc index 6a4738618cd..0700a82550f 100644 --- a/source/blender/editors/sound/sound_ops.cc +++ b/source/blender/editors/sound/sound_ops.cc @@ -40,7 +40,7 @@ #include "SEQ_iterator.h" #include "SEQ_utils.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -51,7 +51,7 @@ #include "DEG_depsgraph_query.h" -#include "ED_sound.h" +#include "ED_sound.hh" #include "ED_util.hh" /******************** open sound operator ********************/ diff --git a/source/blender/editors/space_action/action_data.cc b/source/blender/editors/space_action/action_data.cc index 1e2c2daa7f6..16dfabcecca 100644 --- a/source/blender/editors/space_action/action_data.cc +++ b/source/blender/editors/space_action/action_data.cc @@ -36,14 +36,14 @@ #include "BKE_report.h" #include "BKE_scene.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" -#include "ED_anim_api.h" -#include "ED_gpencil_legacy.h" -#include "ED_keyframes_edit.h" -#include "ED_keyframing.h" -#include "ED_markers.h" -#include "ED_mask.h" +#include "ED_anim_api.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_keyframes_edit.hh" +#include "ED_keyframing.hh" +#include "ED_markers.hh" +#include "ED_mask.hh" #include "ED_screen.hh" #include "DEG_depsgraph.h" @@ -51,7 +51,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "action_intern.hh" diff --git a/source/blender/editors/space_action/action_draw.cc b/source/blender/editors/space_action/action_draw.cc index 6507c01e79d..c5144f8cc23 100644 --- a/source/blender/editors/space_action/action_draw.cc +++ b/source/blender/editors/space_action/action_draw.cc @@ -40,12 +40,12 @@ #include "GPU_matrix.h" #include "GPU_state.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" -#include "ED_anim_api.h" -#include "ED_keyframes_draw.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_draw.hh" #include "MOD_nodes.hh" diff --git a/source/blender/editors/space_action/action_edit.cc b/source/blender/editors/space_action/action_edit.cc index 703d62bb728..8ffcde86854 100644 --- a/source/blender/editors/space_action/action_edit.cc +++ b/source/blender/editors/space_action/action_edit.cc @@ -42,21 +42,21 @@ #include "BKE_nla.h" #include "BKE_report.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" -#include "ED_anim_api.h" -#include "ED_gpencil_legacy.h" -#include "ED_grease_pencil.h" -#include "ED_keyframes_edit.h" -#include "ED_keyframing.h" -#include "ED_markers.h" -#include "ED_mask.h" +#include "ED_anim_api.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_grease_pencil.hh" +#include "ED_keyframes_edit.hh" +#include "ED_keyframing.hh" +#include "ED_markers.hh" +#include "ED_mask.hh" #include "ED_screen.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "action_intern.hh" diff --git a/source/blender/editors/space_action/action_intern.hh b/source/blender/editors/space_action/action_intern.hh index 3036f03605f..1478c98c707 100644 --- a/source/blender/editors/space_action/action_intern.hh +++ b/source/blender/editors/space_action/action_intern.hh @@ -108,7 +108,7 @@ void ACTION_OT_layer_prev(wmOperatorType *ot); void ACTION_OT_markers_make_local(wmOperatorType *ot); /* defines for snap keyframes - * NOTE: keep in sync with eEditKeyframes_Snap (in ED_keyframes_edit.h) + * NOTE: keep in sync with eEditKeyframes_Snap (in ED_keyframes_edit.hh) */ enum eActKeys_Snap_Mode { ACTKEYS_SNAP_CFRA = 1, @@ -118,7 +118,7 @@ enum eActKeys_Snap_Mode { }; /* defines for mirror keyframes - * NOTE: keep in sync with eEditKeyframes_Mirror (in ED_keyframes_edit.h) + * NOTE: keep in sync with eEditKeyframes_Mirror (in ED_keyframes_edit.hh) */ enum eActKeys_Mirror_Mode { ACTKEYS_MIRROR_CFRA = 1, diff --git a/source/blender/editors/space_action/action_ops.cc b/source/blender/editors/space_action/action_ops.cc index 7e61613b95d..76d3cd2ceaf 100644 --- a/source/blender/editors/space_action/action_ops.cc +++ b/source/blender/editors/space_action/action_ops.cc @@ -11,8 +11,8 @@ #include "DNA_space_types.h" -#include "ED_anim_api.h" -#include "ED_transform.h" +#include "ED_anim_api.hh" +#include "ED_transform.hh" #include "action_intern.hh" diff --git a/source/blender/editors/space_action/action_select.cc b/source/blender/editors/space_action/action_select.cc index e77cd3e9dd8..842c0389145 100644 --- a/source/blender/editors/space_action/action_select.cc +++ b/source/blender/editors/space_action/action_select.cc @@ -33,18 +33,18 @@ #include "BKE_grease_pencil.hh" #include "BKE_nla.h" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" -#include "ED_anim_api.h" -#include "ED_gpencil_legacy.h" -#include "ED_grease_pencil.h" -#include "ED_keyframes_edit.h" -#include "ED_keyframes_keylist.h" -#include "ED_markers.h" -#include "ED_mask.h" +#include "ED_anim_api.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_grease_pencil.hh" +#include "ED_keyframes_edit.hh" +#include "ED_keyframes_keylist.hh" +#include "ED_markers.hh" +#include "ED_mask.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_action/space_action.cc b/source/blender/editors/space_action/space_action.cc index c0c98b345a5..418e10137d5 100644 --- a/source/blender/editors/space_action/space_action.cc +++ b/source/blender/editors/space_action/space_action.cc @@ -33,15 +33,15 @@ #include "WM_message.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" -#include "ED_anim_api.h" -#include "ED_markers.h" +#include "ED_anim_api.hh" +#include "ED_markers.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_time_scrub_ui.h" +#include "ED_space_api.hh" +#include "ED_time_scrub_ui.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_api/spacetypes.cc b/source/blender/editors/space_api/spacetypes.cc index c895516e326..a32b48ab8db 100644 --- a/source/blender/editors/space_api/spacetypes.cc +++ b/source/blender/editors/space_api/spacetypes.cc @@ -21,41 +21,41 @@ #include "GPU_state.h" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" -#include "ED_anim_api.h" -#include "ED_armature.h" -#include "ED_asset.h" -#include "ED_clip.h" -#include "ED_curve.h" +#include "ED_anim_api.hh" +#include "ED_armature.hh" +#include "ED_asset.hh" +#include "ED_clip.hh" +#include "ED_curve.hh" #include "ED_curves.hh" -#include "ED_curves_sculpt.h" -#include "ED_fileselect.h" -#include "ED_geometry.h" -#include "ED_gizmo_library.h" -#include "ED_gpencil_legacy.h" -#include "ED_grease_pencil.h" -#include "ED_lattice.h" -#include "ED_markers.h" -#include "ED_mask.h" -#include "ED_mball.h" -#include "ED_mesh.h" -#include "ED_node.h" -#include "ED_object.h" -#include "ED_paint.h" -#include "ED_physics.h" -#include "ED_render.h" -#include "ED_scene.h" +#include "ED_curves_sculpt.hh" +#include "ED_fileselect.hh" +#include "ED_geometry.hh" +#include "ED_gizmo_library.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_grease_pencil.hh" +#include "ED_lattice.hh" +#include "ED_markers.hh" +#include "ED_mask.hh" +#include "ED_mball.hh" +#include "ED_mesh.hh" +#include "ED_node.hh" +#include "ED_object.hh" +#include "ED_paint.hh" +#include "ED_physics.hh" +#include "ED_render.hh" +#include "ED_scene.hh" #include "ED_screen.hh" -#include "ED_sculpt.h" -#include "ED_sequencer.h" -#include "ED_sound.h" -#include "ED_space_api.h" -#include "ED_transform.h" -#include "ED_userpref.h" +#include "ED_sculpt.hh" +#include "ED_sequencer.hh" +#include "ED_sound.hh" +#include "ED_space_api.hh" +#include "ED_transform.hh" +#include "ED_userpref.hh" #include "ED_util.hh" -#include "ED_uvedit.h" +#include "ED_uvedit.hh" #include "io_ops.hh" diff --git a/source/blender/editors/space_buttons/buttons_context.cc b/source/blender/editors/space_buttons/buttons_context.cc index 4764bfdabdf..1473b2ded1f 100644 --- a/source/blender/editors/space_buttons/buttons_context.cc +++ b/source/blender/editors/space_buttons/buttons_context.cc @@ -42,12 +42,12 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "ED_buttons.h" -#include "ED_physics.h" +#include "ED_buttons.hh" +#include "ED_physics.hh" #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "WM_api.hh" diff --git a/source/blender/editors/space_buttons/buttons_ops.cc b/source/blender/editors/space_buttons/buttons_ops.cc index 8df1e3fcae0..486e9190af7 100644 --- a/source/blender/editors/space_buttons/buttons_ops.cc +++ b/source/blender/editors/space_buttons/buttons_ops.cc @@ -29,13 +29,13 @@ #include "WM_types.hh" #include "ED_screen.hh" -#include "ED_undo.h" +#include "ED_undo.hh" #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "buttons_intern.h" /* own include */ diff --git a/source/blender/editors/space_buttons/buttons_texture.cc b/source/blender/editors/space_buttons/buttons_texture.cc index 66584a60673..8b87e843494 100644 --- a/source/blender/editors/space_buttons/buttons_texture.cc +++ b/source/blender/editors/space_buttons/buttons_texture.cc @@ -42,10 +42,10 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" -#include "ED_node.h" +#include "ED_node.hh" #include "ED_screen.hh" #include "WM_api.hh" diff --git a/source/blender/editors/space_buttons/space_buttons.cc b/source/blender/editors/space_buttons/space_buttons.cc index 6d6bd8262c0..a46103bc745 100644 --- a/source/blender/editors/space_buttons/space_buttons.cc +++ b/source/blender/editors/space_buttons/space_buttons.cc @@ -22,10 +22,10 @@ #include "BKE_screen.h" #include "BKE_shader_fx.h" -#include "ED_buttons.h" +#include "ED_buttons.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_view3d.h" /* To draw toolbar UI. */ +#include "ED_space_api.hh" +#include "ED_view3d.hh" /* To draw toolbar UI. */ #include "WM_api.hh" #include "WM_message.hh" @@ -35,8 +35,8 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_clip/clip_buttons.cc b/source/blender/editors/space_clip/clip_buttons.cc index 9fa014cbc84..30553dac816 100644 --- a/source/blender/editors/space_clip/clip_buttons.cc +++ b/source/blender/editors/space_clip/clip_buttons.cc @@ -30,11 +30,11 @@ #include "DEG_depsgraph.h" -#include "ED_clip.h" +#include "ED_clip.hh" #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/editors/space_clip/clip_dopesheet_draw.cc b/source/blender/editors/space_clip/clip_dopesheet_draw.cc index 1e63c600314..52c91e6ba55 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_draw.cc +++ b/source/blender/editors/space_clip/clip_dopesheet_draw.cc @@ -16,14 +16,14 @@ #include "BKE_context.h" #include "BKE_movieclip.h" -#include "ED_clip.h" +#include "ED_clip.hh" #include "ED_screen.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLF_api.h" diff --git a/source/blender/editors/space_clip/clip_dopesheet_ops.cc b/source/blender/editors/space_clip/clip_dopesheet_ops.cc index d3689eb5c2b..8f9c36d15d9 100644 --- a/source/blender/editors/space_clip/clip_dopesheet_ops.cc +++ b/source/blender/editors/space_clip/clip_dopesheet_ops.cc @@ -18,15 +18,15 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" +#include "ED_clip.hh" #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "RNA_access.h" #include "RNA_define.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "clip_intern.h" /* own include */ diff --git a/source/blender/editors/space_clip/clip_draw.cc b/source/blender/editors/space_clip/clip_draw.cc index 3957854be67..4a61b78cc98 100644 --- a/source/blender/editors/space_clip/clip_draw.cc +++ b/source/blender/editors/space_clip/clip_draw.cc @@ -27,13 +27,13 @@ #include "BKE_movieclip.h" #include "BKE_tracking.h" -#include "ED_clip.h" -#include "ED_gpencil_legacy.h" -#include "ED_mask.h" +#include "ED_clip.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_mask.hh" #include "ED_screen.hh" #include "ED_util.hh" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "GPU_immediate.h" #include "GPU_immediate_util.h" @@ -42,9 +42,9 @@ #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLF_api.h" diff --git a/source/blender/editors/space_clip/clip_editor.cc b/source/blender/editors/space_clip/clip_editor.cc index 0b49c6de08e..044732ec8ac 100644 --- a/source/blender/editors/space_clip/clip_editor.cc +++ b/source/blender/editors/space_clip/clip_editor.cc @@ -41,15 +41,15 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "ED_clip.h" -#include "ED_mask.h" +#include "ED_clip.hh" +#include "ED_mask.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "clip_intern.h" /* own include */ diff --git a/source/blender/editors/space_clip/clip_graph_draw.cc b/source/blender/editors/space_clip/clip_graph_draw.cc index 444cd73feb2..8ac7d950338 100644 --- a/source/blender/editors/space_clip/clip_graph_draw.cc +++ b/source/blender/editors/space_clip/clip_graph_draw.cc @@ -16,7 +16,7 @@ #include "BKE_movieclip.h" #include "BKE_tracking.h" -#include "ED_clip.h" +#include "ED_clip.hh" #include "ED_screen.hh" #include "GPU_immediate.h" @@ -26,9 +26,9 @@ #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "clip_intern.h" /* own include */ diff --git a/source/blender/editors/space_clip/clip_graph_ops.cc b/source/blender/editors/space_clip/clip_graph_ops.cc index 283e88d5f08..55f64c92bc8 100644 --- a/source/blender/editors/space_clip/clip_graph_ops.cc +++ b/source/blender/editors/space_clip/clip_graph_ops.cc @@ -20,14 +20,14 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" +#include "ED_clip.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "RNA_access.h" #include "RNA_define.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "clip_intern.h" /* own include */ diff --git a/source/blender/editors/space_clip/clip_ops.cc b/source/blender/editors/space_clip/clip_ops.cc index b8aac71d97e..e2c8a5ef6ae 100644 --- a/source/blender/editors/space_clip/clip_ops.cc +++ b/source/blender/editors/space_clip/clip_ops.cc @@ -46,16 +46,16 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "ED_clip.h" +#include "ED_clip.hh" #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "PIL_time.h" diff --git a/source/blender/editors/space_clip/clip_utils.cc b/source/blender/editors/space_clip/clip_utils.cc index 027401f9df1..3393c9a146d 100644 --- a/source/blender/editors/space_clip/clip_utils.cc +++ b/source/blender/editors/space_clip/clip_utils.cc @@ -30,13 +30,13 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" -#include "ED_mask.h" +#include "ED_clip.hh" +#include "ED_mask.hh" #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "clip_intern.h" /* own include */ diff --git a/source/blender/editors/space_clip/space_clip.cc b/source/blender/editors/space_clip/space_clip.cc index fa1dc933a7e..0590cde1309 100644 --- a/source/blender/editors/space_clip/space_clip.cc +++ b/source/blender/editors/space_clip/space_clip.cc @@ -31,13 +31,13 @@ #include "IMB_imbuf_types.h" -#include "ED_anim_api.h" /* for timeline cursor drawing */ -#include "ED_clip.h" -#include "ED_mask.h" +#include "ED_anim_api.hh" /* for timeline cursor drawing */ +#include "ED_clip.hh" +#include "ED_mask.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_time_scrub_ui.h" -#include "ED_uvedit.h" /* just for ED_image_draw_cursor */ +#include "ED_space_api.hh" +#include "ED_time_scrub_ui.hh" +#include "ED_uvedit.hh" /* just for ED_image_draw_cursor */ #include "IMB_imbuf.h" @@ -46,9 +46,9 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_clip/tracking_ops.cc b/source/blender/editors/space_clip/tracking_ops.cc index f657f52b3e2..76de14b69ad 100644 --- a/source/blender/editors/space_clip/tracking_ops.cc +++ b/source/blender/editors/space_clip/tracking_ops.cc @@ -27,7 +27,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" +#include "ED_clip.hh" #include "ED_screen.hh" #include "RNA_access.h" diff --git a/source/blender/editors/space_clip/tracking_ops_detect.cc b/source/blender/editors/space_clip/tracking_ops_detect.cc index fee9b81bdbe..b8e83242308 100644 --- a/source/blender/editors/space_clip/tracking_ops_detect.cc +++ b/source/blender/editors/space_clip/tracking_ops_detect.cc @@ -18,7 +18,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" +#include "ED_clip.hh" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/space_clip/tracking_ops_orient.cc b/source/blender/editors/space_clip/tracking_ops_orient.cc index ff4bdf6faac..ff052a76e86 100644 --- a/source/blender/editors/space_clip/tracking_ops_orient.cc +++ b/source/blender/editors/space_clip/tracking_ops_orient.cc @@ -29,7 +29,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" +#include "ED_clip.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_clip/tracking_ops_plane.cc b/source/blender/editors/space_clip/tracking_ops_plane.cc index 216afa99ede..6bb649eafcc 100644 --- a/source/blender/editors/space_clip/tracking_ops_plane.cc +++ b/source/blender/editors/space_clip/tracking_ops_plane.cc @@ -23,7 +23,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" +#include "ED_clip.hh" #include "clip_intern.h" #include "tracking_ops_intern.h" diff --git a/source/blender/editors/space_clip/tracking_ops_solve.cc b/source/blender/editors/space_clip/tracking_ops_solve.cc index c0e34dc6d92..99b0967ba49 100644 --- a/source/blender/editors/space_clip/tracking_ops_solve.cc +++ b/source/blender/editors/space_clip/tracking_ops_solve.cc @@ -28,7 +28,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" +#include "ED_clip.hh" #include "clip_intern.h" diff --git a/source/blender/editors/space_clip/tracking_ops_stabilize.cc b/source/blender/editors/space_clip/tracking_ops_stabilize.cc index aefe5b9d7b9..7a462842ef1 100644 --- a/source/blender/editors/space_clip/tracking_ops_stabilize.cc +++ b/source/blender/editors/space_clip/tracking_ops_stabilize.cc @@ -19,7 +19,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" +#include "ED_clip.hh" #include "clip_intern.h" diff --git a/source/blender/editors/space_clip/tracking_ops_track.cc b/source/blender/editors/space_clip/tracking_ops_track.cc index cad4d61d224..6ddd8dc545b 100644 --- a/source/blender/editors/space_clip/tracking_ops_track.cc +++ b/source/blender/editors/space_clip/tracking_ops_track.cc @@ -23,7 +23,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" +#include "ED_clip.hh" #include "ED_screen.hh" #include "RNA_access.h" diff --git a/source/blender/editors/space_clip/tracking_select.cc b/source/blender/editors/space_clip/tracking_select.cc index c8430a795f9..0d70eb158ee 100644 --- a/source/blender/editors/space_clip/tracking_select.cc +++ b/source/blender/editors/space_clip/tracking_select.cc @@ -23,15 +23,15 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_clip.h" -#include "ED_mask.h" +#include "ED_clip.hh" +#include "ED_mask.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "RNA_access.h" #include "RNA_define.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/space_console/console_draw.cc b/source/blender/editors/space_console/console_draw.cc index 0b28051ff8f..33a15e2b236 100644 --- a/source/blender/editors/space_console/console_draw.cc +++ b/source/blender/editors/space_console/console_draw.cc @@ -18,9 +18,9 @@ #include "GPU_immediate.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "console_intern.hh" diff --git a/source/blender/editors/space_console/console_ops.cc b/source/blender/editors/space_console/console_ops.cc index 4a779fdb1f1..edc31c98af0 100644 --- a/source/blender/editors/space_console/console_ops.cc +++ b/source/blender/editors/space_console/console_ops.cc @@ -30,7 +30,7 @@ #include "WM_types.hh" #include "ED_screen.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_console/space_console.cc b/source/blender/editors/space_console/space_console.cc index d53a92eb8c8..3c9583536fc 100644 --- a/source/blender/editors/space_console/space_console.cc +++ b/source/blender/editors/space_console/space_console.cc @@ -19,7 +19,7 @@ #include "BKE_screen.h" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "RNA_access.h" #include "RNA_path.h" @@ -27,8 +27,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_file/asset_catalog_tree_view.cc b/source/blender/editors/space_file/asset_catalog_tree_view.cc index 390863b283e..66ca81dbd8d 100644 --- a/source/blender/editors/space_file/asset_catalog_tree_view.cc +++ b/source/blender/editors/space_file/asset_catalog_tree_view.cc @@ -18,15 +18,14 @@ #include "BLT_translation.h" -#include "ED_asset.h" -#include "ED_fileselect.h" -#include "ED_undo.h" +#include "ED_asset.hh" +#include "ED_fileselect.hh" +#include "ED_undo.hh" #include "RNA_access.h" -#include "UI_interface.h" #include "UI_interface.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "UI_tree_view.hh" #include "WM_api.hh" diff --git a/source/blender/editors/space_file/file_context.cc b/source/blender/editors/space_file/file_context.cc index 0409557e46b..81c6a25c219 100644 --- a/source/blender/editors/space_file/file_context.cc +++ b/source/blender/editors/space_file/file_context.cc @@ -8,7 +8,7 @@ #include "BKE_context.h" -#include "ED_fileselect.h" +#include "ED_fileselect.hh" #include "ED_screen.hh" #include "RNA_prototypes.h" diff --git a/source/blender/editors/space_file/file_draw.cc b/source/blender/editors/space_file/file_draw.cc index fdcafb71b83..e2d8ac8e574 100644 --- a/source/blender/editors/space_file/file_draw.cc +++ b/source/blender/editors/space_file/file_draw.cc @@ -22,7 +22,7 @@ # include "BLI_winstuff.h" #endif -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "BKE_blendfile.h" #include "BKE_context.h" @@ -40,13 +40,13 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "ED_fileselect.h" +#include "ED_fileselect.hh" #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_file/file_indexer.hh b/source/blender/editors/space_file/file_indexer.hh index 9a15e5d7abe..989338eb5a1 100644 --- a/source/blender/editors/space_file/file_indexer.hh +++ b/source/blender/editors/space_file/file_indexer.hh @@ -7,7 +7,7 @@ */ #pragma once -#include "ED_file_indexer.h" +#include "ED_file_indexer.hh" /** * Default indexer to use when listing files. The implementation is a no-operation indexing. When diff --git a/source/blender/editors/space_file/file_ops.cc b/source/blender/editors/space_file/file_ops.cc index 738a213ea47..2c91b09ec45 100644 --- a/source/blender/editors/space_file/file_ops.cc +++ b/source/blender/editors/space_file/file_ops.cc @@ -26,21 +26,21 @@ # include "BLI_winstuff.h" #endif -#include "ED_asset.h" -#include "ED_fileselect.h" +#include "ED_asset.hh" +#include "ED_fileselect.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" #include "MEM_guardedalloc.h" #include "RNA_access.h" #include "RNA_define.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_file/file_panels.cc b/source/blender/editors/space_file/file_panels.cc index 3ff14301a73..9fd692e3797 100644 --- a/source/blender/editors/space_file/file_panels.cc +++ b/source/blender/editors/space_file/file_panels.cc @@ -24,11 +24,11 @@ #include "RNA_define.h" #include "RNA_prototypes.h" -#include "ED_fileselect.h" +#include "ED_fileselect.hh" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_file/file_utils.cc b/source/blender/editors/space_file/file_utils.cc index 5e8b5795fe1..556cf3f1419 100644 --- a/source/blender/editors/space_file/file_utils.cc +++ b/source/blender/editors/space_file/file_utils.cc @@ -14,7 +14,7 @@ #include "BKE_blendfile.h" #include "BKE_context.h" -#include "ED_fileselect.h" +#include "ED_fileselect.hh" #include "ED_screen.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_file/filelist.cc b/source/blender/editors/space_file/filelist.cc index ca26260bf38..c2642f7abfb 100644 --- a/source/blender/editors/space_file/filelist.cc +++ b/source/blender/editors/space_file/filelist.cc @@ -63,7 +63,7 @@ #include "DNA_space_types.h" #include "ED_datafiles.h" -#include "ED_fileselect.h" +#include "ED_fileselect.hh" #include "ED_screen.hh" #include "IMB_imbuf.h" @@ -75,8 +75,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface_icons.h" -#include "UI_resources.h" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" #include "atomic_ops.h" diff --git a/source/blender/editors/space_file/filesel.cc b/source/blender/editors/space_file/filesel.cc index 5430b8a1d42..0e5270cc209 100644 --- a/source/blender/editors/space_file/filesel.cc +++ b/source/blender/editors/space_file/filesel.cc @@ -49,7 +49,7 @@ #include "BLF_api.h" -#include "ED_fileselect.h" +#include "ED_fileselect.hh" #include "ED_screen.hh" #include "WM_api.hh" @@ -57,9 +57,9 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_view2d.hh" #include "AS_asset_representation.hh" #include "AS_essentials_library.hh" diff --git a/source/blender/editors/space_file/folder_history.cc b/source/blender/editors/space_file/folder_history.cc index 24d49f59cfb..b5d2bf7dedb 100644 --- a/source/blender/editors/space_file/folder_history.cc +++ b/source/blender/editors/space_file/folder_history.cc @@ -18,7 +18,7 @@ #include "DNA_space_types.h" -#include "ED_fileselect.h" +#include "ED_fileselect.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_file/fsmenu.cc b/source/blender/editors/space_file/fsmenu.cc index 0a54b405625..86dbcb952cf 100644 --- a/source/blender/editors/space_file/fsmenu.cc +++ b/source/blender/editors/space_file/fsmenu.cc @@ -21,10 +21,10 @@ #include "BKE_appdir.h" -#include "ED_fileselect.h" +#include "ED_fileselect.hh" -#include "UI_interface_icons.h" -#include "UI_resources.h" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_file/fsmenu_system.cc b/source/blender/editors/space_file/fsmenu_system.cc index 83774b96e52..2655e25b411 100644 --- a/source/blender/editors/space_file/fsmenu_system.cc +++ b/source/blender/editors/space_file/fsmenu_system.cc @@ -27,7 +27,7 @@ #include "BKE_appdir.h" -#include "ED_fileselect.h" +#include "ED_fileselect.hh" #ifdef WIN32 /* Need to include windows.h so _WIN32_IE is defined. */ @@ -39,7 +39,7 @@ # include #endif -#include "UI_resources.h" +#include "UI_resources.hh" #ifdef __APPLE__ # include diff --git a/source/blender/editors/space_file/space_file.cc b/source/blender/editors/space_file/space_file.cc index 0b09db7ab56..50ececbfdcc 100644 --- a/source/blender/editors/space_file/space_file.cc +++ b/source/blender/editors/space_file/space_file.cc @@ -31,17 +31,17 @@ #include "WM_message.hh" #include "WM_types.hh" -#include "ED_asset.h" +#include "ED_asset.hh" #include "ED_asset_indexer.h" -#include "ED_fileselect.h" +#include "ED_fileselect.hh" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "IMB_imbuf_types.h" #include "IMB_thumbs.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_graph/graph_buttons.cc b/source/blender/editors/space_graph/graph_buttons.cc index 4fadb5b3a4d..fe40b178d8c 100644 --- a/source/blender/editors/space_graph/graph_buttons.cc +++ b/source/blender/editors/space_graph/graph_buttons.cc @@ -45,13 +45,13 @@ #include "RNA_path.h" #include "RNA_prototypes.h" -#include "ED_anim_api.h" -#include "ED_keyframing.h" +#include "ED_anim_api.hh" +#include "ED_keyframing.hh" #include "ED_screen.hh" -#include "ED_undo.h" +#include "ED_undo.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "graph_intern.h" /* own include */ diff --git a/source/blender/editors/space_graph/graph_draw.cc b/source/blender/editors/space_graph/graph_draw.cc index 39f2a601856..c5c6d4f4c12 100644 --- a/source/blender/editors/space_graph/graph_draw.cc +++ b/source/blender/editors/space_graph/graph_draw.cc @@ -34,13 +34,13 @@ #include "GPU_matrix.h" #include "GPU_state.h" -#include "ED_anim_api.h" +#include "ED_anim_api.hh" #include "graph_intern.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" static void graph_draw_driver_debug(bAnimContext *ac, ID *id, FCurve *fcu); diff --git a/source/blender/editors/space_graph/graph_edit.cc b/source/blender/editors/space_graph/graph_edit.cc index a4daf77b8c4..816c3822000 100644 --- a/source/blender/editors/space_graph/graph_edit.cc +++ b/source/blender/editors/space_graph/graph_edit.cc @@ -43,15 +43,15 @@ #include "DEG_depsgraph_build.h" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" -#include "ED_anim_api.h" -#include "ED_keyframes_edit.h" -#include "ED_keyframing.h" -#include "ED_markers.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_edit.hh" +#include "ED_keyframing.hh" +#include "ED_markers.hh" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_graph/graph_intern.h b/source/blender/editors/space_graph/graph_intern.h index 4dd3e7154f9..3d1eabd4df9 100644 --- a/source/blender/editors/space_graph/graph_intern.h +++ b/source/blender/editors/space_graph/graph_intern.h @@ -143,7 +143,7 @@ void GRAPH_OT_equalize_handles(struct wmOperatorType *ot); void GRAPH_OT_mirror(struct wmOperatorType *ot); /* defines for snap keyframes - * NOTE: keep in sync with eEditKeyframes_Snap (in ED_keyframes_edit.h) + * NOTE: keep in sync with eEditKeyframes_Snap (in ED_keyframes_edit.hh) */ enum eGraphKeys_Snap_Mode { GRAPHKEYS_SNAP_CFRA = 1, @@ -155,7 +155,7 @@ enum eGraphKeys_Snap_Mode { }; /* Defines for equalize keyframe handles. - * NOTE: Keep in sync with eEditKeyframes_Equalize (in ED_keyframes_edit.h). + * NOTE: Keep in sync with eEditKeyframes_Equalize (in ED_keyframes_edit.hh). */ enum eGraphKeys_Equalize_Mode { GRAPHKEYS_EQUALIZE_LEFT = 1, @@ -164,7 +164,7 @@ enum eGraphKeys_Equalize_Mode { }; /* defines for mirror keyframes - * NOTE: keep in sync with eEditKeyframes_Mirror (in ED_keyframes_edit.h) + * NOTE: keep in sync with eEditKeyframes_Mirror (in ED_keyframes_edit.hh) */ enum eGraphKeys_Mirror_Mode { GRAPHKEYS_MIRROR_CFRA = 1, diff --git a/source/blender/editors/space_graph/graph_ops.cc b/source/blender/editors/space_graph/graph_ops.cc index b30f6f489cd..a21e6883c83 100644 --- a/source/blender/editors/space_graph/graph_ops.cc +++ b/source/blender/editors/space_graph/graph_ops.cc @@ -18,11 +18,11 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" -#include "ED_anim_api.h" +#include "ED_anim_api.hh" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" #include "graph_intern.h" diff --git a/source/blender/editors/space_graph/graph_select.cc b/source/blender/editors/space_graph/graph_select.cc index f988be5f6a2..2f2e1feb89c 100644 --- a/source/blender/editors/space_graph/graph_select.cc +++ b/source/blender/editors/space_graph/graph_select.cc @@ -30,12 +30,12 @@ #include "BKE_fcurve.h" #include "BKE_nla.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" -#include "ED_anim_api.h" -#include "ED_keyframes_edit.h" -#include "ED_markers.h" -#include "ED_select_utils.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_edit.hh" +#include "ED_markers.hh" +#include "ED_select_utils.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_graph/graph_slider_ops.cc b/source/blender/editors/space_graph/graph_slider_ops.cc index 7a95692cdcf..cf04e8b3e7f 100644 --- a/source/blender/editors/space_graph/graph_slider_ops.cc +++ b/source/blender/editors/space_graph/graph_slider_ops.cc @@ -31,11 +31,11 @@ #include "BKE_context.h" -#include "UI_interface.h" +#include "UI_interface.hh" -#include "ED_anim_api.h" -#include "ED_keyframes_edit.h" -#include "ED_numinput.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_edit.hh" +#include "ED_numinput.hh" #include "ED_screen.hh" #include "ED_util.hh" diff --git a/source/blender/editors/space_graph/graph_utils.cc b/source/blender/editors/space_graph/graph_utils.cc index c708a613ddb..733ce8ca84a 100644 --- a/source/blender/editors/space_graph/graph_utils.cc +++ b/source/blender/editors/space_graph/graph_utils.cc @@ -23,9 +23,9 @@ #include "BKE_fcurve.h" #include "BKE_screen.h" -#include "ED_anim_api.h" +#include "ED_anim_api.hh" #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/editors/space_graph/graph_view.cc b/source/blender/editors/space_graph/graph_view.cc index 6eb21805bd4..f19e7ee68ac 100644 --- a/source/blender/editors/space_graph/graph_view.cc +++ b/source/blender/editors/space_graph/graph_view.cc @@ -25,11 +25,11 @@ #include "BKE_fcurve.h" #include "BKE_nla.h" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" -#include "ED_anim_api.h" -#include "ED_markers.h" +#include "ED_anim_api.hh" +#include "ED_markers.hh" #include "ED_screen.hh" #include "WM_api.hh" diff --git a/source/blender/editors/space_graph/space_graph.cc b/source/blender/editors/space_graph/space_graph.cc index 7f83db802bc..0527f998897 100644 --- a/source/blender/editors/space_graph/space_graph.cc +++ b/source/blender/editors/space_graph/space_graph.cc @@ -24,11 +24,11 @@ #include "BKE_lib_remap.h" #include "BKE_screen.h" -#include "ED_anim_api.h" -#include "ED_markers.h" +#include "ED_anim_api.hh" +#include "ED_markers.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_time_scrub_ui.h" +#include "ED_space_api.hh" +#include "ED_time_scrub_ui.hh" #include "GPU_framebuffer.h" #include "GPU_immediate.h" @@ -42,9 +42,9 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_image/image_buttons.cc b/source/blender/editors/space_image/image_buttons.cc index ddb1af6b481..db578447fa2 100644 --- a/source/blender/editors/space_image/image_buttons.cc +++ b/source/blender/editors/space_image/image_buttons.cc @@ -32,8 +32,8 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "ED_gpencil_legacy.h" -#include "ED_image.h" +#include "ED_gpencil_legacy.hh" +#include "ED_image.hh" #include "ED_screen.hh" #include "RNA_access.h" @@ -41,8 +41,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "image_intern.h" diff --git a/source/blender/editors/space_image/image_draw.cc b/source/blender/editors/space_image/image_draw.cc index 04741226bad..46e53c92c1c 100644 --- a/source/blender/editors/space_image/image_draw.cc +++ b/source/blender/editors/space_image/image_draw.cc @@ -39,7 +39,7 @@ #include "BKE_image.h" #include "BKE_paint.hh" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "GPU_framebuffer.h" #include "GPU_immediate.h" @@ -49,16 +49,16 @@ #include "BLF_api.h" -#include "ED_gpencil_legacy.h" -#include "ED_image.h" -#include "ED_mask.h" -#include "ED_render.h" +#include "ED_gpencil_legacy.hh" +#include "ED_image.hh" +#include "ED_mask.hh" +#include "ED_render.hh" #include "ED_screen.hh" #include "ED_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "RE_engine.h" #include "RE_pipeline.h" diff --git a/source/blender/editors/space_image/image_edit.cc b/source/blender/editors/space_image/image_edit.cc index 6612ddb2863..61f574f699c 100644 --- a/source/blender/editors/space_image/image_edit.cc +++ b/source/blender/editors/space_image/image_edit.cc @@ -28,12 +28,12 @@ #include "DEG_depsgraph.h" -#include "ED_image.h" /* own include */ -#include "ED_mesh.h" +#include "ED_image.hh" /* own include */ +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_uvedit.h" +#include "ED_uvedit.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_image/image_ops.cc b/source/blender/editors/space_image/image_ops.cc index 7bfeaf3e31c..ebd89b5f74a 100644 --- a/source/blender/editors/space_image/image_ops.cc +++ b/source/blender/editors/space_image/image_ops.cc @@ -65,20 +65,20 @@ #include "RNA_enum_types.h" #include "RNA_prototypes.h" -#include "ED_image.h" -#include "ED_mask.h" -#include "ED_paint.h" -#include "ED_render.h" +#include "ED_image.hh" +#include "ED_mask.hh" +#include "ED_paint.hh" +#include "ED_render.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_undo.h" +#include "ED_space_api.hh" +#include "ED_undo.hh" #include "ED_util.hh" -#include "ED_util_imbuf.h" -#include "ED_uvedit.h" +#include "ED_util_imbuf.hh" +#include "ED_uvedit.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_image/image_sequence.cc b/source/blender/editors/space_image/image_sequence.cc index 294c5a909d3..136350ba766 100644 --- a/source/blender/editors/space_image/image_sequence.cc +++ b/source/blender/editors/space_image/image_sequence.cc @@ -26,7 +26,7 @@ #include "BKE_image.h" #include "BKE_main.h" -#include "ED_image.h" +#include "ED_image.hh" struct ImageFrame { ImageFrame *next, *prev; diff --git a/source/blender/editors/space_image/image_undo.cc b/source/blender/editors/space_image/image_undo.cc index f95d96ec35d..be9ce8fae61 100644 --- a/source/blender/editors/space_image/image_undo.cc +++ b/source/blender/editors/space_image/image_undo.cc @@ -45,9 +45,9 @@ #include "DEG_depsgraph.h" -#include "ED_object.h" -#include "ED_paint.h" -#include "ED_undo.h" +#include "ED_object.hh" +#include "ED_paint.hh" +#include "ED_undo.hh" #include "ED_util.hh" #include "WM_api.hh" diff --git a/source/blender/editors/space_image/space_image.cc b/source/blender/editors/space_image/space_image.cc index 2c271baf2c8..258624f220c 100644 --- a/source/blender/editors/space_image/space_image.cc +++ b/source/blender/editors/space_image/space_image.cc @@ -35,22 +35,22 @@ #include "IMB_imbuf_types.h" -#include "ED_image.h" -#include "ED_mask.h" -#include "ED_node.h" -#include "ED_render.h" +#include "ED_image.hh" +#include "ED_mask.hh" +#include "ED_node.hh" +#include "ED_render.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_transform.h" +#include "ED_space_api.hh" +#include "ED_transform.hh" #include "ED_util.hh" -#include "ED_uvedit.h" +#include "ED_uvedit.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_info/info_draw.cc b/source/blender/editors/space_info/info_draw.cc index 290fdc925e9..399b03313d2 100644 --- a/source/blender/editors/space_info/info_draw.cc +++ b/source/blender/editors/space_info/info_draw.cc @@ -16,9 +16,9 @@ #include "BKE_report.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "info_intern.hh" #include "textview.hh" diff --git a/source/blender/editors/space_info/info_ops.cc b/source/blender/editors/space_info/info_ops.cc index 7bc3f9076c3..6e156fec8a0 100644 --- a/source/blender/editors/space_info/info_ops.cc +++ b/source/blender/editors/space_info/info_ops.cc @@ -33,8 +33,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_info/info_report.cc b/source/blender/editors/space_info/info_report.cc index 965796bce45..2533876666b 100644 --- a/source/blender/editors/space_info/info_report.cc +++ b/source/blender/editors/space_info/info_report.cc @@ -22,7 +22,7 @@ #include "WM_types.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_info/info_stats.cc b/source/blender/editors/space_info/info_stats.cc index 5643afee2f5..715493ec162 100644 --- a/source/blender/editors/space_info/info_stats.cc +++ b/source/blender/editors/space_info/info_stats.cc @@ -55,11 +55,11 @@ #include "DEG_depsgraph_query.h" -#include "ED_info.h" +#include "ED_info.hh" #include "WM_api.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "GPU_capabilities.h" diff --git a/source/blender/editors/space_info/space_info.cc b/source/blender/editors/space_info/space_info.cc index 2aabdda36cb..8a6f4353037 100644 --- a/source/blender/editors/space_info/space_info.cc +++ b/source/blender/editors/space_info/space_info.cc @@ -18,7 +18,7 @@ #include "BKE_screen.h" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "WM_api.hh" #include "WM_message.hh" @@ -26,8 +26,8 @@ #include "RNA_access.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_info/textview.cc b/source/blender/editors/space_info/textview.cc index 940d740b474..1eeae838ec3 100644 --- a/source/blender/editors/space_info/textview.cc +++ b/source/blender/editors/space_info/textview.cc @@ -19,8 +19,8 @@ #include "DNA_userdef_types.h" /* For 'UI_SCALE_FAC' */ -#include "UI_interface.h" -#include "UI_interface_icons.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" #include "textview.hh" diff --git a/source/blender/editors/space_nla/nla_buttons.cc b/source/blender/editors/space_nla/nla_buttons.cc index 6be4cf12428..070537547fb 100644 --- a/source/blender/editors/space_nla/nla_buttons.cc +++ b/source/blender/editors/space_nla/nla_buttons.cc @@ -32,11 +32,11 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "ED_anim_api.h" +#include "ED_anim_api.hh" #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "nla_intern.hh" /* own include */ diff --git a/source/blender/editors/space_nla/nla_channels.cc b/source/blender/editors/space_nla/nla_channels.cc index f401548e44f..d15174c8bfd 100644 --- a/source/blender/editors/space_nla/nla_channels.cc +++ b/source/blender/editors/space_nla/nla_channels.cc @@ -27,9 +27,9 @@ #include "BKE_scene.h" #include "BKE_screen.h" -#include "ED_anim_api.h" -#include "ED_keyframes_edit.h" -#include "ED_object.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_edit.hh" +#include "ED_object.hh" #include "ED_screen.hh" #include "RNA_access.h" @@ -38,12 +38,12 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "nla_intern.hh" /* own include */ diff --git a/source/blender/editors/space_nla/nla_draw.cc b/source/blender/editors/space_nla/nla_draw.cc index 44d66e3cc19..b5baf79d64b 100644 --- a/source/blender/editors/space_nla/nla_draw.cc +++ b/source/blender/editors/space_nla/nla_draw.cc @@ -29,9 +29,9 @@ #include "BKE_nla.h" #include "BKE_screen.h" -#include "ED_anim_api.h" -#include "ED_keyframes_draw.h" -#include "ED_keyframes_keylist.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_draw.hh" +#include "ED_keyframes_keylist.hh" #include "GPU_immediate.h" #include "GPU_immediate_util.h" @@ -39,9 +39,9 @@ #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "nla_intern.hh" /* own include */ #include "nla_private.h" diff --git a/source/blender/editors/space_nla/nla_edit.cc b/source/blender/editors/space_nla/nla_edit.cc index 14180a75f97..5198168569a 100644 --- a/source/blender/editors/space_nla/nla_edit.cc +++ b/source/blender/editors/space_nla/nla_edit.cc @@ -31,11 +31,11 @@ #include "BKE_report.h" #include "BKE_screen.h" -#include "ED_anim_api.h" -#include "ED_keyframes_edit.h" -#include "ED_markers.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_edit.hh" +#include "ED_markers.hh" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" #include "RNA_access.h" #include "RNA_define.h" @@ -47,8 +47,8 @@ #include "DEG_depsgraph_build.h" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "nla_intern.hh" #include "nla_private.h" diff --git a/source/blender/editors/space_nla/nla_ops.cc b/source/blender/editors/space_nla/nla_ops.cc index 82be5fc83e6..ee4b5583906 100644 --- a/source/blender/editors/space_nla/nla_ops.cc +++ b/source/blender/editors/space_nla/nla_ops.cc @@ -14,7 +14,7 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "ED_anim_api.h" +#include "ED_anim_api.hh" #include "ED_screen.hh" #include "RNA_access.h" diff --git a/source/blender/editors/space_nla/nla_select.cc b/source/blender/editors/space_nla/nla_select.cc index 5bddd37da5f..875282c562f 100644 --- a/source/blender/editors/space_nla/nla_select.cc +++ b/source/blender/editors/space_nla/nla_select.cc @@ -21,10 +21,10 @@ #include "BKE_nla.h" #include "BKE_screen.h" -#include "ED_anim_api.h" -#include "ED_keyframes_edit.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_edit.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "RNA_access.h" #include "RNA_define.h" @@ -32,8 +32,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "nla_intern.hh" /* own include */ diff --git a/source/blender/editors/space_nla/space_nla.cc b/source/blender/editors/space_nla/space_nla.cc index 4d6e0dfdb2d..0d3fa237652 100644 --- a/source/blender/editors/space_nla/space_nla.cc +++ b/source/blender/editors/space_nla/space_nla.cc @@ -21,11 +21,11 @@ #include "BKE_lib_remap.h" #include "BKE_screen.h" -#include "ED_anim_api.h" -#include "ED_markers.h" +#include "ED_anim_api.hh" +#include "ED_markers.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_time_scrub_ui.h" +#include "ED_space_api.hh" +#include "ED_time_scrub_ui.hh" #include "WM_api.hh" #include "WM_message.hh" @@ -33,9 +33,9 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_node/add_menu_assets.cc b/source/blender/editors/space_node/add_menu_assets.cc index 013d995c983..c2bec8e4106 100644 --- a/source/blender/editors/space_node/add_menu_assets.cc +++ b/source/blender/editors/space_node/add_menu_assets.cc @@ -20,7 +20,7 @@ #include "RNA_access.h" -#include "ED_asset.h" +#include "ED_asset.hh" #include "ED_screen.hh" #include "node_intern.hh" diff --git a/source/blender/editors/space_node/add_node_search.cc b/source/blender/editors/space_node/add_node_search.cc index df64ac4bd3d..2533e353cb1 100644 --- a/source/blender/editors/space_node/add_node_search.cc +++ b/source/blender/editors/space_node/add_node_search.cc @@ -31,8 +31,8 @@ #include "NOD_add_node_search.hh" -#include "ED_asset.h" -#include "ED_node.h" +#include "ED_asset.hh" +#include "ED_node.hh" #include "node_intern.hh" diff --git a/source/blender/editors/space_node/clipboard.cc b/source/blender/editors/space_node/clipboard.cc index 77550487c92..7d9619476da 100644 --- a/source/blender/editors/space_node/clipboard.cc +++ b/source/blender/editors/space_node/clipboard.cc @@ -13,9 +13,8 @@ #include "BKE_node_tree_update.h" #include "BKE_report.h" -#include "ED_node.h" #include "ED_node.hh" -#include "ED_render.h" +#include "ED_render.hh" #include "ED_screen.hh" #include "NOD_socket.hh" diff --git a/source/blender/editors/space_node/drawnode.cc b/source/blender/editors/space_node/drawnode.cc index b00bb346a94..e65200c51ab 100644 --- a/source/blender/editors/space_node/drawnode.cc +++ b/source/blender/editors/space_node/drawnode.cc @@ -30,7 +30,7 @@ #include "BLF_api.h" #include "BLT_translation.h" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "GPU_batch.h" #include "GPU_batch_presets.h" @@ -48,14 +48,14 @@ #include "RNA_define.h" #include "RNA_prototypes.h" -#include "ED_node.h" -#include "ED_space_api.h" +#include "ED_node.hh" +#include "ED_space_api.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "IMB_colormanagement.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/space_node/link_drag_search.cc b/source/blender/editors/space_node/link_drag_search.cc index 6d72c94ba7c..60b9e656632 100644 --- a/source/blender/editors/space_node/link_drag_search.cc +++ b/source/blender/editors/space_node/link_drag_search.cc @@ -28,8 +28,8 @@ #include "DEG_depsgraph_build.h" -#include "ED_asset.h" -#include "ED_node.h" +#include "ED_asset.hh" +#include "ED_node.hh" #include "node_intern.hh" diff --git a/source/blender/editors/space_node/node_add.cc b/source/blender/editors/space_node/node_add.cc index 4f11195adc1..306b4920a95 100644 --- a/source/blender/editors/space_node/node_add.cc +++ b/source/blender/editors/space_node/node_add.cc @@ -33,9 +33,9 @@ #include "DEG_depsgraph_build.h" -#include "ED_asset.h" -#include "ED_node.h" /* own include */ -#include "ED_render.h" +#include "ED_asset.hh" +#include "ED_node.hh" /* own include */ +#include "ED_render.hh" #include "ED_screen.hh" #include "RNA_access.h" @@ -46,7 +46,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "node_intern.hh" /* own include */ diff --git a/source/blender/editors/space_node/node_context_path.cc b/source/blender/editors/space_node/node_context_path.cc index bd694259824..8ac7db7a384 100644 --- a/source/blender/editors/space_node/node_context_path.cc +++ b/source/blender/editors/space_node/node_context_path.cc @@ -23,9 +23,8 @@ #include "ED_screen.hh" -#include "UI_interface.h" #include "UI_interface.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "node_intern.hh" diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc index 4ec7fa5dcb5..4b4626a7b05 100644 --- a/source/blender/editors/space_node/node_draw.cc +++ b/source/blender/editors/space_node/node_draw.cc @@ -53,7 +53,7 @@ #include "BLF_api.h" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "GPU_framebuffer.h" #include "GPU_immediate.h" @@ -66,16 +66,15 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_gpencil_legacy.h" -#include "ED_node.h" +#include "ED_gpencil_legacy.hh" #include "ED_node.hh" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "ED_viewer_path.hh" #include "UI_interface.hh" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc index 05f54a8ed7d..77540789b47 100644 --- a/source/blender/editors/space_node/node_edit.cc +++ b/source/blender/editors/space_node/node_edit.cc @@ -43,12 +43,11 @@ #include "RE_engine.h" #include "RE_pipeline.h" -#include "ED_image.h" -#include "ED_node.h" /* own include */ +#include "ED_image.hh" #include "ED_node.hh" /* own include */ -#include "ED_render.h" +#include "ED_render.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "ED_viewer_path.hh" #include "RNA_access.h" @@ -59,7 +58,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "GPU_material.h" diff --git a/source/blender/editors/space_node/node_geometry_attribute_search.cc b/source/blender/editors/space_node/node_geometry_attribute_search.cc index e205f7eb5cc..843ef2c8864 100644 --- a/source/blender/editors/space_node/node_geometry_attribute_search.cc +++ b/source/blender/editors/space_node/node_geometry_attribute_search.cc @@ -24,15 +24,14 @@ #include "RNA_access.h" #include "RNA_enum_types.h" -#include "ED_node.h" +#include "ED_node.hh" #include "ED_screen.hh" -#include "ED_undo.h" +#include "ED_undo.hh" #include "BLT_translation.h" -#include "UI_interface.h" #include "UI_interface.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "NOD_geometry_nodes_log.hh" diff --git a/source/blender/editors/space_node/node_gizmo.cc b/source/blender/editors/space_node/node_gizmo.cc index a41276ac53a..b4a9c5e617a 100644 --- a/source/blender/editors/space_node/node_gizmo.cc +++ b/source/blender/editors/space_node/node_gizmo.cc @@ -17,7 +17,7 @@ #include "BKE_image.h" #include "BKE_main.h" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/space_node/node_group.cc b/source/blender/editors/space_node/node_group.cc index 9849e30c0d9..45149b61233 100644 --- a/source/blender/editors/space_node/node_group.cc +++ b/source/blender/editors/space_node/node_group.cc @@ -37,9 +37,9 @@ #include "DEG_depsgraph_build.h" -#include "ED_node.h" /* own include */ +#include "ED_node.hh" /* own include */ #include "ED_node.hh" -#include "ED_render.h" +#include "ED_render.hh" #include "ED_screen.hh" #include "RNA_access.h" @@ -50,7 +50,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "NOD_common.h" #include "NOD_composite.h" diff --git a/source/blender/editors/space_node/node_intern.hh b/source/blender/editors/space_node/node_intern.hh index bac73fb4894..b43e184e93d 100644 --- a/source/blender/editors/space_node/node_intern.hh +++ b/source/blender/editors/space_node/node_intern.hh @@ -15,9 +15,8 @@ #include "BKE_node.hh" -#include "UI_interface.h" #include "UI_interface.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" struct ARegion; struct NodeInsertOfsData; diff --git a/source/blender/editors/space_node/node_ops.cc b/source/blender/editors/space_node/node_ops.cc index 17b02384317..b7713d5cdf2 100644 --- a/source/blender/editors/space_node/node_ops.cc +++ b/source/blender/editors/space_node/node_ops.cc @@ -10,7 +10,7 @@ #include "BKE_context.h" -#include "ED_node.h" /* own include */ +#include "ED_node.hh" /* own include */ #include "ED_screen.hh" #include "RNA_access.h" diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc index 0daf1544e0b..a0bc3ea07d5 100644 --- a/source/blender/editors/space_node/node_relationships.cc +++ b/source/blender/editors/space_node/node_relationships.cc @@ -25,9 +25,9 @@ #include "BKE_screen.h" #include "ED_node.hh" /* own include */ -#include "ED_render.h" +#include "ED_render.hh" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "ED_util.hh" #include "ED_viewer_path.hh" @@ -42,9 +42,9 @@ #include "GPU_state.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/space_node/node_select.cc b/source/blender/editors/space_node/node_select.cc index 0d09d69466b..ad3dbca796f 100644 --- a/source/blender/editors/space_node/node_select.cc +++ b/source/blender/editors/space_node/node_select.cc @@ -27,11 +27,11 @@ #include "BKE_node_tree_update.h" #include "BKE_workspace.h" -#include "ED_node.h" /* own include */ +#include "ED_node.hh" /* own include */ #include "ED_node.hh" /* own include */ #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_view3d.hh" #include "ED_viewer_path.hh" #include "RNA_access.h" @@ -40,9 +40,9 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/space_node/node_templates.cc b/source/blender/editors/space_node/node_templates.cc index 87d48ea7cb2..b8864445b14 100644 --- a/source/blender/editors/space_node/node_templates.cc +++ b/source/blender/editors/space_node/node_templates.cc @@ -36,12 +36,12 @@ #include "NOD_socket_declarations.hh" #include "../interface/interface_intern.hh" /* XXX bad level */ -#include "UI_interface.h" +#include "UI_interface.hh" -#include "ED_node.h" /* own include */ +#include "ED_node.hh" /* own include */ #include "node_intern.hh" -#include "ED_undo.h" +#include "ED_undo.hh" using blender::nodes::NodeDeclaration; diff --git a/source/blender/editors/space_node/node_view.cc b/source/blender/editors/space_node/node_view.cc index 5b5363fb80e..26d8b286edb 100644 --- a/source/blender/editors/space_node/node_view.cc +++ b/source/blender/editors/space_node/node_view.cc @@ -20,10 +20,10 @@ #include "BKE_node_runtime.hh" #include "BKE_screen.h" -#include "ED_image.h" -#include "ED_node.h" /* own include */ +#include "ED_image.hh" +#include "ED_node.hh" /* own include */ #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "RNA_access.h" #include "RNA_define.h" @@ -31,7 +31,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_node/space_node.cc b/source/blender/editors/space_node/space_node.cc index 3995669c27c..9c890a71398 100644 --- a/source/blender/editors/space_node/space_node.cc +++ b/source/blender/editors/space_node/space_node.cc @@ -23,13 +23,13 @@ #include "BKE_node_runtime.hh" #include "BKE_screen.h" -#include "ED_node.h" -#include "ED_render.h" +#include "ED_node.hh" +#include "ED_render.hh" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/space_outliner/outliner_collections.cc b/source/blender/editors/space_outliner/outliner_collections.cc index 0aae7c3f415..087cec7070e 100644 --- a/source/blender/editors/space_outliner/outliner_collections.cc +++ b/source/blender/editors/space_outliner/outliner_collections.cc @@ -26,8 +26,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_object.h" -#include "ED_outliner.h" +#include "ED_object.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" #include "WM_api.hh" diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.cc b/source/blender/editors/space_outliner/outliner_dragdrop.cc index 6efc155a89e..046401bd98e 100644 --- a/source/blender/editors/space_outliner/outliner_dragdrop.cc +++ b/source/blender/editors/space_outliner/outliner_dragdrop.cc @@ -32,12 +32,12 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_object.h" -#include "ED_outliner.h" +#include "ED_object.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "RNA_access.h" diff --git a/source/blender/editors/space_outliner/outliner_draw.cc b/source/blender/editors/space_outliner/outliner_draw.cc index f79bfe32b7f..866d5c3f004 100644 --- a/source/blender/editors/space_outliner/outliner_draw.cc +++ b/source/blender/editors/space_outliner/outliner_draw.cc @@ -48,9 +48,9 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_armature.h" -#include "ED_fileselect.h" -#include "ED_outliner.h" +#include "ED_armature.hh" +#include "ED_fileselect.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" #include "WM_api.hh" @@ -60,10 +60,10 @@ #include "GPU_immediate.h" #include "GPU_state.h" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "RNA_access.h" diff --git a/source/blender/editors/space_outliner/outliner_edit.cc b/source/blender/editors/space_outliner/outliner_edit.cc index 1c68a6eb670..2118f01ef8f 100644 --- a/source/blender/editors/space_outliner/outliner_edit.cc +++ b/source/blender/editors/space_outliner/outliner_edit.cc @@ -43,16 +43,16 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_keyframing.h" -#include "ED_outliner.h" +#include "ED_keyframing.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_outliner/outliner_select.cc b/source/blender/editors/space_outliner/outliner_select.cc index 45e4756072b..26ed3e5d1a3 100644 --- a/source/blender/editors/space_outliner/outliner_select.cc +++ b/source/blender/editors/space_outliner/outliner_select.cc @@ -43,15 +43,15 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_armature.h" -#include "ED_buttons.h" -#include "ED_object.h" -#include "ED_outliner.h" +#include "ED_armature.hh" +#include "ED_buttons.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_sequencer.h" -#include "ED_text.h" -#include "ED_undo.h" +#include "ED_select_utils.hh" +#include "ED_sequencer.hh" +#include "ED_text.hh" +#include "ED_undo.hh" #include "SEQ_select.h" #include "SEQ_sequencer.h" @@ -59,8 +59,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_outliner/outliner_sync.cc b/source/blender/editors/space_outliner/outliner_sync.cc index 6740e7ee831..3f9a0210553 100644 --- a/source/blender/editors/space_outliner/outliner_sync.cc +++ b/source/blender/editors/space_outliner/outliner_sync.cc @@ -26,9 +26,9 @@ #include "DEG_depsgraph.h" -#include "ED_armature.h" -#include "ED_object.h" -#include "ED_outliner.h" +#include "ED_armature.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" #include "SEQ_select.h" diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc index 8728b919491..e6d551c9f91 100644 --- a/source/blender/editors/space_outliner/outliner_tools.cc +++ b/source/blender/editors/space_outliner/outliner_tools.cc @@ -60,21 +60,21 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_node.h" -#include "ED_object.h" -#include "ED_outliner.h" -#include "ED_scene.h" +#include "ED_node.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" +#include "ED_scene.hh" #include "ED_screen.hh" -#include "ED_sequencer.h" -#include "ED_undo.h" +#include "ED_sequencer.hh" +#include "ED_undo.hh" #include "WM_api.hh" #include "WM_message.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "../../blender/blenloader/BLO_readfile.h" diff --git a/source/blender/editors/space_outliner/outliner_tree.cc b/source/blender/editors/space_outliner/outliner_tree.cc index 39ce83687d8..a743a3039f1 100644 --- a/source/blender/editors/space_outliner/outliner_tree.cc +++ b/source/blender/editors/space_outliner/outliner_tree.cc @@ -26,7 +26,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "outliner_intern.hh" #include "tree/common.hh" diff --git a/source/blender/editors/space_outliner/outliner_utils.cc b/source/blender/editors/space_outliner/outliner_utils.cc index f8b069c6167..2da9289a4a2 100644 --- a/source/blender/editors/space_outliner/outliner_utils.cc +++ b/source/blender/editors/space_outliner/outliner_utils.cc @@ -21,11 +21,11 @@ #include "BKE_object.h" #include "BKE_outliner_treehash.hh" -#include "ED_outliner.h" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "outliner_intern.hh" #include "tree/tree_display.hh" diff --git a/source/blender/editors/space_outliner/space_outliner.cc b/source/blender/editors/space_outliner/space_outliner.cc index 8b0173130cf..20a82406272 100644 --- a/source/blender/editors/space_outliner/space_outliner.cc +++ b/source/blender/editors/space_outliner/space_outliner.cc @@ -24,7 +24,7 @@ #include "BKE_screen.h" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "WM_api.hh" #include "WM_message.hh" @@ -35,8 +35,8 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_outliner/tree/tree_element.cc b/source/blender/editors/space_outliner/tree/tree_element.cc index 1039c158af8..dec12ecb76a 100644 --- a/source/blender/editors/space_outliner/tree/tree_element.cc +++ b/source/blender/editors/space_outliner/tree/tree_element.cc @@ -13,7 +13,7 @@ #include "DNA_listBase.h" #include "DNA_space_types.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/space_outliner/tree/tree_element.hh b/source/blender/editors/space_outliner/tree/tree_element.hh index eafe6011c3a..4df98499883 100644 --- a/source/blender/editors/space_outliner/tree/tree_element.hh +++ b/source/blender/editors/space_outliner/tree/tree_element.hh @@ -12,7 +12,7 @@ #include #include "BLI_string_ref.hh" -#include "UI_resources.h" +#include "UI_resources.hh" struct ListBase; struct SpaceOutliner; diff --git a/source/blender/editors/space_outliner/tree/tree_element_label.hh b/source/blender/editors/space_outliner/tree/tree_element_label.hh index b4bfb8b2ffd..02c908f0135 100644 --- a/source/blender/editors/space_outliner/tree/tree_element_label.hh +++ b/source/blender/editors/space_outliner/tree/tree_element_label.hh @@ -10,7 +10,7 @@ #include -#include "UI_resources.h" +#include "UI_resources.hh" #include "tree_element.hh" diff --git a/source/blender/editors/space_script/space_script.cc b/source/blender/editors/space_script/space_script.cc index 886af79283c..2f447959ead 100644 --- a/source/blender/editors/space_script/space_script.cc +++ b/source/blender/editors/space_script/space_script.cc @@ -18,12 +18,12 @@ #include "BKE_screen.h" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "WM_api.hh" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_sequencer/sequencer_add.cc b/source/blender/editors/space_sequencer/sequencer_add.cc index 65730716a40..e5b0a2ef97d 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.cc +++ b/source/blender/editors/space_sequencer/sequencer_add.cc @@ -56,12 +56,12 @@ #include "SEQ_transform.h" #include "SEQ_utils.h" -#include "ED_scene.h" +#include "ED_scene.hh" /* For menu, popup, icons, etc. */ #include "ED_screen.hh" -#include "ED_sequencer.h" +#include "ED_sequencer.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #ifdef WITH_AUDASPACE # include diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.cc b/source/blender/editors/space_sequencer/sequencer_buttons.cc index f5960135b3c..99903042dab 100644 --- a/source/blender/editors/space_sequencer/sequencer_buttons.cc +++ b/source/blender/editors/space_sequencer/sequencer_buttons.cc @@ -21,7 +21,7 @@ #include "BKE_screen.h" #include "ED_screen.hh" -#include "ED_sequencer.h" +#include "ED_sequencer.hh" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/space_sequencer/sequencer_channels_draw.cc b/source/blender/editors/space_sequencer/sequencer_channels_draw.cc index 0193f3426b6..55bddec1a9a 100644 --- a/source/blender/editors/space_sequencer/sequencer_channels_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_channels_draw.cc @@ -34,9 +34,9 @@ #include "SEQ_sequencer.h" #include "SEQ_time.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "WM_api.hh" diff --git a/source/blender/editors/space_sequencer/sequencer_channels_edit.cc b/source/blender/editors/space_sequencer/sequencer_channels_edit.cc index 2e6f78d7f37..fa0516dbac8 100644 --- a/source/blender/editors/space_sequencer/sequencer_channels_edit.cc +++ b/source/blender/editors/space_sequencer/sequencer_channels_edit.cc @@ -17,7 +17,7 @@ #include "ED_screen.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "SEQ_channels.h" #include "SEQ_sequencer.h" diff --git a/source/blender/editors/space_sequencer/sequencer_drag_drop.cc b/source/blender/editors/space_sequencer/sequencer_drag_drop.cc index 5c2d13ca954..454d6af6ab0 100644 --- a/source/blender/editors/space_sequencer/sequencer_drag_drop.cc +++ b/source/blender/editors/space_sequencer/sequencer_drag_drop.cc @@ -24,14 +24,14 @@ #include "SEQ_sequencer.h" #include "SEQ_transform.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "GPU_immediate.h" #include "GPU_matrix.h" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/space_sequencer/sequencer_draw.cc b/source/blender/editors/space_sequencer/sequencer_draw.cc index 726938c7acf..6895fde8ac5 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_draw.cc @@ -43,17 +43,17 @@ #include "GPU_vertex_buffer.h" #include "GPU_viewport.h" -#include "ED_anim_api.h" -#include "ED_gpencil_legacy.h" -#include "ED_markers.h" -#include "ED_mask.h" +#include "ED_anim_api.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_markers.hh" +#include "ED_mask.hh" #include "ED_screen.hh" -#include "ED_sequencer.h" -#include "ED_space_api.h" -#include "ED_time_scrub_ui.h" +#include "ED_sequencer.hh" +#include "ED_space_api.hh" +#include "ED_time_scrub_ui.hh" #include "ED_util.hh" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "RNA_prototypes.h" @@ -70,9 +70,9 @@ #include "SEQ_transform.h" #include "SEQ_utils.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_sequencer/sequencer_edit.cc b/source/blender/editors/space_sequencer/sequencer_edit.cc index ba2164d848d..149d3736915 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.cc +++ b/source/blender/editors/space_sequencer/sequencer_edit.cc @@ -56,17 +56,17 @@ #include "RNA_prototypes.h" /* For menu, popup, icons, etc. */ -#include "ED_fileselect.h" -#include "ED_keyframing.h" -#include "ED_numinput.h" -#include "ED_outliner.h" -#include "ED_scene.h" +#include "ED_fileselect.hh" +#include "ED_keyframing.hh" +#include "ED_numinput.hh" +#include "ED_outliner.hh" +#include "ED_scene.hh" #include "ED_screen.hh" -#include "ED_sequencer.h" +#include "ED_sequencer.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" diff --git a/source/blender/editors/space_sequencer/sequencer_gizmo_retime.cc b/source/blender/editors/space_sequencer/sequencer_gizmo_retime.cc index ea2adff3391..ce953c7d3ea 100644 --- a/source/blender/editors/space_sequencer/sequencer_gizmo_retime.cc +++ b/source/blender/editors/space_sequencer/sequencer_gizmo_retime.cc @@ -17,13 +17,13 @@ #include "RNA_access.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "ED_gizmo_library.h" -#include "ED_gizmo_utils.h" +#include "ED_gizmo_library.hh" +#include "ED_gizmo_utils.hh" #include "SEQ_iterator.h" #include "SEQ_retiming.h" diff --git a/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc b/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc index 95589c4dd9d..4397beb65c8 100644 --- a/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc +++ b/source/blender/editors/space_sequencer/sequencer_gizmo_retime_type.cc @@ -35,14 +35,14 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "SEQ_iterator.h" #include "SEQ_retiming.h" diff --git a/source/blender/editors/space_sequencer/sequencer_ops.cc b/source/blender/editors/space_sequencer/sequencer_ops.cc index fc43ee89fc9..58b7de7a95e 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.cc +++ b/source/blender/editors/space_sequencer/sequencer_ops.cc @@ -14,7 +14,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_sequencer.h" +#include "ED_sequencer.hh" #include "sequencer_intern.h" diff --git a/source/blender/editors/space_sequencer/sequencer_retiming.cc b/source/blender/editors/space_sequencer/sequencer_retiming.cc index 8fd5035653c..9c288ffa38a 100644 --- a/source/blender/editors/space_sequencer/sequencer_retiming.cc +++ b/source/blender/editors/space_sequencer/sequencer_retiming.cc @@ -30,8 +30,8 @@ #include "RNA_define.h" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/editors/space_sequencer/sequencer_select.cc b/source/blender/editors/space_sequencer/sequencer_select.cc index aa71a1822d7..46518206f5f 100644 --- a/source/blender/editors/space_sequencer/sequencer_select.cc +++ b/source/blender/editors/space_sequencer/sequencer_select.cc @@ -37,12 +37,12 @@ /* For menu, popup, icons, etc. */ -#include "ED_outliner.h" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_sequencer.h" +#include "ED_select_utils.hh" +#include "ED_sequencer.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" /* Own include. */ #include "sequencer_intern.h" diff --git a/source/blender/editors/space_sequencer/sequencer_thumbnails.cc b/source/blender/editors/space_sequencer/sequencer_thumbnails.cc index f0e8b9fdf4f..d7e06c8d1ec 100644 --- a/source/blender/editors/space_sequencer/sequencer_thumbnails.cc +++ b/source/blender/editors/space_sequencer/sequencer_thumbnails.cc @@ -19,7 +19,7 @@ #include "ED_screen.hh" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "SEQ_relations.h" #include "SEQ_render.h" diff --git a/source/blender/editors/space_sequencer/sequencer_view.cc b/source/blender/editors/space_sequencer/sequencer_view.cc index 9cfacb81b1a..d617caa9cf8 100644 --- a/source/blender/editors/space_sequencer/sequencer_view.cc +++ b/source/blender/editors/space_sequencer/sequencer_view.cc @@ -20,7 +20,7 @@ #include "RNA_define.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "SEQ_iterator.h" #include "SEQ_select.h" @@ -29,10 +29,10 @@ #include "SEQ_transform.h" /* For menu, popup, icons, etc. */ -#include "ED_anim_api.h" +#include "ED_anim_api.hh" #include "ED_screen.hh" -#include "ED_time_scrub_ui.h" -#include "ED_util_imbuf.h" +#include "ED_time_scrub_ui.hh" +#include "ED_util_imbuf.hh" /* Own include. */ #include "sequencer_intern.h" diff --git a/source/blender/editors/space_sequencer/space_sequencer.cc b/source/blender/editors/space_sequencer/space_sequencer.cc index b93dcdb8ee0..ed532ed0f0d 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.cc +++ b/source/blender/editors/space_sequencer/space_sequencer.cc @@ -26,13 +26,13 @@ #include "GPU_state.h" -#include "ED_markers.h" +#include "ED_markers.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_time_scrub_ui.h" -#include "ED_transform.h" -#include "ED_view3d.h" -#include "ED_view3d_offscreen.h" /* Only for sequencer view3d drawing callback. */ +#include "ED_space_api.hh" +#include "ED_time_scrub_ui.hh" +#include "ED_transform.hh" +#include "ED_view3d.hh" +#include "ED_view3d_offscreen.hh" /* Only for sequencer view3d drawing callback. */ #include "WM_api.hh" #include "WM_message.hh" @@ -42,8 +42,8 @@ #include "SEQ_transform.h" #include "SEQ_utils.h" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc index 75ae07f3787..4940ae7e12c 100644 --- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc +++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc @@ -11,8 +11,8 @@ #include "BKE_screen.h" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_spreadsheet.h" +#include "ED_space_api.hh" +#include "ED_spreadsheet.hh" #include "ED_viewer_path.hh" #include "DNA_scene_types.h" @@ -21,9 +21,9 @@ #include "MEM_guardedalloc.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc index e41e54fcea0..03d55a2e9ab 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc @@ -30,7 +30,7 @@ #include "DEG_depsgraph_query.h" #include "ED_curves.hh" -#include "ED_spreadsheet.h" +#include "ED_spreadsheet.hh" #include "NOD_geometry_nodes_lazy_function.hh" #include "NOD_geometry_nodes_log.hh" diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.cc b/source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.cc index abc8c0906e2..0a2571644c3 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_dataset_draw.cc @@ -11,7 +11,6 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" #include "UI_interface.hh" #include "UI_tree_view.hh" diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc b/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc index f8e5db60e62..bb9f57a6635 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_draw.cc @@ -2,9 +2,9 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "GPU_immediate.h" diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc b/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc index 08be6389bc2..c02465b13e4 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_layout.cc @@ -18,8 +18,8 @@ #include "DNA_object_types.h" #include "DNA_userdef_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLF_api.h" diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc index 16973ef38fb..ef0e97fff59 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter.cc @@ -12,8 +12,8 @@ #include "DEG_depsgraph_query.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc index 7067e27371b..5e6db19d3e4 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc @@ -16,8 +16,8 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/space_statusbar/space_statusbar.cc b/source/blender/editors/space_statusbar/space_statusbar.cc index 880e792d55b..7aa620c0ce7 100644 --- a/source/blender/editors/space_statusbar/space_statusbar.cc +++ b/source/blender/editors/space_statusbar/space_statusbar.cc @@ -17,11 +17,11 @@ #include "BKE_screen.h" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "RNA_access.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_text/space_text.cc b/source/blender/editors/space_text/space_text.cc index 64c7d410b5c..fc80f095a52 100644 --- a/source/blender/editors/space_text/space_text.cc +++ b/source/blender/editors/space_text/space_text.cc @@ -21,14 +21,14 @@ #include "BKE_screen.h" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_text/text_autocomplete.cc b/source/blender/editors/space_text/text_autocomplete.cc index d9d7ab57a21..2bc8e541028 100644 --- a/source/blender/editors/space_text/text_autocomplete.cc +++ b/source/blender/editors/space_text/text_autocomplete.cc @@ -25,10 +25,10 @@ #include "WM_types.hh" #include "ED_screen.hh" -#include "ED_text.h" -#include "ED_undo.h" +#include "ED_text.hh" +#include "ED_undo.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "text_format.hh" #include "text_intern.hh" /* own include */ diff --git a/source/blender/editors/space_text/text_draw.cc b/source/blender/editors/space_text/text_draw.cc index ec5dcdbc2bf..74ef094889e 100644 --- a/source/blender/editors/space_text/text_draw.cc +++ b/source/blender/editors/space_text/text_draw.cc @@ -22,14 +22,14 @@ #include "BKE_text.h" #include "BKE_text_suggestions.h" -#include "ED_text.h" +#include "ED_text.hh" #include "GPU_immediate.h" #include "GPU_state.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "text_format.hh" #include "text_intern.hh" diff --git a/source/blender/editors/space_text/text_format.cc b/source/blender/editors/space_text/text_format.cc index 1966cfb84a8..6f3d9e7765b 100644 --- a/source/blender/editors/space_text/text_format.cc +++ b/source/blender/editors/space_text/text_format.cc @@ -16,7 +16,7 @@ #include "DNA_space_types.h" #include "DNA_text_types.h" -#include "ED_text.h" +#include "ED_text.hh" #include "text_format.hh" diff --git a/source/blender/editors/space_text/text_header.cc b/source/blender/editors/space_text/text_header.cc index f1ab777ee48..bc4f70ed412 100644 --- a/source/blender/editors/space_text/text_header.cc +++ b/source/blender/editors/space_text/text_header.cc @@ -19,7 +19,7 @@ #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "text_intern.hh" diff --git a/source/blender/editors/space_text/text_ops.cc b/source/blender/editors/space_text/text_ops.cc index 98e6fcddfae..5f1965d8295 100644 --- a/source/blender/editors/space_text/text_ops.cc +++ b/source/blender/editors/space_text/text_ops.cc @@ -31,11 +31,11 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_curve.h" +#include "ED_curve.hh" #include "ED_screen.hh" -#include "ED_text.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "ED_text.hh" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_text/text_undo.cc b/source/blender/editors/space_text/text_undo.cc index 14fe90c4c5f..1e50c32181d 100644 --- a/source/blender/editors/space_text/text_undo.cc +++ b/source/blender/editors/space_text/text_undo.cc @@ -29,13 +29,13 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_curve.h" +#include "ED_curve.hh" #include "ED_screen.hh" -#include "ED_text.h" -#include "ED_undo.h" +#include "ED_text.hh" +#include "ED_undo.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/space_topbar/space_topbar.cc b/source/blender/editors/space_topbar/space_topbar.cc index c478445373f..d212202195c 100644 --- a/source/blender/editors/space_topbar/space_topbar.cc +++ b/source/blender/editors/space_topbar/space_topbar.cc @@ -23,11 +23,11 @@ #include "BKE_undo_system.h" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_userpref/space_userpref.cc b/source/blender/editors/space_userpref/space_userpref.cc index 15816e3adae..39a962e7c82 100644 --- a/source/blender/editors/space_userpref/space_userpref.cc +++ b/source/blender/editors/space_userpref/space_userpref.cc @@ -18,7 +18,7 @@ #include "BKE_screen.h" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "RNA_access.h" #include "RNA_enum_types.h" @@ -26,7 +26,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_userpref/userpref_ops.cc b/source/blender/editors/space_userpref/userpref_ops.cc index 046961bbb31..7fecfdb0a59 100644 --- a/source/blender/editors/space_userpref/userpref_ops.cc +++ b/source/blender/editors/space_userpref/userpref_ops.cc @@ -27,12 +27,12 @@ #include "RNA_define.h" #include "RNA_types.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "ED_userpref.h" +#include "ED_userpref.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/drawobject.cc b/source/blender/editors/space_view3d/drawobject.cc index f7294c38905..f1164020418 100644 --- a/source/blender/editors/space_view3d/drawobject.cc +++ b/source/blender/editors/space_view3d/drawobject.cc @@ -29,9 +29,9 @@ #include "GPU_shader.h" #include "GPU_state.h" -#include "ED_mesh.h" +#include "ED_mesh.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "DRW_engine.h" diff --git a/source/blender/editors/space_view3d/space_view3d.cc b/source/blender/editors/space_view3d/space_view3d.cc index e5fc9e88d5e..3f25a756117 100644 --- a/source/blender/editors/space_view3d/space_view3d.cc +++ b/source/blender/editors/space_view3d/space_view3d.cc @@ -52,14 +52,14 @@ #include "BKE_workspace.h" #include "ED_asset_shelf.h" -#include "ED_geometry.h" -#include "ED_object.h" -#include "ED_outliner.h" -#include "ED_render.h" +#include "ED_geometry.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" +#include "ED_render.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_transform.h" -#include "ED_undo.h" +#include "ED_space_api.hh" +#include "ED_transform.hh" +#include "ED_undo.hh" #include "ED_viewer_path.hh" #include "GPU_matrix.h" @@ -76,8 +76,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLO_read_write.h" diff --git a/source/blender/editors/space_view3d/view3d_buttons.cc b/source/blender/editors/space_view3d/view3d_buttons.cc index ce95d5d387f..a532b8d4eae 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.cc +++ b/source/blender/editors/space_view3d/view3d_buttons.cc @@ -51,14 +51,14 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "ED_screen.hh" #include "ANIM_bone_collections.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "view3d_intern.h" /* own include */ diff --git a/source/blender/editors/space_view3d/view3d_cursor_snap.cc b/source/blender/editors/space_view3d/view3d_cursor_snap.cc index aeffbf5e324..0af67f4f54c 100644 --- a/source/blender/editors/space_view3d/view3d_cursor_snap.cc +++ b/source/blender/editors/space_view3d/view3d_cursor_snap.cc @@ -28,11 +28,11 @@ #include "GPU_matrix.h" #include "ED_screen.hh" -#include "ED_transform.h" -#include "ED_transform_snap_object_context.h" -#include "ED_view3d.h" +#include "ED_transform.hh" +#include "ED_transform_snap_object_context.hh" +#include "ED_view3d.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/editors/space_view3d/view3d_draw.cc b/source/blender/editors/space_view3d/view3d_draw.cc index ebd121f7422..ef2a8d98f2d 100644 --- a/source/blender/editors/space_view3d/view3d_draw.cc +++ b/source/blender/editors/space_view3d/view3d_draw.cc @@ -49,13 +49,13 @@ #include "DRW_engine.h" #include "DRW_select_buffer.h" -#include "ED_gpencil_legacy.h" -#include "ED_info.h" -#include "ED_keyframing.h" +#include "ED_gpencil_legacy.hh" +#include "ED_info.hh" +#include "ED_keyframing.hh" #include "ED_screen.hh" -#include "ED_screen_types.h" -#include "ED_transform.h" -#include "ED_view3d_offscreen.h" +#include "ED_screen_types.hh" +#include "ED_transform.hh" +#include "ED_view3d_offscreen.hh" #include "ED_viewer_path.hh" #include "ANIM_bone_collections.h" @@ -74,8 +74,8 @@ #include "MEM_guardedalloc.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RE_engine.h" diff --git a/source/blender/editors/space_view3d/view3d_edit.cc b/source/blender/editors/space_view3d/view3d_edit.cc index ae9062ebb34..357dfcd510e 100644 --- a/source/blender/editors/space_view3d/view3d_edit.cc +++ b/source/blender/editors/space_view3d/view3d_edit.cc @@ -36,8 +36,8 @@ #include "RNA_define.h" #include "ED_screen.hh" -#include "ED_transform.h" -#include "ED_transform_snap_object_context.h" +#include "ED_transform.hh" +#include "ED_transform_snap_object_context.hh" #include "view3d_intern.h" /* own include */ diff --git a/source/blender/editors/space_view3d/view3d_gizmo_armature.cc b/source/blender/editors/space_view3d/view3d_gizmo_armature.cc index 8990015f289..9eae83f701a 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_armature.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_armature.cc @@ -19,11 +19,11 @@ #include "DNA_armature_types.h" #include "DNA_object_types.h" -#include "ED_armature.h" -#include "ED_gizmo_library.h" +#include "ED_armature.hh" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.cc b/source/blender/editors/space_view3d/view3d_gizmo_camera.cc index 6699fd91b82..18aa1122781 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_camera.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.cc @@ -18,11 +18,11 @@ #include "DNA_camera_types.h" #include "DNA_object_types.h" -#include "ED_armature.h" -#include "ED_gizmo_library.h" +#include "ED_armature.hh" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_empty.cc b/source/blender/editors/space_view3d/view3d_gizmo_empty.cc index 4b2b4bca98e..25216d0eaa3 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_empty.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_empty.cc @@ -19,10 +19,10 @@ #include "DNA_light_types.h" #include "DNA_object_types.h" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.cc b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.cc index 2f236d6df44..e550778a872 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_forcefield.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_forcefield.cc @@ -14,10 +14,10 @@ #include "DNA_object_force_types.h" #include "DNA_object_types.h" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_light.cc b/source/blender/editors/space_view3d/view3d_gizmo_light.cc index b983e3d0960..5122bc4d631 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_light.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_light.cc @@ -19,10 +19,10 @@ #include "DNA_light_types.h" #include "DNA_object_types.h" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate.cc b/source/blender/editors/space_view3d/view3d_gizmo_navigate.cc index 3c8ad6e6b10..bf72cbe8e5e 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate.cc @@ -13,11 +13,11 @@ #include "DNA_object_types.h" -#include "ED_gizmo_library.h" +#include "ED_gizmo_library.hh" #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.cc b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.cc index cf8721a5008..609b0701ab0 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_navigate_type.cc @@ -34,8 +34,8 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect.cc b/source/blender/editors/space_view3d/view3d_gizmo_preselect.cc index 85da14a5489..2e6dea6945a 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_preselect.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect.cc @@ -12,10 +12,10 @@ #include "BKE_context.h" -#include "ED_gizmo_utils.h" +#include "ED_gizmo_utils.hh" #include "ED_screen.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc index a6189672a66..f47f7deca8f 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc @@ -37,10 +37,10 @@ #include "bmesh.h" -#include "ED_gizmo_library.h" -#include "ED_mesh.h" +#include "ED_gizmo_library.hh" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" /* -------------------------------------------------------------------- */ /** \name Shared Internal API diff --git a/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc b/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc index 5a8950ac83e..127cdbbea44 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_ruler.cc @@ -33,16 +33,16 @@ #include "DNA_object_types.h" #include "DNA_view3d_types.h" -#include "ED_gizmo_library.h" -#include "ED_gizmo_utils.h" -#include "ED_gpencil_legacy.h" +#include "ED_gizmo_library.hh" +#include "ED_gizmo_utils.hh" +#include "ED_gpencil_legacy.hh" #include "ED_screen.hh" -#include "ED_transform.h" -#include "ED_transform_snap_object_context.h" -#include "ED_view3d.h" +#include "ED_transform.hh" +#include "ED_transform_snap_object_context.hh" +#include "ED_view3d.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.cc b/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.cc index 9cbc0d7664b..fe71e2cdc3a 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.cc @@ -12,12 +12,12 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "ED_gizmo_library.h" -#include "ED_gizmo_utils.h" +#include "ED_gizmo_library.hh" +#include "ED_gizmo_utils.hh" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_view3d/view3d_header.cc b/source/blender/editors/space_view3d/view3d_header.cc index f8cb3ece41a..dbea0fbbd50 100644 --- a/source/blender/editors/space_view3d/view3d_header.cc +++ b/source/blender/editors/space_view3d/view3d_header.cc @@ -31,11 +31,11 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_mesh.h" -#include "ED_undo.h" +#include "ED_mesh.hh" +#include "ED_undo.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index c8498499786..56e1abf79fb 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -8,7 +8,7 @@ #pragma once -#include "ED_view3d.h" +#include "ED_view3d.hh" #ifdef __cplusplus extern "C" { diff --git a/source/blender/editors/space_view3d/view3d_iterators.cc b/source/blender/editors/space_view3d/view3d_iterators.cc index b39adea75d1..2a6167cf1d8 100644 --- a/source/blender/editors/space_view3d/view3d_iterators.cc +++ b/source/blender/editors/space_view3d/view3d_iterators.cc @@ -37,9 +37,9 @@ #include "bmesh.h" -#include "ED_armature.h" +#include "ED_armature.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" /* -------------------------------------------------------------------- */ /** \name Internal Clipping Utilities diff --git a/source/blender/editors/space_view3d/view3d_navigate.cc b/source/blender/editors/space_view3d/view3d_navigate.cc index 4fd362df0e7..f654bbaa9a4 100644 --- a/source/blender/editors/space_view3d/view3d_navigate.cc +++ b/source/blender/editors/space_view3d/view3d_navigate.cc @@ -28,10 +28,10 @@ #include "DEG_depsgraph_query.h" -#include "ED_mesh.h" -#include "ED_particle.h" +#include "ED_mesh.hh" +#include "ED_particle.hh" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" #include "WM_api.hh" #include "WM_message.hh" @@ -39,7 +39,7 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_fly.cc b/source/blender/editors/space_view3d/view3d_navigate_fly.cc index 6ed85a06d49..69d7e7d3955 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_fly.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_fly.cc @@ -35,12 +35,12 @@ #include "WM_types.hh" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "PIL_time.h" /* Smooth-view. */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_immediate.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_all.cc b/source/blender/editors/space_view3d/view3d_navigate_view_all.cc index 2aeb5de323b..ae151ad070a 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_all.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_all.cc @@ -20,8 +20,8 @@ #include "DEG_depsgraph_query.h" -#include "ED_mesh.h" -#include "ED_particle.h" +#include "ED_mesh.hh" +#include "ED_particle.hh" #include "ED_screen.hh" #include "WM_api.hh" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc b/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc index 2816465124f..9fd1e4dfa2a 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc @@ -28,10 +28,10 @@ #include "DEG_depsgraph_query.h" -#include "ED_mesh.h" -#include "ED_particle.h" +#include "ED_mesh.hh" +#include "ED_particle.hh" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" #include "WM_api.hh" #include "WM_message.hh" @@ -39,7 +39,7 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc b/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc index 38169731f9a..c37c8325798 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc @@ -28,10 +28,10 @@ #include "DEG_depsgraph_query.h" -#include "ED_mesh.h" -#include "ED_particle.h" +#include "ED_mesh.hh" +#include "ED_particle.hh" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" #include "WM_api.hh" #include "WM_message.hh" @@ -39,7 +39,7 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc b/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc index 5adb45b63e0..b185e50d3af 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_center_cursor.cc @@ -28,10 +28,10 @@ #include "DEG_depsgraph_query.h" -#include "ED_mesh.h" -#include "ED_particle.h" +#include "ED_mesh.hh" +#include "ED_particle.hh" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" #include "WM_api.hh" #include "WM_message.hh" @@ -39,7 +39,7 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc b/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc index 05a56fecada..c9ece8bbf39 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_center_pick.cc @@ -28,10 +28,10 @@ #include "DEG_depsgraph_query.h" -#include "ED_mesh.h" -#include "ED_particle.h" +#include "ED_mesh.hh" +#include "ED_particle.hh" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" #include "WM_api.hh" #include "WM_message.hh" @@ -39,7 +39,7 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc b/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc index 4a7ab75ea6b..cab0f98b90e 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc @@ -28,10 +28,10 @@ #include "DEG_depsgraph_query.h" -#include "ED_mesh.h" -#include "ED_particle.h" +#include "ED_mesh.hh" +#include "ED_particle.hh" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" #include "WM_api.hh" #include "WM_message.hh" @@ -39,7 +39,7 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc b/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc index a02d1d51226..34ed06149b7 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc @@ -28,10 +28,10 @@ #include "DEG_depsgraph_query.h" -#include "ED_mesh.h" -#include "ED_particle.h" +#include "ED_mesh.hh" +#include "ED_particle.hh" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" #include "WM_api.hh" #include "WM_message.hh" @@ -39,7 +39,7 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "view3d_intern.h" diff --git a/source/blender/editors/space_view3d/view3d_navigate_walk.cc b/source/blender/editors/space_view3d/view3d_navigate_walk.cc index 72c8aaae39a..07c6eb20eb3 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_walk.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_walk.cc @@ -34,13 +34,13 @@ #include "WM_types.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_transform_snap_object_context.h" +#include "ED_space_api.hh" +#include "ED_transform_snap_object_context.hh" #include "PIL_time.h" /* Smooth-view. */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_immediate.h" diff --git a/source/blender/editors/space_view3d/view3d_ops.cc b/source/blender/editors/space_view3d/view3d_ops.cc index c90a6f9e3e5..e8a6c50a66c 100644 --- a/source/blender/editors/space_view3d/view3d_ops.cc +++ b/source/blender/editors/space_view3d/view3d_ops.cc @@ -29,9 +29,9 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_outliner.h" +#include "ED_outliner.hh" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" #include "view3d_intern.h" #include "view3d_navigate.hh" diff --git a/source/blender/editors/space_view3d/view3d_placement.cc b/source/blender/editors/space_view3d/view3d_placement.cc index b3b2ba93990..71943e8ea03 100644 --- a/source/blender/editors/space_view3d/view3d_placement.cc +++ b/source/blender/editors/space_view3d/view3d_placement.cc @@ -22,12 +22,12 @@ #include "WM_api.hh" #include "WM_toolsystem.h" -#include "ED_gizmo_utils.h" +#include "ED_gizmo_utils.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_view3d.h" +#include "ED_space_api.hh" +#include "ED_view3d.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "GPU_immediate.h" diff --git a/source/blender/editors/space_view3d/view3d_project.cc b/source/blender/editors/space_view3d/view3d_project.cc index 12453866da3..422ebf7daaa 100644 --- a/source/blender/editors/space_view3d/view3d_project.cc +++ b/source/blender/editors/space_view3d/view3d_project.cc @@ -21,7 +21,7 @@ #include "GPU_matrix.h" -#include "ED_view3d.h" /* own include */ +#include "ED_view3d.hh" /* own include */ #define BL_ZERO_CLIP 0.001 diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc index 35e23af7708..29957113341 100644 --- a/source/blender/editors/space_view3d/view3d_select.cc +++ b/source/blender/editors/space_view3d/view3d_select.cc @@ -71,23 +71,23 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "ED_armature.h" -#include "ED_curve.h" +#include "ED_armature.hh" +#include "ED_curve.hh" #include "ED_curves.hh" -#include "ED_gpencil_legacy.h" -#include "ED_grease_pencil.h" -#include "ED_lattice.h" -#include "ED_mball.h" -#include "ED_mesh.h" -#include "ED_object.h" -#include "ED_outliner.h" -#include "ED_particle.h" +#include "ED_gpencil_legacy.hh" +#include "ED_grease_pencil.hh" +#include "ED_lattice.hh" +#include "ED_mball.hh" +#include "ED_mesh.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" +#include "ED_particle.hh" #include "ED_screen.hh" -#include "ED_sculpt.h" -#include "ED_select_utils.h" +#include "ED_sculpt.hh" +#include "ED_select_utils.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_matrix.h" #include "GPU_select.h" diff --git a/source/blender/editors/space_view3d/view3d_snap.cc b/source/blender/editors/space_view3d/view3d_snap.cc index acc142e0c5f..c1071364410 100644 --- a/source/blender/editors/space_view3d/view3d_snap.cc +++ b/source/blender/editors/space_view3d/view3d_snap.cc @@ -36,10 +36,10 @@ #include "RNA_access.h" #include "RNA_define.h" -#include "ED_keyframing.h" -#include "ED_object.h" +#include "ED_keyframing.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_transverts.h" +#include "ED_transverts.hh" #include "ANIM_bone_collections.h" diff --git a/source/blender/editors/space_view3d/view3d_utils.cc b/source/blender/editors/space_view3d/view3d_utils.cc index 2315af18d95..4333f250f2d 100644 --- a/source/blender/editors/space_view3d/view3d_utils.cc +++ b/source/blender/editors/space_view3d/view3d_utils.cc @@ -36,19 +36,19 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "GPU_matrix.h" #include "WM_api.hh" #include "WM_types.hh" -#include "ED_keyframing.h" +#include "ED_keyframing.hh" #include "ED_screen.hh" -#include "ED_undo.h" -#include "ED_view3d.h" +#include "ED_undo.hh" +#include "ED_view3d.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "view3d_intern.h" /* own include */ diff --git a/source/blender/editors/space_view3d/view3d_view.cc b/source/blender/editors/space_view3d/view3d_view.cc index 241f3fa5310..5304c87a627 100644 --- a/source/blender/editors/space_view3d/view3d_view.cc +++ b/source/blender/editors/space_view3d/view3d_view.cc @@ -28,7 +28,7 @@ #include "DEG_depsgraph_query.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "GPU_matrix.h" #include "GPU_select.h" @@ -36,7 +36,7 @@ #include "WM_api.hh" -#include "ED_object.h" +#include "ED_object.hh" #include "ED_screen.hh" #include "DRW_engine.h" diff --git a/source/blender/editors/transform/transform.cc b/source/blender/editors/transform/transform.cc index 4f05ac71fa2..d7e7a66709f 100644 --- a/source/blender/editors/transform/transform.cc +++ b/source/blender/editors/transform/transform.cc @@ -26,13 +26,13 @@ #include "GPU_state.h" -#include "ED_clip.h" -#include "ED_gpencil_legacy.h" -#include "ED_image.h" -#include "ED_keyframing.h" -#include "ED_node.h" +#include "ED_clip.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_image.hh" +#include "ED_keyframing.hh" +#include "ED_node.hh" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "SEQ_transform.h" @@ -40,9 +40,9 @@ #include "WM_message.hh" #include "WM_types.hh" -#include "UI_interface_icons.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "RNA_access.h" diff --git a/source/blender/editors/transform/transform.hh b/source/blender/editors/transform/transform.hh index b7fe0956d7c..197ecdb27d7 100644 --- a/source/blender/editors/transform/transform.hh +++ b/source/blender/editors/transform/transform.hh @@ -10,9 +10,9 @@ #include "BLI_math_vector_types.hh" -#include "ED_numinput.h" -#include "ED_transform.h" -#include "ED_view3d.h" +#include "ED_numinput.hh" +#include "ED_transform.hh" +#include "ED_view3d.hh" #include "DNA_listBase.h" #include "DNA_object_enums.h" @@ -252,7 +252,7 @@ enum { TFM_MODAL_ADD_SNAP = 16, TFM_MODAL_REMOVE_SNAP = 17, - /* 18 and 19 used by number-input, defined in `ED_numinput.h`. */ + /* 18 and 19 used by number-input, defined in `ED_numinput.hh`. */ // NUM_MODAL_INCREMENT_UP = 18, // NUM_MODAL_INCREMENT_DOWN = 19, diff --git a/source/blender/editors/transform/transform_constraints.cc b/source/blender/editors/transform/transform_constraints.cc index 7951bc8dffc..97afbf904ff 100644 --- a/source/blender/editors/transform/transform_constraints.cc +++ b/source/blender/editors/transform/transform_constraints.cc @@ -28,12 +28,12 @@ #include "BKE_context.h" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "BLT_translation.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "transform.hh" #include "transform_gizmo.hh" diff --git a/source/blender/editors/transform/transform_convert.cc b/source/blender/editors/transform/transform_convert.cc index 04583f79324..78e568c4158 100644 --- a/source/blender/editors/transform/transform_convert.cc +++ b/source/blender/editors/transform/transform_convert.cc @@ -30,13 +30,13 @@ #include "BKE_nla.h" #include "BKE_scene.h" -#include "ED_keyframes_edit.h" -#include "ED_keyframing.h" -#include "ED_particle.h" +#include "ED_keyframes_edit.hh" +#include "ED_keyframing.hh" +#include "ED_particle.hh" #include "ED_screen.hh" -#include "ED_screen_types.h" +#include "ED_screen_types.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "WM_types.hh" diff --git a/source/blender/editors/transform/transform_convert_action.cc b/source/blender/editors/transform/transform_convert_action.cc index 43c79131281..d066dea7691 100644 --- a/source/blender/editors/transform/transform_convert_action.cc +++ b/source/blender/editors/transform/transform_convert_action.cc @@ -24,9 +24,9 @@ #include "BKE_mask.h" #include "BKE_nla.h" -#include "ED_anim_api.h" -#include "ED_keyframes_edit.h" -#include "ED_markers.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_edit.hh" +#include "ED_markers.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/transform/transform_convert_armature.cc b/source/blender/editors/transform/transform_convert_armature.cc index 99b30f687f8..55df344ef5c 100644 --- a/source/blender/editors/transform/transform_convert_armature.cc +++ b/source/blender/editors/transform/transform_convert_armature.cc @@ -26,8 +26,8 @@ #include "BIK_api.h" -#include "ED_armature.h" -#include "ED_keyframing.h" +#include "ED_armature.hh" +#include "ED_keyframing.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/transform/transform_convert_gpencil_legacy.cc b/source/blender/editors/transform/transform_convert_gpencil_legacy.cc index 1af88ef0c34..e1c5b6641a3 100644 --- a/source/blender/editors/transform/transform_convert_gpencil_legacy.cc +++ b/source/blender/editors/transform/transform_convert_gpencil_legacy.cc @@ -22,8 +22,8 @@ #include "BKE_gpencil_legacy.h" #include "BKE_layer.h" -#include "ED_gpencil_legacy.h" -#include "ED_keyframing.h" +#include "ED_gpencil_legacy.hh" +#include "ED_keyframing.hh" #include "transform.hh" #include "transform_convert.hh" diff --git a/source/blender/editors/transform/transform_convert_graph.cc b/source/blender/editors/transform/transform_convert_graph.cc index ad4c2d83f63..2393c041475 100644 --- a/source/blender/editors/transform/transform_convert_graph.cc +++ b/source/blender/editors/transform/transform_convert_graph.cc @@ -19,11 +19,11 @@ #include "BKE_nla.h" #include "BKE_report.h" -#include "ED_anim_api.h" -#include "ED_keyframes_edit.h" -#include "ED_markers.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_edit.hh" +#include "ED_markers.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "transform.hh" #include "transform_convert.hh" diff --git a/source/blender/editors/transform/transform_convert_mask.cc b/source/blender/editors/transform/transform_convert_mask.cc index 53defbf0b97..01a5a3cafbd 100644 --- a/source/blender/editors/transform/transform_convert_mask.cc +++ b/source/blender/editors/transform/transform_convert_mask.cc @@ -16,10 +16,10 @@ #include "BKE_context.h" #include "BKE_mask.h" -#include "ED_clip.h" -#include "ED_image.h" -#include "ED_keyframing.h" -#include "ED_mask.h" +#include "ED_clip.hh" +#include "ED_image.hh" +#include "ED_keyframing.hh" +#include "ED_mask.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/transform/transform_convert_mesh.cc b/source/blender/editors/transform/transform_convert_mesh.cc index 29fadaf6fc1..e8c7e0bbeaf 100644 --- a/source/blender/editors/transform/transform_convert_mesh.cc +++ b/source/blender/editors/transform/transform_convert_mesh.cc @@ -24,7 +24,7 @@ #include "BKE_modifier.h" #include "BKE_scene.h" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/transform/transform_convert_mesh_skin.cc b/source/blender/editors/transform/transform_convert_mesh_skin.cc index 83520957db3..03565a9fe8e 100644 --- a/source/blender/editors/transform/transform_convert_mesh_skin.cc +++ b/source/blender/editors/transform/transform_convert_mesh_skin.cc @@ -19,7 +19,7 @@ #include "BKE_modifier.h" #include "BKE_scene.h" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/transform/transform_convert_mesh_uv.cc b/source/blender/editors/transform/transform_convert_mesh_uv.cc index 7d29fb42434..80e8a0525d9 100644 --- a/source/blender/editors/transform/transform_convert_mesh_uv.cc +++ b/source/blender/editors/transform/transform_convert_mesh_uv.cc @@ -19,9 +19,9 @@ #include "BKE_editmesh.h" #include "BKE_mesh_mapping.hh" -#include "ED_image.h" -#include "ED_mesh.h" -#include "ED_uvedit.h" +#include "ED_image.hh" +#include "ED_mesh.hh" +#include "ED_uvedit.hh" #include "WM_api.hh" /* for WM_event_add_notifier to deal with stabilization nodes */ diff --git a/source/blender/editors/transform/transform_convert_mesh_vert_cdata.cc b/source/blender/editors/transform/transform_convert_mesh_vert_cdata.cc index caf367dd230..d25736156cc 100644 --- a/source/blender/editors/transform/transform_convert_mesh_vert_cdata.cc +++ b/source/blender/editors/transform/transform_convert_mesh_vert_cdata.cc @@ -19,7 +19,7 @@ #include "BKE_modifier.h" #include "BKE_scene.h" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/transform/transform_convert_nla.cc b/source/blender/editors/transform/transform_convert_nla.cc index 0388f42dd8f..d224644ae6d 100644 --- a/source/blender/editors/transform/transform_convert_nla.cc +++ b/source/blender/editors/transform/transform_convert_nla.cc @@ -20,8 +20,8 @@ #include "BKE_context.h" #include "BKE_nla.h" -#include "ED_anim_api.h" -#include "ED_markers.h" +#include "ED_anim_api.hh" +#include "ED_markers.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/transform/transform_convert_node.cc b/source/blender/editors/transform/transform_convert_node.cc index 6c6eb80639c..d708138dac3 100644 --- a/source/blender/editors/transform/transform_convert_node.cc +++ b/source/blender/editors/transform/transform_convert_node.cc @@ -22,8 +22,8 @@ #include "ED_node.hh" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "transform.hh" #include "transform_convert.hh" diff --git a/source/blender/editors/transform/transform_convert_object.cc b/source/blender/editors/transform/transform_convert_object.cc index 752c7f0ee3e..3dfcbc14eb2 100644 --- a/source/blender/editors/transform/transform_convert_object.cc +++ b/source/blender/editors/transform/transform_convert_object.cc @@ -22,8 +22,8 @@ #include "BKE_rigidbody.h" #include "BKE_scene.h" -#include "ED_keyframing.h" -#include "ED_object.h" +#include "ED_keyframing.hh" +#include "ED_object.hh" #include "DEG_depsgraph_query.h" diff --git a/source/blender/editors/transform/transform_convert_particle.cc b/source/blender/editors/transform/transform_convert_particle.cc index d53690fd2cb..06bc2d881ac 100644 --- a/source/blender/editors/transform/transform_convert_particle.cc +++ b/source/blender/editors/transform/transform_convert_particle.cc @@ -18,7 +18,7 @@ #include "BKE_particle.h" #include "BKE_pointcache.h" -#include "ED_particle.h" +#include "ED_particle.hh" #include "transform.hh" #include "transform_snap.hh" diff --git a/source/blender/editors/transform/transform_convert_sculpt.cc b/source/blender/editors/transform/transform_convert_sculpt.cc index 98478914bbd..b32119d24e1 100644 --- a/source/blender/editors/transform/transform_convert_sculpt.cc +++ b/source/blender/editors/transform/transform_convert_sculpt.cc @@ -16,7 +16,7 @@ #include "BKE_paint.hh" #include "BKE_report.h" -#include "ED_sculpt.h" +#include "ED_sculpt.hh" #include "transform.hh" #include "transform_convert.hh" diff --git a/source/blender/editors/transform/transform_convert_sequencer.cc b/source/blender/editors/transform/transform_convert_sequencer.cc index 21b159e132c..d774507436d 100644 --- a/source/blender/editors/transform/transform_convert_sequencer.cc +++ b/source/blender/editors/transform/transform_convert_sequencer.cc @@ -17,8 +17,8 @@ #include "BKE_main.h" #include "BKE_report.h" -#include "ED_markers.h" -#include "ED_time_scrub_ui.h" +#include "ED_markers.hh" +#include "ED_time_scrub_ui.hh" #include "SEQ_animation.h" #include "SEQ_channels.h" @@ -31,7 +31,7 @@ #include "SEQ_transform.h" #include "SEQ_utils.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "transform.hh" #include "transform_convert.hh" diff --git a/source/blender/editors/transform/transform_convert_sequencer_image.cc b/source/blender/editors/transform/transform_convert_sequencer_image.cc index 31e31e962ed..ec99954219d 100644 --- a/source/blender/editors/transform/transform_convert_sequencer_image.cc +++ b/source/blender/editors/transform/transform_convert_sequencer_image.cc @@ -24,9 +24,9 @@ #include "SEQ_transform.h" #include "SEQ_utils.h" -#include "ED_keyframing.h" +#include "ED_keyframing.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/editors/transform/transform_convert_tracking.cc b/source/blender/editors/transform/transform_convert_tracking.cc index 4830fbe15c0..72858e6e1d1 100644 --- a/source/blender/editors/transform/transform_convert_tracking.cc +++ b/source/blender/editors/transform/transform_convert_tracking.cc @@ -18,7 +18,7 @@ #include "BKE_node_tree_update.h" #include "BKE_tracking.h" -#include "ED_clip.h" +#include "ED_clip.hh" #include "WM_api.hh" diff --git a/source/blender/editors/transform/transform_convert_tracking_curves.cc b/source/blender/editors/transform/transform_convert_tracking_curves.cc index c167a03f48a..5a60700201a 100644 --- a/source/blender/editors/transform/transform_convert_tracking_curves.cc +++ b/source/blender/editors/transform/transform_convert_tracking_curves.cc @@ -18,7 +18,7 @@ #include "BKE_node_tree_update.h" #include "BKE_tracking.h" -#include "ED_clip.h" +#include "ED_clip.hh" #include "WM_api.hh" diff --git a/source/blender/editors/transform/transform_draw_cursors.cc b/source/blender/editors/transform/transform_draw_cursors.cc index 38ab6a61555..3fc0379aa95 100644 --- a/source/blender/editors/transform/transform_draw_cursors.cc +++ b/source/blender/editors/transform/transform_draw_cursors.cc @@ -17,8 +17,8 @@ #include "DNA_screen_types.h" #include "DNA_userdef_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "transform.hh" #include "transform_draw_cursors.hh" /* Own include. */ diff --git a/source/blender/editors/transform/transform_generics.cc b/source/blender/editors/transform/transform_generics.cc index bed8da77a40..74773c8759f 100644 --- a/source/blender/editors/transform/transform_generics.cc +++ b/source/blender/editors/transform/transform_generics.cc @@ -33,18 +33,18 @@ #include "SEQ_transform.h" -#include "ED_clip.h" -#include "ED_image.h" -#include "ED_object.h" +#include "ED_clip.hh" +#include "ED_image.hh" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_uvedit.h" +#include "ED_space_api.hh" +#include "ED_uvedit.hh" #include "WM_api.hh" #include "WM_types.hh" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "SEQ_sequencer.h" diff --git a/source/blender/editors/transform/transform_gizmo_2d.cc b/source/blender/editors/transform/transform_gizmo_2d.cc index 71695a90d84..a596e36c32d 100644 --- a/source/blender/editors/transform/transform_gizmo_2d.cc +++ b/source/blender/editors/transform/transform_gizmo_2d.cc @@ -26,18 +26,18 @@ #include "RNA_access.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "WM_api.hh" #include "WM_message.hh" #include "WM_types.hh" -#include "ED_gizmo_library.h" -#include "ED_gizmo_utils.h" -#include "ED_image.h" +#include "ED_gizmo_library.hh" +#include "ED_gizmo_utils.hh" +#include "ED_image.hh" #include "ED_screen.hh" -#include "ED_uvedit.h" +#include "ED_uvedit.hh" #include "SEQ_channels.h" #include "SEQ_iterator.h" diff --git a/source/blender/editors/transform/transform_gizmo_3d.cc b/source/blender/editors/transform/transform_gizmo_3d.cc index 952de0e33ee..a6b84df34a2 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.cc +++ b/source/blender/editors/transform/transform_gizmo_3d.cc @@ -34,16 +34,16 @@ #include "WM_api.hh" #include "WM_message.hh" -#include "ED_armature.h" +#include "ED_armature.hh" #include "ED_curves.hh" -#include "ED_gizmo_library.h" -#include "ED_gizmo_utils.h" -#include "ED_gpencil_legacy.h" -#include "ED_object.h" -#include "ED_particle.h" +#include "ED_gizmo_library.hh" +#include "ED_gizmo_utils.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_object.hh" +#include "ED_particle.hh" #include "ED_screen.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/editors/transform/transform_gizmo_3d_cage.cc b/source/blender/editors/transform/transform_gizmo_3d_cage.cc index 4dab7ef5c1f..1d7332ccaec 100644 --- a/source/blender/editors/transform/transform_gizmo_3d_cage.cc +++ b/source/blender/editors/transform/transform_gizmo_3d_cage.cc @@ -16,8 +16,8 @@ #include "BKE_global.h" #include "BKE_scene.h" -#include "ED_gizmo_library.h" -#include "ED_gizmo_utils.h" +#include "ED_gizmo_library.hh" +#include "ED_gizmo_utils.hh" #include "ED_screen.hh" #include "WM_api.hh" diff --git a/source/blender/editors/transform/transform_gizmo_3d_shear.cc b/source/blender/editors/transform/transform_gizmo_3d_shear.cc index 36495d7b4c4..272a485a942 100644 --- a/source/blender/editors/transform/transform_gizmo_3d_shear.cc +++ b/source/blender/editors/transform/transform_gizmo_3d_shear.cc @@ -15,12 +15,12 @@ #include "BKE_context.h" #include "BKE_scene.h" -#include "ED_gizmo_library.h" -#include "ED_gizmo_utils.h" +#include "ED_gizmo_library.hh" +#include "ED_gizmo_utils.hh" #include "ED_screen.hh" #include "WM_api.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/editors/transform/transform_gizmo_extrude_3d.cc b/source/blender/editors/transform/transform_gizmo_extrude_3d.cc index a9005763b37..a9626b1c0d1 100644 --- a/source/blender/editors/transform/transform_gizmo_extrude_3d.cc +++ b/source/blender/editors/transform/transform_gizmo_extrude_3d.cc @@ -23,12 +23,12 @@ #include "WM_toolsystem.h" #include "WM_types.hh" -#include "ED_gizmo_library.h" -#include "ED_gizmo_utils.h" +#include "ED_gizmo_library.hh" +#include "ED_gizmo_utils.hh" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/transform/transform_mode.cc b/source/blender/editors/transform/transform_mode.cc index db68f175b48..f27816bbac0 100644 --- a/source/blender/editors/transform/transform_mode.cc +++ b/source/blender/editors/transform/transform_mode.cc @@ -24,7 +24,7 @@ #include "RNA_access.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_baketime.cc b/source/blender/editors/transform/transform_mode_baketime.cc index ecc96455421..96f51606ded 100644 --- a/source/blender/editors/transform/transform_mode_baketime.cc +++ b/source/blender/editors/transform/transform_mode_baketime.cc @@ -16,7 +16,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_bbone_resize.cc b/source/blender/editors/transform/transform_mode_bbone_resize.cc index f93d3d4bf70..df94d067a0f 100644 --- a/source/blender/editors/transform/transform_mode_bbone_resize.cc +++ b/source/blender/editors/transform/transform_mode_bbone_resize.cc @@ -16,7 +16,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_bend.cc b/source/blender/editors/transform/transform_mode_bend.cc index b639f4cc392..96e087e8915 100644 --- a/source/blender/editors/transform/transform_mode_bend.cc +++ b/source/blender/editors/transform/transform_mode_bend.cc @@ -24,7 +24,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_boneenvelope.cc b/source/blender/editors/transform/transform_mode_boneenvelope.cc index 4981ec4be68..9a377beb3d5 100644 --- a/source/blender/editors/transform/transform_mode_boneenvelope.cc +++ b/source/blender/editors/transform/transform_mode_boneenvelope.cc @@ -16,7 +16,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_boneroll.cc b/source/blender/editors/transform/transform_mode_boneroll.cc index 2b4e82e329a..0b14d26e83d 100644 --- a/source/blender/editors/transform/transform_mode_boneroll.cc +++ b/source/blender/editors/transform/transform_mode_boneroll.cc @@ -16,7 +16,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc b/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc index d06e1e07c72..0e41bd6a204 100644 --- a/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc +++ b/source/blender/editors/transform/transform_mode_curveshrinkfatten.cc @@ -17,7 +17,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_customdata.cc b/source/blender/editors/transform/transform_mode_customdata.cc index 14a669634c2..f57350eb252 100644 --- a/source/blender/editors/transform/transform_mode_customdata.cc +++ b/source/blender/editors/transform/transform_mode_customdata.cc @@ -17,7 +17,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc b/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc index 6896b58d10b..ef81c0cb4b8 100644 --- a/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc +++ b/source/blender/editors/transform/transform_mode_edge_rotate_normal.cc @@ -17,7 +17,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "transform.hh" #include "transform_convert.hh" diff --git a/source/blender/editors/transform/transform_mode_edge_seq_slide.cc b/source/blender/editors/transform/transform_mode_edge_seq_slide.cc index 826f830105f..fee04413985 100644 --- a/source/blender/editors/transform/transform_mode_edge_seq_slide.cc +++ b/source/blender/editors/transform/transform_mode_edge_seq_slide.cc @@ -21,8 +21,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "SEQ_iterator.h" #include "SEQ_sequencer.h" diff --git a/source/blender/editors/transform/transform_mode_edge_slide.cc b/source/blender/editors/transform/transform_mode_edge_slide.cc index d07532613b8..5960816ad31 100644 --- a/source/blender/editors/transform/transform_mode_edge_slide.cc +++ b/source/blender/editors/transform/transform_mode_edge_slide.cc @@ -24,7 +24,7 @@ #include "GPU_matrix.h" #include "GPU_state.h" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "ED_screen.hh" #include "WM_api.hh" @@ -32,8 +32,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_gpopacity.cc b/source/blender/editors/transform/transform_mode_gpopacity.cc index 09ab8af8827..7bdccea9b22 100644 --- a/source/blender/editors/transform/transform_mode_gpopacity.cc +++ b/source/blender/editors/transform/transform_mode_gpopacity.cc @@ -18,7 +18,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc b/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc index 9f236393373..6345d942bf4 100644 --- a/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc +++ b/source/blender/editors/transform/transform_mode_gpshrinkfatten.cc @@ -18,7 +18,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc b/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc index d7b7ae4c74c..ae1fbe0f011 100644 --- a/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc +++ b/source/blender/editors/transform/transform_mode_maskshrinkfatten.cc @@ -16,7 +16,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_mirror.cc b/source/blender/editors/transform/transform_mode_mirror.cc index 8b919c78ac7..e8cda36ad0c 100644 --- a/source/blender/editors/transform/transform_mode_mirror.cc +++ b/source/blender/editors/transform/transform_mode_mirror.cc @@ -17,7 +17,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_push_pull.cc b/source/blender/editors/transform/transform_mode_push_pull.cc index 44d5a1b8b94..51221f3958a 100644 --- a/source/blender/editors/transform/transform_mode_push_pull.cc +++ b/source/blender/editors/transform/transform_mode_push_pull.cc @@ -17,7 +17,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_resize.cc b/source/blender/editors/transform/transform_mode_resize.cc index 58ad057d5e2..9536b45cbcf 100644 --- a/source/blender/editors/transform/transform_mode_resize.cc +++ b/source/blender/editors/transform/transform_mode_resize.cc @@ -21,7 +21,7 @@ #include "RNA_access.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "transform.hh" #include "transform_constraints.hh" diff --git a/source/blender/editors/transform/transform_mode_rotate.cc b/source/blender/editors/transform/transform_mode_rotate.cc index 49cd322dbc1..cbf85ae2bc7 100644 --- a/source/blender/editors/transform/transform_mode_rotate.cc +++ b/source/blender/editors/transform/transform_mode_rotate.cc @@ -17,7 +17,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "transform.hh" #include "transform_convert.hh" diff --git a/source/blender/editors/transform/transform_mode_shear.cc b/source/blender/editors/transform/transform_mode_shear.cc index 51e928c6184..3b1ba39c141 100644 --- a/source/blender/editors/transform/transform_mode_shear.cc +++ b/source/blender/editors/transform/transform_mode_shear.cc @@ -21,7 +21,7 @@ #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_shrink_fatten.cc b/source/blender/editors/transform/transform_mode_shrink_fatten.cc index df782f8c177..fad9e4733a9 100644 --- a/source/blender/editors/transform/transform_mode_shrink_fatten.cc +++ b/source/blender/editors/transform/transform_mode_shrink_fatten.cc @@ -21,7 +21,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_skin_resize.cc b/source/blender/editors/transform/transform_mode_skin_resize.cc index 3941ae1b052..fc92334145d 100644 --- a/source/blender/editors/transform/transform_mode_skin_resize.cc +++ b/source/blender/editors/transform/transform_mode_skin_resize.cc @@ -16,7 +16,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "transform.hh" #include "transform_constraints.hh" diff --git a/source/blender/editors/transform/transform_mode_snapsource.cc b/source/blender/editors/transform/transform_mode_snapsource.cc index 28ef4c58135..96e41386830 100644 --- a/source/blender/editors/transform/transform_mode_snapsource.cc +++ b/source/blender/editors/transform/transform_mode_snapsource.cc @@ -15,7 +15,7 @@ #include "BKE_context.h" #include "ED_screen.hh" -#include "ED_transform_snap_object_context.h" +#include "ED_transform_snap_object_context.hh" #include "transform.hh" #include "transform_convert.hh" diff --git a/source/blender/editors/transform/transform_mode_tilt.cc b/source/blender/editors/transform/transform_mode_tilt.cc index d727c6a74ff..b0b3d7b3543 100644 --- a/source/blender/editors/transform/transform_mode_tilt.cc +++ b/source/blender/editors/transform/transform_mode_tilt.cc @@ -16,7 +16,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_timescale.cc b/source/blender/editors/transform/transform_mode_timescale.cc index 0c6b54dafbb..8c95ae5d21f 100644 --- a/source/blender/editors/transform/transform_mode_timescale.cc +++ b/source/blender/editors/transform/transform_mode_timescale.cc @@ -19,7 +19,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_timeslide.cc b/source/blender/editors/transform/transform_mode_timeslide.cc index d32ffbe658d..0de13252ab7 100644 --- a/source/blender/editors/transform/transform_mode_timeslide.cc +++ b/source/blender/editors/transform/transform_mode_timeslide.cc @@ -21,8 +21,8 @@ #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_timetranslate.cc b/source/blender/editors/transform/transform_mode_timetranslate.cc index 08a79e13056..95bb793ab53 100644 --- a/source/blender/editors/transform/transform_mode_timetranslate.cc +++ b/source/blender/editors/transform/transform_mode_timetranslate.cc @@ -18,8 +18,8 @@ #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_tosphere.cc b/source/blender/editors/transform/transform_mode_tosphere.cc index ca835a892ca..01ae0bd2a8a 100644 --- a/source/blender/editors/transform/transform_mode_tosphere.cc +++ b/source/blender/editors/transform/transform_mode_tosphere.cc @@ -19,7 +19,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_trackball.cc b/source/blender/editors/transform/transform_mode_trackball.cc index 97a0bf2e5d3..58c7fac094c 100644 --- a/source/blender/editors/transform/transform_mode_trackball.cc +++ b/source/blender/editors/transform/transform_mode_trackball.cc @@ -17,7 +17,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_translate.cc b/source/blender/editors/transform/transform_mode_translate.cc index 674121b3726..ab3e4e78989 100644 --- a/source/blender/editors/transform/transform_mode_translate.cc +++ b/source/blender/editors/transform/transform_mode_translate.cc @@ -21,12 +21,12 @@ #include "BKE_report.h" #include "BKE_unit.h" -#include "ED_node.h" +#include "ED_node.hh" #include "ED_screen.hh" #include "WM_api.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_mode_vert_slide.cc b/source/blender/editors/transform/transform_mode_vert_slide.cc index 91aab26bc60..ffdf098e4ab 100644 --- a/source/blender/editors/transform/transform_mode_vert_slide.cc +++ b/source/blender/editors/transform/transform_mode_vert_slide.cc @@ -28,8 +28,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/transform/transform_ops.cc b/source/blender/editors/transform/transform_ops.cc index 0a3f7b47c5f..55a7c3dc296 100644 --- a/source/blender/editors/transform/transform_ops.cc +++ b/source/blender/editors/transform/transform_ops.cc @@ -31,12 +31,12 @@ #include "WM_toolsystem.h" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "ED_screen.hh" /* for USE_LOOPSLIDE_HACK only */ -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "transform.hh" #include "transform_convert.hh" diff --git a/source/blender/editors/transform/transform_orientations.cc b/source/blender/editors/transform/transform_orientations.cc index 48d7166899f..7fedf2e32d6 100644 --- a/source/blender/editors/transform/transform_orientations.cc +++ b/source/blender/editors/transform/transform_orientations.cc @@ -39,7 +39,7 @@ #include "BLT_translation.h" -#include "ED_armature.h" +#include "ED_armature.hh" #include "ANIM_bone_collections.h" diff --git a/source/blender/editors/transform/transform_snap.cc b/source/blender/editors/transform/transform_snap.cc index 3c482ff012b..b817742672d 100644 --- a/source/blender/editors/transform/transform_snap.cc +++ b/source/blender/editors/transform/transform_snap.cc @@ -32,15 +32,15 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_gizmo_library.h" -#include "ED_markers.h" -#include "ED_node.h" -#include "ED_transform_snap_object_context.h" -#include "ED_uvedit.h" -#include "ED_view3d.h" +#include "ED_gizmo_library.hh" +#include "ED_markers.hh" +#include "ED_node.hh" +#include "ED_transform_snap_object_context.hh" +#include "ED_uvedit.hh" +#include "ED_view3d.hh" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "SEQ_iterator.h" #include "SEQ_sequencer.h" diff --git a/source/blender/editors/transform/transform_snap_animation.cc b/source/blender/editors/transform/transform_snap_animation.cc index 244b65e4e15..a6c53096576 100644 --- a/source/blender/editors/transform/transform_snap_animation.cc +++ b/source/blender/editors/transform/transform_snap_animation.cc @@ -13,7 +13,7 @@ #include "BKE_context.h" #include "BKE_nla.h" -#include "ED_markers.h" +#include "ED_markers.hh" #include "ED_screen.hh" #include "transform.hh" diff --git a/source/blender/editors/transform/transform_snap_object.cc b/source/blender/editors/transform/transform_snap_object.cc index d6051b8b4b7..ca227337ff4 100644 --- a/source/blender/editors/transform/transform_snap_object.cc +++ b/source/blender/editors/transform/transform_snap_object.cc @@ -21,8 +21,8 @@ #include "DEG_depsgraph_query.h" -#include "ED_transform_snap_object_context.h" -#include "ED_view3d.h" +#include "ED_transform_snap_object_context.hh" +#include "ED_view3d.hh" #include "transform_snap_object.hh" diff --git a/source/blender/editors/transform/transform_snap_object_armature.cc b/source/blender/editors/transform/transform_snap_object_armature.cc index 0dc14e76621..a313d8c13aa 100644 --- a/source/blender/editors/transform/transform_snap_object_armature.cc +++ b/source/blender/editors/transform/transform_snap_object_armature.cc @@ -14,7 +14,7 @@ #include "BKE_mesh.hh" #include "DNA_armature_types.h" -#include "ED_transform_snap_object_context.h" +#include "ED_transform_snap_object_context.hh" #include "ANIM_bone_collections.h" diff --git a/source/blender/editors/transform/transform_snap_object_camera.cc b/source/blender/editors/transform/transform_snap_object_camera.cc index d08e6eaba7a..750baa38d24 100644 --- a/source/blender/editors/transform/transform_snap_object_camera.cc +++ b/source/blender/editors/transform/transform_snap_object_camera.cc @@ -14,7 +14,7 @@ #include "BKE_object.h" #include "BKE_tracking.h" -#include "ED_transform_snap_object_context.h" +#include "ED_transform_snap_object_context.hh" #include "transform_snap_object.hh" diff --git a/source/blender/editors/transform/transform_snap_object_curve.cc b/source/blender/editors/transform/transform_snap_object_curve.cc index f7637de2138..6f3bc1b18f4 100644 --- a/source/blender/editors/transform/transform_snap_object_curve.cc +++ b/source/blender/editors/transform/transform_snap_object_curve.cc @@ -16,7 +16,7 @@ #include "BKE_mesh.hh" #include "BKE_object.h" -#include "ED_transform_snap_object_context.h" +#include "ED_transform_snap_object_context.hh" #include "transform_snap_object.hh" diff --git a/source/blender/editors/transform/transform_snap_object_editmesh.cc b/source/blender/editors/transform/transform_snap_object_editmesh.cc index b10e48bbef0..9da8d70df09 100644 --- a/source/blender/editors/transform/transform_snap_object_editmesh.cc +++ b/source/blender/editors/transform/transform_snap_object_editmesh.cc @@ -17,8 +17,8 @@ #include "DEG_depsgraph_query.h" -#include "ED_transform_snap_object_context.h" -#include "ED_view3d.h" +#include "ED_transform_snap_object_context.hh" +#include "ED_view3d.hh" #include "transform_snap_object.hh" diff --git a/source/blender/editors/transform/transform_snap_object_mesh.cc b/source/blender/editors/transform/transform_snap_object_mesh.cc index e68494a1b46..48226301abd 100644 --- a/source/blender/editors/transform/transform_snap_object_mesh.cc +++ b/source/blender/editors/transform/transform_snap_object_mesh.cc @@ -14,7 +14,7 @@ #include "BKE_mesh.hh" #include "BKE_object.h" -#include "ED_transform_snap_object_context.h" +#include "ED_transform_snap_object_context.hh" #include "transform_snap_object.hh" diff --git a/source/blender/editors/transform/transform_snap_sequencer.cc b/source/blender/editors/transform/transform_snap_sequencer.cc index 1abae031717..ab8e8ec3214 100644 --- a/source/blender/editors/transform/transform_snap_sequencer.cc +++ b/source/blender/editors/transform/transform_snap_sequencer.cc @@ -16,9 +16,9 @@ #include "BKE_context.h" #include "ED_screen.hh" -#include "ED_transform.h" +#include "ED_transform.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "SEQ_channels.h" #include "SEQ_effects.h" diff --git a/source/blender/editors/undo/ed_undo.cc b/source/blender/editors/undo/ed_undo.cc index 4574abe4651..97c279da4f6 100644 --- a/source/blender/editors/undo/ed_undo.cc +++ b/source/blender/editors/undo/ed_undo.cc @@ -35,13 +35,13 @@ #include "BLO_blend_validate.h" -#include "ED_asset.h" -#include "ED_gpencil_legacy.h" -#include "ED_object.h" -#include "ED_outliner.h" -#include "ED_render.h" +#include "ED_asset.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_object.hh" +#include "ED_outliner.hh" +#include "ED_render.hh" #include "ED_screen.hh" -#include "ED_undo.h" +#include "ED_undo.hh" #include "WM_api.hh" #include "WM_toolsystem.h" @@ -51,8 +51,8 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" /** We only need this locally. */ static CLG_LogRef LOG = {"ed.undo"}; diff --git a/source/blender/editors/undo/memfile_undo.cc b/source/blender/editors/undo/memfile_undo.cc index 7f03e86531c..916df87a45e 100644 --- a/source/blender/editors/undo/memfile_undo.cc +++ b/source/blender/editors/undo/memfile_undo.cc @@ -5,7 +5,7 @@ /** \file * \ingroup edundo * - * Wrapper between 'ED_undo.h' and 'BKE_undo_system.h' API's. + * Wrapper between 'ED_undo.hh' and 'BKE_undo_system.h' API's. */ #include "BLI_sys_types.h" @@ -36,9 +36,9 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "ED_object.h" -#include "ED_render.h" -#include "ED_undo.h" +#include "ED_object.hh" +#include "ED_render.hh" +#include "ED_undo.hh" #include "ED_util.hh" #include "../blenloader/BLO_undofile.h" diff --git a/source/blender/editors/undo/undo_system_types.cc b/source/blender/editors/undo/undo_system_types.cc index 29452772a94..8a4c7819d4d 100644 --- a/source/blender/editors/undo/undo_system_types.cc +++ b/source/blender/editors/undo/undo_system_types.cc @@ -10,17 +10,17 @@ #include "BLI_utildefines.h" -#include "ED_armature.h" -#include "ED_curve.h" +#include "ED_armature.hh" +#include "ED_curve.hh" #include "ED_curves.hh" -#include "ED_lattice.h" -#include "ED_mball.h" -#include "ED_mesh.h" -#include "ED_paint.h" -#include "ED_particle.h" -#include "ED_sculpt.h" -#include "ED_text.h" -#include "ED_undo.h" +#include "ED_lattice.hh" +#include "ED_mball.hh" +#include "ED_mesh.hh" +#include "ED_paint.hh" +#include "ED_particle.hh" +#include "ED_sculpt.hh" +#include "ED_text.hh" +#include "ED_undo.hh" #include "undo_intern.hh" /* Keep last */ diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index 9d9befd2611..02750027557 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -36,74 +36,74 @@ set(SRC select_utils.cc # general includes - ../include/BIF_glutil.h - ../include/ED_anim_api.h - ../include/ED_armature.h - ../include/ED_asset.h - ../include/ED_buttons.h - ../include/ED_clip.h - ../include/ED_curve.h + ../include/BIF_glutil.hh + ../include/ED_anim_api.hh + ../include/ED_armature.hh + ../include/ED_asset.hh + ../include/ED_buttons.hh + ../include/ED_clip.hh + ../include/ED_curve.hh ../include/ED_curves.hh - ../include/ED_curves_sculpt.h + ../include/ED_curves_sculpt.hh ../include/ED_datafiles.h - ../include/ED_file_indexer.h - ../include/ED_fileselect.h - ../include/ED_geometry.h - ../include/ED_gizmo_library.h - ../include/ED_gizmo_utils.h - ../include/ED_gpencil_legacy.h - ../include/ED_grease_pencil.h - ../include/ED_image.h - ../include/ED_info.h - ../include/ED_keyframes_draw.h - ../include/ED_keyframes_edit.h - ../include/ED_keyframes_keylist.h - ../include/ED_keyframing.h - ../include/ED_lattice.h - ../include/ED_markers.h - ../include/ED_mask.h - ../include/ED_mball.h - ../include/ED_mesh.h - ../include/ED_node.h + ../include/ED_file_indexer.hh + ../include/ED_fileselect.hh + ../include/ED_geometry.hh + ../include/ED_gizmo_library.hh + ../include/ED_gizmo_utils.hh + ../include/ED_gpencil_legacy.hh + ../include/ED_grease_pencil.hh + ../include/ED_image.hh + ../include/ED_info.hh + ../include/ED_keyframes_draw.hh + ../include/ED_keyframes_edit.hh + ../include/ED_keyframes_keylist.hh + ../include/ED_keyframing.hh + ../include/ED_lattice.hh + ../include/ED_markers.hh + ../include/ED_mask.hh + ../include/ED_mball.hh + ../include/ED_mesh.hh + ../include/ED_node_c.hh ../include/ED_node.hh - ../include/ED_numinput.h - ../include/ED_object.h - ../include/ED_outliner.h - ../include/ED_paint.h - ../include/ED_particle.h - ../include/ED_physics.h - ../include/ED_render.h - ../include/ED_scene.h + ../include/ED_numinput.hh + ../include/ED_object.hh + ../include/ED_outliner.hh + ../include/ED_paint.hh + ../include/ED_particle.hh + ../include/ED_physics.hh + ../include/ED_render.hh + ../include/ED_scene.hh ../include/ED_screen.hh - ../include/ED_screen_types.h - ../include/ED_sculpt.h - ../include/ED_select_utils.h - ../include/ED_sequencer.h - ../include/ED_sound.h - ../include/ED_space_api.h - ../include/ED_spreadsheet.h - ../include/ED_text.h - ../include/ED_time_scrub_ui.h - ../include/ED_transform.h - ../include/ED_transform_snap_object_context.h - ../include/ED_transverts.h - ../include/ED_undo.h - ../include/ED_userpref.h + ../include/ED_screen_types.hh + ../include/ED_sculpt.hh + ../include/ED_select_utils.hh + ../include/ED_sequencer.hh + ../include/ED_sound.hh + ../include/ED_space_api.hh + ../include/ED_spreadsheet.hh + ../include/ED_text.hh + ../include/ED_time_scrub_ui.hh + ../include/ED_transform.hh + ../include/ED_transform_snap_object_context.hh + ../include/ED_transverts.hh + ../include/ED_undo.hh + ../include/ED_userpref.hh ../include/ED_util.hh - ../include/ED_util_imbuf.h - ../include/ED_uvedit.h - ../include/ED_view3d.h - ../include/ED_view3d_offscreen.h + ../include/ED_util_imbuf.hh + ../include/ED_uvedit.hh + ../include/ED_view3d.hh + ../include/ED_view3d_offscreen.hh ../include/ED_viewer_path.hh ../include/UI_abstract_view.hh ../include/UI_grid_view.hh - ../include/UI_icons.h - ../include/UI_interface.h + ../include/UI_icons.hh ../include/UI_interface.hh - ../include/UI_interface_icons.h - ../include/UI_resources.h + ../include/UI_interface_c.hh + ../include/UI_interface_icons.hh + ../include/UI_resources.hh ../include/UI_tree_view.hh - ../include/UI_view2d.h + ../include/UI_view2d.hh ) set(LIB diff --git a/source/blender/editors/util/ed_draw.cc b/source/blender/editors/util/ed_draw.cc index a9d26785630..b651965631f 100644 --- a/source/blender/editors/util/ed_draw.cc +++ b/source/blender/editors/util/ed_draw.cc @@ -29,15 +29,15 @@ #include "IMB_metadata.h" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "ED_util.hh" #include "GPU_immediate.h" #include "GPU_matrix.h" #include "GPU_state.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "WM_api.hh" diff --git a/source/blender/editors/util/ed_transverts.cc b/source/blender/editors/util/ed_transverts.cc index 7bb1f5178d9..9014e3264ae 100644 --- a/source/blender/editors/util/ed_transverts.cc +++ b/source/blender/editors/util/ed_transverts.cc @@ -31,12 +31,12 @@ #include "DEG_depsgraph.h" -#include "ED_armature.h" +#include "ED_armature.hh" #include "ED_curves.hh" #include "ANIM_bone_collections.h" -#include "ED_transverts.h" /* own include */ +#include "ED_transverts.hh" /* own include */ void ED_transverts_update_obedit(TransVertStore *tvs, Object *obedit) { diff --git a/source/blender/editors/util/ed_util.cc b/source/blender/editors/util/ed_util.cc index d5677f2ddb1..d86478df378 100644 --- a/source/blender/editors/util/ed_util.cc +++ b/source/blender/editors/util/ed_util.cc @@ -36,21 +36,21 @@ #include "DNA_gpencil_legacy_types.h" -#include "ED_armature.h" -#include "ED_asset.h" -#include "ED_gpencil_legacy.h" -#include "ED_image.h" -#include "ED_mesh.h" -#include "ED_object.h" -#include "ED_paint.h" +#include "ED_armature.hh" +#include "ED_asset.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_image.hh" +#include "ED_mesh.hh" +#include "ED_object.hh" +#include "ED_paint.hh" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "ED_util.hh" #include "GPU_immediate.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "WM_api.hh" diff --git a/source/blender/editors/util/ed_util_imbuf.cc b/source/blender/editors/util/ed_util_imbuf.cc index d6503cbf200..8f97ecc96c1 100644 --- a/source/blender/editors/util/ed_util_imbuf.cc +++ b/source/blender/editors/util/ed_util_imbuf.cc @@ -17,9 +17,9 @@ #include "BKE_main.h" #include "BKE_screen.h" -#include "ED_image.h" +#include "ED_image.hh" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "GPU_immediate.h" #include "GPU_state.h" @@ -31,7 +31,7 @@ #include "SEQ_render.h" #include "SEQ_sequencer.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -39,7 +39,7 @@ #include "sequencer_intern.h" /* Own define. */ -#include "ED_util_imbuf.h" +#include "ED_util_imbuf.hh" /* -------------------------------------------------------------------- */ /** \name Image Pixel Sample Struct (Operator Custom Data) diff --git a/source/blender/editors/util/ed_util_ops.cc b/source/blender/editors/util/ed_util_ops.cc index 415685af8b0..3acc5041ee0 100644 --- a/source/blender/editors/util/ed_util_ops.cc +++ b/source/blender/editors/util/ed_util_ops.cc @@ -25,15 +25,15 @@ #include "BLT_translation.h" -#include "ED_asset.h" -#include "ED_render.h" -#include "ED_undo.h" +#include "ED_asset.hh" +#include "ED_render.hh" +#include "ED_undo.hh" #include "ED_util.hh" #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/util/gizmo_utils.cc b/source/blender/editors/util/gizmo_utils.cc index 3b1a6358be3..244e252e9f3 100644 --- a/source/blender/editors/util/gizmo_utils.cc +++ b/source/blender/editors/util/gizmo_utils.cc @@ -20,7 +20,7 @@ #include "WM_toolsystem.h" #include "WM_types.hh" -#include "ED_gizmo_utils.h" +#include "ED_gizmo_utils.hh" bool ED_gizmo_poll_or_unlink_delayed_from_operator(const bContext *C, wmGizmoGroupType *gzgt, diff --git a/source/blender/editors/util/numinput.cc b/source/blender/editors/util/numinput.cc index 1d55ef7b05b..c836c1dbab8 100644 --- a/source/blender/editors/util/numinput.cc +++ b/source/blender/editors/util/numinput.cc @@ -30,8 +30,8 @@ # include "BPY_extern_run.h" #endif -#include "ED_numinput.h" -#include "UI_interface.h" +#include "ED_numinput.hh" +#include "UI_interface.hh" /* Numeric input which isn't allowing full numeric editing. */ #define USE_FAKE_EDIT diff --git a/source/blender/editors/util/select_utils.cc b/source/blender/editors/util/select_utils.cc index f924e112d3c..d6491be0dc6 100644 --- a/source/blender/editors/util/select_utils.cc +++ b/source/blender/editors/util/select_utils.cc @@ -20,7 +20,7 @@ #include "WM_types.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" int ED_select_op_action(const eSelectOp sel_op, const bool is_select, const bool is_inside) { diff --git a/source/blender/editors/uvedit/uvedit_buttons.cc b/source/blender/editors/uvedit/uvedit_buttons.cc index 02965bc730f..c96e8a1ddd0 100644 --- a/source/blender/editors/uvedit/uvedit_buttons.cc +++ b/source/blender/editors/uvedit/uvedit_buttons.cc @@ -31,10 +31,10 @@ #include "DEG_depsgraph.h" -#include "ED_image.h" -#include "ED_uvedit.h" +#include "ED_image.hh" +#include "ED_uvedit.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/uvedit/uvedit_clipboard.cc b/source/blender/editors/uvedit/uvedit_clipboard.cc index a6fe48ae203..be61b90dd03 100644 --- a/source/blender/editors/uvedit/uvedit_clipboard.cc +++ b/source/blender/editors/uvedit/uvedit_clipboard.cc @@ -29,9 +29,9 @@ #include "DEG_depsgraph.h" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_uvedit.h" /* Own include. */ +#include "ED_uvedit.hh" /* Own include. */ #include "WM_api.hh" diff --git a/source/blender/editors/uvedit/uvedit_draw.cc b/source/blender/editors/uvedit/uvedit_draw.cc index 9d9d75a5435..633a5d83bf2 100644 --- a/source/blender/editors/uvedit/uvedit_draw.cc +++ b/source/blender/editors/uvedit/uvedit_draw.cc @@ -16,10 +16,10 @@ #include "GPU_immediate.h" #include "GPU_matrix.h" -#include "UI_interface.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_view2d.hh" -#include "ED_uvedit.h" +#include "ED_uvedit.hh" /* ------------------------- */ diff --git a/source/blender/editors/uvedit/uvedit_islands.cc b/source/blender/editors/uvedit/uvedit_islands.cc index f6e143b3c52..a92432e1708 100644 --- a/source/blender/editors/uvedit/uvedit_islands.cc +++ b/source/blender/editors/uvedit/uvedit_islands.cc @@ -19,7 +19,7 @@ #include "DNA_image_types.h" -#include "ED_uvedit.h" /* Own include. */ +#include "ED_uvedit.hh" /* Own include. */ /* -------------------------------------------------------------------- */ /** \name UDIM packing helper functions diff --git a/source/blender/editors/uvedit/uvedit_ops.cc b/source/blender/editors/uvedit/uvedit_ops.cc index 95bc1d6fe3c..3b85da018a1 100644 --- a/source/blender/editors/uvedit/uvedit_ops.cc +++ b/source/blender/editors/uvedit/uvedit_ops.cc @@ -39,11 +39,11 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "ED_image.h" -#include "ED_mesh.h" -#include "ED_node.h" +#include "ED_image.hh" +#include "ED_mesh.hh" +#include "ED_node.hh" #include "ED_screen.hh" -#include "ED_uvedit.h" +#include "ED_uvedit.hh" #include "RNA_access.h" #include "RNA_define.h" @@ -52,9 +52,9 @@ #include "WM_message.hh" #include "WM_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "uvedit_intern.h" diff --git a/source/blender/editors/uvedit/uvedit_path.cc b/source/blender/editors/uvedit/uvedit_path.cc index 1e6f0b56519..885f81c698f 100644 --- a/source/blender/editors/uvedit/uvedit_path.cc +++ b/source/blender/editors/uvedit/uvedit_path.cc @@ -40,10 +40,10 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "ED_object.h" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_transform.h" -#include "ED_uvedit.h" +#include "ED_transform.hh" +#include "ED_uvedit.hh" #include "RNA_access.h" #include "RNA_define.h" @@ -51,7 +51,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "intern/bmesh_marking.h" #include "uvedit_intern.h" diff --git a/source/blender/editors/uvedit/uvedit_rip.cc b/source/blender/editors/uvedit/uvedit_rip.cc index 0ba9561016c..674812d902b 100644 --- a/source/blender/editors/uvedit/uvedit_rip.cc +++ b/source/blender/editors/uvedit/uvedit_rip.cc @@ -35,8 +35,8 @@ #include "DEG_depsgraph.h" #include "ED_screen.hh" -#include "ED_transform.h" -#include "ED_uvedit.h" +#include "ED_transform.hh" +#include "ED_uvedit.hh" #include "RNA_access.h" #include "RNA_define.h" @@ -44,7 +44,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "uvedit_intern.h" diff --git a/source/blender/editors/uvedit/uvedit_select.cc b/source/blender/editors/uvedit/uvedit_select.cc index d95ff9f5df7..5b42bf9cd48 100644 --- a/source/blender/editors/uvedit/uvedit_select.cc +++ b/source/blender/editors/uvedit/uvedit_select.cc @@ -45,11 +45,11 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "ED_image.h" -#include "ED_mesh.h" +#include "ED_image.hh" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_uvedit.h" +#include "ED_select_utils.hh" +#include "ED_uvedit.hh" #include "RNA_access.h" #include "RNA_define.h" @@ -58,7 +58,7 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "uvedit_intern.h" diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.cc b/source/blender/editors/uvedit/uvedit_smart_stitch.cc index 2c5e44896d5..4b7897aaa66 100644 --- a/source/blender/editors/uvedit/uvedit_smart_stitch.cc +++ b/source/blender/editors/uvedit/uvedit_smart_stitch.cc @@ -34,12 +34,12 @@ #include "DEG_depsgraph.h" -#include "UI_interface.h" +#include "UI_interface.hh" -#include "ED_mesh.h" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_uvedit.h" +#include "ED_space_api.hh" +#include "ED_uvedit.hh" #include "GPU_batch.h" #include "GPU_state.h" @@ -51,8 +51,8 @@ #include "WM_api.hh" #include "WM_types.hh" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" #include "uvedit_intern.h" diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc index 640ada1d5e0..431a12e5b06 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc @@ -56,16 +56,16 @@ #include "PIL_time.h" -#include "UI_interface.h" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_interface.hh" +#include "UI_resources.hh" +#include "UI_view2d.hh" -#include "ED_image.h" -#include "ED_mesh.h" +#include "ED_image.hh" +#include "ED_mesh.hh" #include "ED_screen.hh" -#include "ED_undo.h" -#include "ED_uvedit.h" -#include "ED_view3d.h" +#include "ED_undo.hh" +#include "ED_uvedit.hh" +#include "ED_view3d.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_armature.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_armature.cc index 39613bc3288..b8cadf84879 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_armature.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_armature.cc @@ -35,8 +35,8 @@ #include "MEM_guardedalloc.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_array.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_array.cc index 75eff10e571..d7d1afb08ea 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_array.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_array.cc @@ -36,8 +36,8 @@ #include "BKE_object.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_build.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_build.cc index 91dc28331a5..675950df404 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_build.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_build.cc @@ -37,8 +37,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_color.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_color.cc index 7f6305eafe4..6725ab3c5f4 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_color.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_color.cc @@ -30,8 +30,8 @@ #include "BKE_material.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BKE_modifier.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_dash.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_dash.cc index 5f23ce5d6ab..8a63a0068b9 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_dash.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_dash.cc @@ -32,8 +32,8 @@ #include "MEM_guardedalloc.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_envelope.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_envelope.cc index b4367894692..626dedc1c5c 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_envelope.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_envelope.cc @@ -36,8 +36,8 @@ #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_hook.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_hook.cc index 4e911035cbc..472eb6f6b42 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_hook.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_hook.cc @@ -38,8 +38,8 @@ #include "BKE_scene.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lattice.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lattice.cc index eb926538cda..ecd1fd3d561 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lattice.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lattice.cc @@ -33,8 +33,8 @@ #include "BKE_scene.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_length.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_length.cc index 4bdc935b980..a66206b3ef6 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_length.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_length.cc @@ -34,8 +34,8 @@ #include "MEM_guardedalloc.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc index 6c775b647ee..fb6d28c9b60 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_lineart.cc @@ -31,8 +31,8 @@ #include "BKE_main.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BKE_modifier.h" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_mirror.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_mirror.cc index b2ae6c43d79..328d566b3db 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_mirror.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_mirror.cc @@ -32,8 +32,8 @@ #include "BKE_scene.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "MOD_gpencil_legacy_modifiertypes.h" #include "MOD_gpencil_legacy_ui_common.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_multiply.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_multiply.cc index a5b572a777c..eb57470f82d 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_multiply.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_multiply.cc @@ -36,8 +36,8 @@ #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_noise.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_noise.cc index 60233abbe6a..ca4d56148c3 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_noise.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_noise.cc @@ -37,8 +37,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_offset.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_offset.cc index d7173bf74e9..d869bc8e9a4 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_offset.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_offset.cc @@ -39,8 +39,8 @@ #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "MOD_gpencil_legacy_modifiertypes.h" #include "MOD_gpencil_legacy_ui_common.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_opacity.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_opacity.cc index ad3b6c32cc6..c831dd2e687 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_opacity.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_opacity.cc @@ -31,8 +31,8 @@ #include "DEG_depsgraph.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc index eeed3c6fe09..3f2501beae3 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_outline.cc @@ -33,8 +33,8 @@ #include "BKE_scene.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BKE_modifier.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_shrinkwrap.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_shrinkwrap.cc index 9b7fa600d72..0149101a6e2 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_shrinkwrap.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_shrinkwrap.cc @@ -36,8 +36,8 @@ #include "MEM_guardedalloc.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_simplify.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_simplify.cc index 4fb94ffc0da..2cff93118dc 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_simplify.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_simplify.cc @@ -29,8 +29,8 @@ #include "DEG_depsgraph.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_smooth.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_smooth.cc index efe0f13aabe..29bc38beabf 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_smooth.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_smooth.cc @@ -32,8 +32,8 @@ #include "DEG_depsgraph.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_subdiv.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_subdiv.cc index 1bed3723a7d..2abbd4d9ff0 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_subdiv.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_subdiv.cc @@ -29,8 +29,8 @@ #include "DEG_depsgraph.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "MOD_gpencil_legacy_modifiertypes.h" #include "MOD_gpencil_legacy_ui_common.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_texture.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_texture.cc index 46a1c7183be..fe4ca240bf6 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_texture.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_texture.cc @@ -31,8 +31,8 @@ #include "DEG_depsgraph.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_thick.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_thick.cc index 158faf02886..79852003e2e 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_thick.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_thick.cc @@ -31,8 +31,8 @@ #include "DEG_depsgraph.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc index 126d6a1084c..bb81247d285 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_time.cc @@ -44,8 +44,8 @@ #include "MOD_gpencil_legacy_ui_common.h" #include "MOD_gpencil_legacy_util.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "WM_api.hh" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_tint.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_tint.cc index 026b97d2267..e44e44c8512 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_tint.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_tint.cc @@ -39,8 +39,8 @@ #include "MEM_guardedalloc.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_ui_common.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_ui_common.cc index c9644506f71..1d9d31a9200 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_ui_common.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_ui_common.cc @@ -20,12 +20,12 @@ #include "DNA_object_types.h" #include "DNA_screen_types.h" -#include "ED_object.h" +#include "ED_object.hh" #include "BLT_translation.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_angle.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_angle.cc index eee488cce35..1b996b04421 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_angle.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_angle.cc @@ -32,8 +32,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_proximity.cc b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_proximity.cc index 8bf9d6033eb..763c055c68c 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_proximity.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/MOD_gpencil_legacy_weight_proximity.cc @@ -33,8 +33,8 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/gpu/intern/gpu_immediate.cc b/source/blender/gpu/intern/gpu_immediate.cc index 92c3ecd4897..286fb9c7044 100644 --- a/source/blender/gpu/intern/gpu_immediate.cc +++ b/source/blender/gpu/intern/gpu_immediate.cc @@ -9,7 +9,7 @@ */ #ifndef GPU_STANDALONE -# include "UI_resources.h" +# include "UI_resources.hh" #endif #include "GPU_immediate.h" diff --git a/source/blender/gpu/intern/gpu_immediate_util.cc b/source/blender/gpu/intern/gpu_immediate_util.cc index 7c0863d2bec..97246fa6172 100644 --- a/source/blender/gpu/intern/gpu_immediate_util.cc +++ b/source/blender/gpu/intern/gpu_immediate_util.cc @@ -16,7 +16,7 @@ #include "GPU_immediate.h" -#include "UI_resources.h" +#include "UI_resources.hh" static const float cube_coords[8][3] = { {-1, -1, -1}, diff --git a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc index f2267afadce..9469420d705 100644 --- a/source/blender/gpu/intern/gpu_shader_builder_stubs.cc +++ b/source/blender/gpu/intern/gpu_shader_builder_stubs.cc @@ -31,7 +31,7 @@ #include "bmesh.h" -#include "UI_resources.h" +#include "UI_resources.hh" extern "C" { Global G; @@ -59,7 +59,7 @@ extern "C" struct ImBuf *IMB_allocImBuf(unsigned int /*x*/, /** \} */ /* -------------------------------------------------------------------- */ -/** \name Stubs of UI_resources.h +/** \name Stubs of UI_resources.hh * \{ */ extern "C" void UI_GetThemeColor4fv(int /*colorid*/, float[4] /*col*/) diff --git a/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl b/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl index a626accfb0a..ee4a7b0cfd1 100644 --- a/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl +++ b/source/blender/gpu/shaders/gpu_shader_2D_widget_shadow_vert.glsl @@ -1,7 +1,7 @@ #define BIT_RANGE(x) uint((1 << x) - 1) /* 2 bits for corner */ -/* Attention! Not the same order as in UI_interface.h! +/* Attention! Not the same order as in UI_interface.hh! * Ordered by drawing order. */ #define BOTTOM_LEFT 0u #define BOTTOM_RIGHT 1u diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc index 53d22f5fca7..ee11156b750 100644 --- a/source/blender/io/alembic/intern/alembic_capi.cc +++ b/source/blender/io/alembic/intern/alembic_capi.cc @@ -43,7 +43,7 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_build.h" -#include "ED_undo.h" +#include "ED_undo.hh" #include "BLI_compiler_compat.h" #include "BLI_fileops.h" diff --git a/source/blender/io/collada/AnimationExporter.h b/source/blender/io/collada/AnimationExporter.h index fed28837fc4..a225117de77 100644 --- a/source/blender/io/collada/AnimationExporter.h +++ b/source/blender/io/collada/AnimationExporter.h @@ -33,7 +33,7 @@ #include "BKE_fcurve.h" #include "BKE_object.h" #include "BKE_scene.h" -#include "ED_object.h" +#include "ED_object.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/io/collada/AnimationImporter.cpp b/source/blender/io/collada/AnimationImporter.cpp index bd663199eb5..3659cc7407d 100644 --- a/source/blender/io/collada/AnimationImporter.cpp +++ b/source/blender/io/collada/AnimationImporter.cpp @@ -13,7 +13,7 @@ #include "DNA_armature_types.h" -#include "ED_keyframing.h" +#include "ED_keyframing.hh" #include "BLI_listbase.h" #include "BLI_math.h" diff --git a/source/blender/io/collada/ArmatureExporter.cpp b/source/blender/io/collada/ArmatureExporter.cpp index b957b036fc8..1eb2eb08039 100644 --- a/source/blender/io/collada/ArmatureExporter.cpp +++ b/source/blender/io/collada/ArmatureExporter.cpp @@ -20,7 +20,7 @@ #include "BKE_global.h" #include "BKE_mesh.hh" -#include "ED_armature.h" +#include "ED_armature.hh" #include "BLI_listbase.h" diff --git a/source/blender/io/collada/ArmatureImporter.cpp b/source/blender/io/collada/ArmatureImporter.cpp index 1bd24c60eee..17371cd7695 100644 --- a/source/blender/io/collada/ArmatureImporter.cpp +++ b/source/blender/io/collada/ArmatureImporter.cpp @@ -18,7 +18,7 @@ #include "BKE_object.h" #include "BLI_listbase.h" #include "BLI_string.h" -#include "ED_armature.h" +#include "ED_armature.hh" #include "ANIM_bone_collections.h" diff --git a/source/blender/io/collada/ArmatureImporter.h b/source/blender/io/collada/ArmatureImporter.h index f690e1ae840..01655895d6e 100644 --- a/source/blender/io/collada/ArmatureImporter.h +++ b/source/blender/io/collada/ArmatureImporter.h @@ -20,7 +20,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "ED_armature.h" +#include "ED_armature.hh" #include "AnimationImporter.h" #include "ExtraTags.h" diff --git a/source/blender/io/collada/BCAnimationCurve.h b/source/blender/io/collada/BCAnimationCurve.h index 384e88b51b3..a06f52f50e8 100644 --- a/source/blender/io/collada/BCAnimationCurve.h +++ b/source/blender/io/collada/BCAnimationCurve.h @@ -13,9 +13,9 @@ #include "BKE_fcurve.h" #include "BKE_material.h" -#include "ED_anim_api.h" -#include "ED_keyframes_edit.h" -#include "ED_keyframing.h" +#include "ED_anim_api.hh" +#include "ED_keyframes_edit.hh" +#include "ED_keyframing.hh" typedef float(TangentPoint)[2]; diff --git a/source/blender/io/collada/BCAnimationSampler.cpp b/source/blender/io/collada/BCAnimationSampler.cpp index 5eb41c69a8a..60e3ab1904f 100644 --- a/source/blender/io/collada/BCAnimationSampler.cpp +++ b/source/blender/io/collada/BCAnimationSampler.cpp @@ -26,7 +26,7 @@ #include "DNA_key_types.h" #include "DNA_scene_types.h" -#include "ED_object.h" +#include "ED_object.hh" static std::string EMPTY_STRING; static BCAnimationCurveMap BCEmptyAnimationCurves; diff --git a/source/blender/io/collada/ControllerExporter.cpp b/source/blender/io/collada/ControllerExporter.cpp index a3cc098000f..12392721248 100644 --- a/source/blender/io/collada/ControllerExporter.cpp +++ b/source/blender/io/collada/ControllerExporter.cpp @@ -23,7 +23,7 @@ #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "ED_armature.h" +#include "ED_armature.hh" #include "BLI_listbase.h" diff --git a/source/blender/io/collada/DocumentExporter.cpp b/source/blender/io/collada/DocumentExporter.cpp index 101a74c8f63..2a0800d4477 100644 --- a/source/blender/io/collada/DocumentExporter.cpp +++ b/source/blender/io/collada/DocumentExporter.cpp @@ -81,7 +81,7 @@ #include "BKE_object.h" #include "BKE_scene.h" -#include "ED_keyframing.h" +#include "ED_keyframing.hh" #ifdef WITH_BUILDINFO extern "C" char build_commit_date[]; extern "C" char build_commit_time[]; diff --git a/source/blender/io/collada/SceneExporter.h b/source/blender/io/collada/SceneExporter.h index c583a03bc0e..b0f0738664b 100644 --- a/source/blender/io/collada/SceneExporter.h +++ b/source/blender/io/collada/SceneExporter.h @@ -32,7 +32,7 @@ #include "BKE_fcurve.h" #include "BLI_fileops.h" #include "BLI_path_util.h" -#include "ED_keyframing.h" +#include "ED_keyframing.hh" #include "COLLADASWAsset.h" #include "COLLADASWBaseInputElement.h" diff --git a/source/blender/io/collada/SkinInfo.cpp b/source/blender/io/collada/SkinInfo.cpp index 05f4e4b40c3..6288bfd3b20 100644 --- a/source/blender/io/collada/SkinInfo.cpp +++ b/source/blender/io/collada/SkinInfo.cpp @@ -28,8 +28,8 @@ #include "BKE_object.h" #include "BKE_object_deform.h" -#include "ED_mesh.h" -#include "ED_object.h" +#include "ED_mesh.hh" +#include "ED_object.hh" #include "SkinInfo.h" #include "collada_utils.h" diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp index 4eb68690c34..db13b5f2ee3 100644 --- a/source/blender/io/collada/collada_utils.cpp +++ b/source/blender/io/collada/collada_utils.cpp @@ -48,8 +48,8 @@ #include "BKE_object.h" #include "BKE_scene.h" -#include "ED_node.h" -#include "ED_object.h" +#include "ED_node.hh" +#include "ED_object.hh" #include "ED_screen.hh" #include "WM_api.hh" /* XXX hrm, see if we can do without this */ diff --git a/source/blender/io/gpencil/intern/gpencil_io_base.cc b/source/blender/io/gpencil/intern/gpencil_io_base.cc index 171464cb10b..191f48a9775 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_base.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_base.cc @@ -25,9 +25,9 @@ #include "BKE_material.h" #include "BKE_scene.h" -#include "UI_view2d.h" +#include "UI_view2d.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc index 8ba051d8c24..6f9e4ceb0d4 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc @@ -24,14 +24,14 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "ED_gpencil_legacy.h" -#include "ED_view3d.h" +#include "ED_gpencil_legacy.hh" +#include "ED_view3d.hh" #ifdef WIN32 # include "utfconv.h" #endif -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "gpencil_io.h" #include "gpencil_io_export_pdf.hh" diff --git a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc index af15366d25f..0066128e38e 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_export_svg.cc @@ -24,14 +24,14 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "ED_gpencil_legacy.h" -#include "ED_view3d.h" +#include "ED_gpencil_legacy.hh" +#include "ED_view3d.hh" #ifdef WIN32 # include "utfconv.h" #endif -#include "UI_view2d.h" +#include "UI_view2d.hh" #include "gpencil_io.h" #include "gpencil_io_export_svg.hh" diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_base.cc b/source/blender/io/gpencil/intern/gpencil_io_import_base.cc index 6e796712c25..65ae380efad 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_import_base.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_import_base.cc @@ -14,8 +14,8 @@ #include "BKE_gpencil_legacy.h" #include "BKE_material.h" -#include "ED_gpencil_legacy.h" -#include "ED_object.h" +#include "ED_gpencil_legacy.hh" +#include "ED_object.hh" #include "gpencil_io_import_base.hh" diff --git a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc index bfb875b3ac3..e5dc6a95836 100644 --- a/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc +++ b/source/blender/io/gpencil/intern/gpencil_io_import_svg.cc @@ -18,7 +18,7 @@ #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -#include "ED_gpencil_legacy.h" +#include "ED_gpencil_legacy.hh" #include "gpencil_io.h" #include "gpencil_io_import_svg.hh" diff --git a/source/blender/io/wavefront_obj/exporter/obj_exporter.cc b/source/blender/io/wavefront_obj/exporter/obj_exporter.cc index 9615f1b913a..b2ede805061 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_exporter.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_exporter.cc @@ -20,7 +20,7 @@ #include "DNA_scene_types.h" -#include "ED_object.h" +#include "ED_object.hh" #include "obj_export_mesh.hh" #include "obj_export_nurbs.hh" diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h index 86243ad27ed..98b7db5ea9e 100644 --- a/source/blender/makesdna/DNA_modifier_types.h +++ b/source/blender/makesdna/DNA_modifier_types.h @@ -2128,7 +2128,7 @@ typedef struct DataTransferModifierData { struct Object *ob_source; - /** See DT_TYPE_ enum in ED_object.h. */ + /** See DT_TYPE_ enum in ED_object.hh. */ int data_types; /* See MREMAP_MODE_ enum in BKE_mesh_mapping.hh */ @@ -2143,9 +2143,9 @@ typedef struct DataTransferModifierData { char _pad1[4]; - /** DT_MULTILAYER_INDEX_MAX; See DT_FROMLAYERS_ enum in ED_object.h. */ + /** DT_MULTILAYER_INDEX_MAX; See DT_FROMLAYERS_ enum in ED_object.hh. */ int layers_select_src[5]; - /** DT_MULTILAYER_INDEX_MAX; See DT_TOLAYERS_ enum in ED_object.h. */ + /** DT_MULTILAYER_INDEX_MAX; See DT_TOLAYERS_ enum in ED_object.hh. */ int layers_select_dst[5]; /** See CDT_MIX_ enum in BKE_customdata.h. */ diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h index 68855363e54..539fa8c9e0c 100644 --- a/source/blender/makesrna/RNA_types.h +++ b/source/blender/makesrna/RNA_types.h @@ -6,7 +6,7 @@ * \ingroup RNA */ -/* Use a define instead of `#pragma once` because of `BKE_addon.h`, `ED_object.h` & others. */ +/* Use a define instead of `#pragma once` because of `BKE_addon.h`, `ED_object.hh` & others. */ #ifndef __RNA_TYPES_H__ #define __RNA_TYPES_H__ diff --git a/source/blender/makesrna/intern/rna_ID.cc b/source/blender/makesrna/intern/rna_ID.cc index be74f9a0ada..803bd3b20c4 100644 --- a/source/blender/makesrna/intern/rna_ID.cc +++ b/source/blender/makesrna/intern/rna_ID.cc @@ -227,7 +227,7 @@ const IDFilterEnumPropertyItem rna_enum_id_type_filter_items[] = { # include "DEG_depsgraph_build.h" # include "DEG_depsgraph_query.h" -# include "ED_asset.h" +# include "ED_asset.hh" # include "WM_api.hh" diff --git a/source/blender/makesrna/intern/rna_action.cc b/source/blender/makesrna/intern/rna_action.cc index fabf7b2da42..870c4f5d8d1 100644 --- a/source/blender/makesrna/intern/rna_action.cc +++ b/source/blender/makesrna/intern/rna_action.cc @@ -36,7 +36,7 @@ # include "DEG_depsgraph.h" -# include "ED_keyframing.h" +# include "ED_keyframing.hh" # include "WM_api.hh" diff --git a/source/blender/makesrna/intern/rna_animation.cc b/source/blender/makesrna/intern/rna_animation.cc index efc4458895f..524159bc172 100644 --- a/source/blender/makesrna/intern/rna_animation.cc +++ b/source/blender/makesrna/intern/rna_animation.cc @@ -26,7 +26,7 @@ #include "WM_types.hh" -#include "ED_keyframing.h" +#include "ED_keyframing.hh" /* exported for use in API */ const EnumPropertyItem rna_enum_keyingset_path_grouping_items[] = { @@ -111,7 +111,7 @@ const EnumPropertyItem rna_enum_keying_flag_items_api[] = { # include "DNA_object_types.h" -# include "ED_anim_api.h" +# include "ED_anim_api.hh" # include "WM_api.hh" diff --git a/source/blender/makesrna/intern/rna_animation_api.cc b/source/blender/makesrna/intern/rna_animation_api.cc index 7e06d4fb9d9..3b85ad3f5a3 100644 --- a/source/blender/makesrna/intern/rna_animation_api.cc +++ b/source/blender/makesrna/intern/rna_animation_api.cc @@ -24,7 +24,7 @@ # include "BKE_nla.h" # include "BKE_report.h" -# include "ED_keyframing.h" +# include "ED_keyframing.hh" static void rna_KeyingSet_context_refresh(KeyingSet *ks, bContext *C, ReportList *reports) { diff --git a/source/blender/makesrna/intern/rna_armature.cc b/source/blender/makesrna/intern/rna_armature.cc index e4a420733fd..404acd5a3e1 100644 --- a/source/blender/makesrna/intern/rna_armature.cc +++ b/source/blender/makesrna/intern/rna_armature.cc @@ -36,7 +36,7 @@ # include "BKE_main.h" # include "BKE_armature.h" -# include "ED_armature.h" +# include "ED_armature.hh" # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" diff --git a/source/blender/makesrna/intern/rna_asset.cc b/source/blender/makesrna/intern/rna_asset.cc index 9488ee33090..e7dc08986d7 100644 --- a/source/blender/makesrna/intern/rna_asset.cc +++ b/source/blender/makesrna/intern/rna_asset.cc @@ -37,8 +37,8 @@ const EnumPropertyItem rna_enum_aset_library_type_items[] = { # include "BLI_listbase.h" # include "BLI_uuid.h" -# include "ED_asset.h" -# include "ED_fileselect.h" +# include "ED_asset.hh" +# include "ED_fileselect.hh" # include "RNA_access.h" diff --git a/source/blender/makesrna/intern/rna_color.cc b/source/blender/makesrna/intern/rna_color.cc index dd3365f4c44..133aaa41715 100644 --- a/source/blender/makesrna/intern/rna_color.cc +++ b/source/blender/makesrna/intern/rna_color.cc @@ -57,7 +57,7 @@ const EnumPropertyItem rna_enum_color_space_convert_default_items[] = { # include "DEG_depsgraph.h" -# include "ED_node.h" +# include "ED_node.hh" # include "IMB_colormanagement.h" # include "IMB_imbuf.h" diff --git a/source/blender/makesrna/intern/rna_constraint.cc b/source/blender/makesrna/intern/rna_constraint.cc index f98712c64c8..a5e83fa37db 100644 --- a/source/blender/makesrna/intern/rna_constraint.cc +++ b/source/blender/makesrna/intern/rna_constraint.cc @@ -27,7 +27,7 @@ #include "WM_types.hh" -#include "ED_object.h" +#include "ED_object.hh" /* Please keep the names in sync with `constraint.cc`. */ const EnumPropertyItem rna_enum_constraint_type_items[] = { diff --git a/source/blender/makesrna/intern/rna_curve.cc b/source/blender/makesrna/intern/rna_curve.cc index adeaafee1c8..e7e8f2bf14b 100644 --- a/source/blender/makesrna/intern/rna_curve.cc +++ b/source/blender/makesrna/intern/rna_curve.cc @@ -165,7 +165,7 @@ static const EnumPropertyItem curve2d_fill_mode_items[] = { # include "MEM_guardedalloc.h" -# include "ED_curve.h" /* for BKE_curve_nurbs_get */ +# include "ED_curve.hh" /* for BKE_curve_nurbs_get */ /* highly irritating but from RNA we can't know this */ static Nurb *curve_nurb_from_point(Curve *cu, const void *point, int *nu_index, int *pt_index) diff --git a/source/blender/makesrna/intern/rna_define.cc b/source/blender/makesrna/intern/rna_define.cc index 6e7e9d37b0d..a035f8ac444 100644 --- a/source/blender/makesrna/intern/rna_define.cc +++ b/source/blender/makesrna/intern/rna_define.cc @@ -26,7 +26,7 @@ #include "BLT_translation.h" -#include "UI_interface.h" /* For things like UI_PRECISION_FLOAT_MAX... */ +#include "UI_interface.hh" /* For things like UI_PRECISION_FLOAT_MAX... */ #include "RNA_define.h" diff --git a/source/blender/makesrna/intern/rna_fcurve.cc b/source/blender/makesrna/intern/rna_fcurve.cc index 55ff0223b4a..bb38fa782d8 100644 --- a/source/blender/makesrna/intern/rna_fcurve.cc +++ b/source/blender/makesrna/intern/rna_fcurve.cc @@ -27,8 +27,8 @@ #include "WM_types.hh" -#include "ED_keyframes_edit.h" -#include "ED_keyframing.h" +#include "ED_keyframes_edit.hh" +#include "ED_keyframing.hh" const EnumPropertyItem rna_enum_fmodifier_type_items[] = { {FMODIFIER_TYPE_NULL, "nullptr", 0, "Invalid", ""}, diff --git a/source/blender/makesrna/intern/rna_image.cc b/source/blender/makesrna/intern/rna_image.cc index f3cc7f1aa10..503e56dae51 100644 --- a/source/blender/makesrna/intern/rna_image.cc +++ b/source/blender/makesrna/intern/rna_image.cc @@ -63,7 +63,7 @@ static const EnumPropertyItem image_source_items[] = { # include "IMB_imbuf.h" # include "IMB_imbuf_types.h" -# include "ED_node.h" +# include "ED_node.hh" static bool rna_Image_is_stereo_3d_get(PointerRNA *ptr) { diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index 71dd2df4350..baad472cc94 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -14,7 +14,7 @@ #include "rna_internal_types.h" -#include "UI_resources.h" +#include "UI_resources.hh" #ifdef __cplusplus extern "C" { diff --git a/source/blender/makesrna/intern/rna_lattice.cc b/source/blender/makesrna/intern/rna_lattice.cc index 62261b1213c..75c2bf6c959 100644 --- a/source/blender/makesrna/intern/rna_lattice.cc +++ b/source/blender/makesrna/intern/rna_lattice.cc @@ -32,7 +32,7 @@ # include "DEG_depsgraph.h" -# include "ED_lattice.h" +# include "ED_lattice.hh" # include "WM_api.hh" # include "WM_types.hh" diff --git a/source/blender/makesrna/intern/rna_layer.cc b/source/blender/makesrna/intern/rna_layer.cc index 6236e600c1b..1de449318c1 100644 --- a/source/blender/makesrna/intern/rna_layer.cc +++ b/source/blender/makesrna/intern/rna_layer.cc @@ -12,8 +12,8 @@ #include "BLT_translation.h" -#include "ED_object.h" -#include "ED_render.h" +#include "ED_object.hh" +#include "ED_render.hh" #include "RE_engine.h" diff --git a/source/blender/makesrna/intern/rna_light.cc b/source/blender/makesrna/intern/rna_light.cc index 51295376fd5..7655b727bce 100644 --- a/source/blender/makesrna/intern/rna_light.cc +++ b/source/blender/makesrna/intern/rna_light.cc @@ -32,7 +32,7 @@ # include "DEG_depsgraph.h" -# include "ED_node.h" +# include "ED_node.hh" # include "WM_api.hh" # include "WM_types.hh" diff --git a/source/blender/makesrna/intern/rna_linestyle.cc b/source/blender/makesrna/intern/rna_linestyle.cc index 2100678fdd0..5ba49eb5869 100644 --- a/source/blender/makesrna/intern/rna_linestyle.cc +++ b/source/blender/makesrna/intern/rna_linestyle.cc @@ -119,7 +119,7 @@ const EnumPropertyItem rna_enum_linestyle_geometry_modifier_type_items[] = { # include "DEG_depsgraph.h" -# include "ED_node.h" +# include "ED_node.hh" # include "RNA_access.h" diff --git a/source/blender/makesrna/intern/rna_main_api.cc b/source/blender/makesrna/intern/rna_main_api.cc index a52abd3e973..9b98010b62d 100644 --- a/source/blender/makesrna/intern/rna_main_api.cc +++ b/source/blender/makesrna/intern/rna_main_api.cc @@ -91,7 +91,7 @@ # include "DNA_volume_types.h" # include "DNA_world_types.h" -# include "ED_node.h" +# include "ED_node.hh" # include "ED_screen.hh" # include "BLT_translation.h" diff --git a/source/blender/makesrna/intern/rna_material.cc b/source/blender/makesrna/intern/rna_material.cc index da2a4527bb6..3102b8bec4c 100644 --- a/source/blender/makesrna/intern/rna_material.cc +++ b/source/blender/makesrna/intern/rna_material.cc @@ -79,9 +79,9 @@ const EnumPropertyItem rna_enum_ramp_blend_items[] = { # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" -# include "ED_gpencil_legacy.h" -# include "ED_image.h" -# include "ED_node.h" +# include "ED_gpencil_legacy.hh" +# include "ED_image.hh" +# include "ED_node.hh" # include "ED_screen.hh" static void rna_Material_update(Main * /*bmain*/, Scene * /*scene*/, PointerRNA *ptr) diff --git a/source/blender/makesrna/intern/rna_mesh.cc b/source/blender/makesrna/intern/rna_mesh.cc index 61a3704ea2c..1ad0583c2a9 100644 --- a/source/blender/makesrna/intern/rna_mesh.cc +++ b/source/blender/makesrna/intern/rna_mesh.cc @@ -61,7 +61,7 @@ static const EnumPropertyItem rna_enum_mesh_remesh_mode_items[] = { # include "DEG_depsgraph.h" -# include "ED_mesh.h" /* XXX Bad level call */ +# include "ED_mesh.hh" /* XXX Bad level call */ # include "WM_api.hh" diff --git a/source/blender/makesrna/intern/rna_mesh_api.cc b/source/blender/makesrna/intern/rna_mesh_api.cc index 8881cc6ad9b..fe5c9d7f63e 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.cc +++ b/source/blender/makesrna/intern/rna_mesh_api.cc @@ -29,7 +29,7 @@ # include "BKE_mesh_tangent.hh" # include "BKE_report.h" -# include "ED_mesh.h" +# include "ED_mesh.hh" # include "DEG_depsgraph.h" diff --git a/source/blender/makesrna/intern/rna_movieclip.cc b/source/blender/makesrna/intern/rna_movieclip.cc index 8499d142208..6ddc035d08c 100644 --- a/source/blender/makesrna/intern/rna_movieclip.cc +++ b/source/blender/makesrna/intern/rna_movieclip.cc @@ -32,7 +32,7 @@ # include "DEG_depsgraph.h" -# include "ED_clip.h" +# include "ED_clip.hh" # include "DNA_screen_types.h" # include "DNA_space_types.h" diff --git a/source/blender/makesrna/intern/rna_nla.cc b/source/blender/makesrna/intern/rna_nla.cc index c864f2d4916..fde46cc4109 100644 --- a/source/blender/makesrna/intern/rna_nla.cc +++ b/source/blender/makesrna/intern/rna_nla.cc @@ -81,7 +81,7 @@ const EnumPropertyItem rna_enum_nla_mode_extend_items[] = { # include "DNA_object_types.h" -# include "ED_anim_api.h" +# include "ED_anim_api.hh" # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" diff --git a/source/blender/makesrna/intern/rna_node_socket.cc b/source/blender/makesrna/intern/rna_node_socket.cc index a01b4662d1c..f7cd8795256 100644 --- a/source/blender/makesrna/intern/rna_node_socket.cc +++ b/source/blender/makesrna/intern/rna_node_socket.cc @@ -46,7 +46,7 @@ const EnumPropertyItem rna_enum_node_socket_type_items[] = { # include "DEG_depsgraph_build.h" -# include "ED_node.h" +# include "ED_node.hh" extern "C" { extern FunctionRNA rna_NodeSocket_draw_func; diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index 34e154ff708..dfff626b16a 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -576,8 +576,8 @@ static EnumPropertyItem rna_node_geometry_mesh_circle_fill_type_items[] = { # include "BKE_global.h" -# include "ED_node.h" -# include "ED_render.h" +# include "ED_node.hh" +# include "ED_render.hh" # include "GPU_material.h" diff --git a/source/blender/makesrna/intern/rna_object.cc b/source/blender/makesrna/intern/rna_object.cc index 33f492b6c81..9425f57e582 100644 --- a/source/blender/makesrna/intern/rna_object.cc +++ b/source/blender/makesrna/intern/rna_object.cc @@ -43,8 +43,8 @@ #include "rna_internal.h" -#include "BLI_sys_types.h" /* needed for intptr_t used in ED_mesh.h */ -#include "ED_mesh.h" +#include "BLI_sys_types.h" /* needed for intptr_t used in ED_mesh.hh */ +#include "ED_mesh.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -343,10 +343,10 @@ const EnumPropertyItem rna_enum_object_axis_items[] = { # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" -# include "ED_curve.h" -# include "ED_lattice.h" -# include "ED_object.h" -# include "ED_particle.h" +# include "ED_curve.hh" +# include "ED_lattice.hh" +# include "ED_object.hh" +# include "ED_particle.hh" static void rna_Object_internal_update(Main * /*bmain*/, Scene * /*scene*/, PointerRNA *ptr) { diff --git a/source/blender/makesrna/intern/rna_object_api.cc b/source/blender/makesrna/intern/rna_object_api.cc index 05ca7ebb0c2..0d1a4d724dd 100644 --- a/source/blender/makesrna/intern/rna_object_api.cc +++ b/source/blender/makesrna/intern/rna_object_api.cc @@ -26,7 +26,7 @@ #include "DEG_depsgraph.h" -#include "ED_outliner.h" +#include "ED_outliner.hh" #include "rna_internal.h" /* own include */ @@ -68,7 +68,7 @@ static const EnumPropertyItem space_items[] = { # include "BKE_report.h" # include "BKE_vfont.h" -# include "ED_object.h" +# include "ED_object.hh" # include "ED_screen.hh" # include "DNA_curve_types.h" diff --git a/source/blender/makesrna/intern/rna_object_force.cc b/source/blender/makesrna/intern/rna_object_force.cc index 99dfa24a991..6dae6148f79 100644 --- a/source/blender/makesrna/intern/rna_object_force.cc +++ b/source/blender/makesrna/intern/rna_object_force.cc @@ -113,7 +113,7 @@ static const EnumPropertyItem empty_vortex_shape_items[] = { # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" -# include "ED_object.h" +# include "ED_object.hh" static bool rna_Cache_get_valid_owner_ID(PointerRNA *ptr, Object **ob, Scene **scene) { diff --git a/source/blender/makesrna/intern/rna_pose.cc b/source/blender/makesrna/intern/rna_pose.cc index 6bd9f5b51c0..17ebf7812f8 100644 --- a/source/blender/makesrna/intern/rna_pose.cc +++ b/source/blender/makesrna/intern/rna_pose.cc @@ -25,7 +25,7 @@ #include "BLT_translation.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "WM_types.hh" @@ -77,8 +77,8 @@ const EnumPropertyItem rna_enum_color_sets_items[] = { # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" -# include "ED_armature.h" -# include "ED_object.h" +# include "ED_armature.hh" +# include "ED_object.hh" # include "WM_api.hh" diff --git a/source/blender/makesrna/intern/rna_render.cc b/source/blender/makesrna/intern/rna_render.cc index 40d4d8521c4..2041a34604d 100644 --- a/source/blender/makesrna/intern/rna_render.cc +++ b/source/blender/makesrna/intern/rna_render.cc @@ -32,7 +32,7 @@ #include "RE_engine.h" #include "RE_pipeline.h" -#include "ED_render.h" +#include "ED_render.hh" /* Deprecated, only provided for API compatibility. */ const EnumPropertyItem rna_enum_render_pass_type_items[] = { diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc index 888eab2ba23..29e19b81fd4 100644 --- a/source/blender/makesrna/intern/rna_scene.cc +++ b/source/blender/makesrna/intern/rna_scene.cc @@ -37,9 +37,9 @@ #include "BKE_paint.hh" #include "BKE_volume.h" -#include "ED_gpencil_legacy.h" -#include "ED_object.h" -#include "ED_uvedit.h" +#include "ED_gpencil_legacy.hh" +#include "ED_object.hh" +#include "ED_uvedit.hh" #include "RNA_define.h" #include "RNA_enum_types.h" @@ -57,8 +57,8 @@ # include #endif -#include "ED_render.h" -#include "ED_transform.h" +#include "ED_render.hh" +#include "ED_transform.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -736,13 +736,13 @@ const EnumPropertyItem rna_enum_grease_pencil_selectmode_items[] = { # include "NOD_composite.h" -# include "ED_image.h" -# include "ED_info.h" -# include "ED_keyframing.h" -# include "ED_mesh.h" -# include "ED_node.h" -# include "ED_scene.h" -# include "ED_view3d.h" +# include "ED_image.hh" +# include "ED_info.hh" +# include "ED_keyframing.hh" +# include "ED_mesh.hh" +# include "ED_node.hh" +# include "ED_scene.hh" +# include "ED_view3d.hh" # include "DEG_depsgraph_build.h" # include "DEG_depsgraph_query.h" diff --git a/source/blender/makesrna/intern/rna_scene_api.cc b/source/blender/makesrna/intern/rna_scene_api.cc index e8088dc6e92..dbe21fee5c7 100644 --- a/source/blender/makesrna/intern/rna_scene_api.cc +++ b/source/blender/makesrna/intern/rna_scene_api.cc @@ -36,9 +36,9 @@ # include "DEG_depsgraph_query.h" -# include "ED_transform.h" -# include "ED_transform_snap_object_context.h" -# include "ED_uvedit.h" +# include "ED_transform.hh" +# include "ED_transform_snap_object_context.hh" +# include "ED_uvedit.hh" # ifdef WITH_PYTHON # include "BPY_extern.h" diff --git a/source/blender/makesrna/intern/rna_screen.cc b/source/blender/makesrna/intern/rna_screen.cc index 0c6495a7322..b24c5daf790 100644 --- a/source/blender/makesrna/intern/rna_screen.cc +++ b/source/blender/makesrna/intern/rna_screen.cc @@ -18,7 +18,7 @@ #include "DNA_screen_types.h" #include "DNA_workspace_types.h" -#include "ED_info.h" +#include "ED_info.hh" const EnumPropertyItem rna_enum_region_type_items[] = { {RGN_TYPE_WINDOW, "WINDOW", 0, "Window", ""}, @@ -55,7 +55,7 @@ const EnumPropertyItem rna_enum_region_type_items[] = { # include "DEG_depsgraph.h" -# include "UI_view2d.h" +# include "UI_view2d.hh" # ifdef WITH_PYTHON # include "BPY_extern.h" diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.cc b/source/blender/makesrna/intern/rna_sculpt_paint.cc index 4bdec22dfac..45448dd7656 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.cc +++ b/source/blender/makesrna/intern/rna_sculpt_paint.cc @@ -29,7 +29,7 @@ #include "BKE_material.h" #include "BKE_paint.hh" -#include "ED_image.h" +#include "ED_image.hh" #include "WM_api.hh" #include "WM_types.hh" @@ -117,9 +117,9 @@ const EnumPropertyItem rna_enum_symmetrize_direction_items[] = { # include "DEG_depsgraph.h" -# include "ED_gpencil_legacy.h" -# include "ED_paint.h" -# include "ED_particle.h" +# include "ED_gpencil_legacy.hh" +# include "ED_paint.hh" +# include "ED_particle.hh" static void rna_GPencil_update(Main * /*bmain*/, Scene *scene, PointerRNA * /*ptr*/) { diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc index 9a31a0d1549..65492a6bcee 100644 --- a/source/blender/makesrna/intern/rna_space.cc +++ b/source/blender/makesrna/intern/rna_space.cc @@ -23,9 +23,9 @@ #include "BKE_studiolight.h" #include "BKE_viewer_path.h" -#include "ED_asset.h" -#include "ED_spreadsheet.h" -#include "ED_text.h" +#include "ED_asset.hh" +#include "ED_spreadsheet.hh" +#include "ED_text.hh" #include "BLI_listbase.h" #include "BLI_math.h" @@ -564,24 +564,24 @@ static const EnumPropertyItem rna_enum_curve_display_handle_items[] = { # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" -# include "ED_anim_api.h" -# include "ED_asset.h" -# include "ED_buttons.h" -# include "ED_clip.h" -# include "ED_fileselect.h" -# include "ED_image.h" -# include "ED_node.h" +# include "ED_anim_api.hh" +# include "ED_asset.hh" +# include "ED_buttons.hh" +# include "ED_clip.hh" +# include "ED_fileselect.hh" +# include "ED_image.hh" +# include "ED_node.hh" # include "ED_screen.hh" -# include "ED_sequencer.h" -# include "ED_transform.h" -# include "ED_view3d.h" +# include "ED_sequencer.hh" +# include "ED_transform.hh" +# include "ED_view3d.hh" # include "GPU_material.h" # include "IMB_imbuf_types.h" -# include "UI_interface.h" -# include "UI_view2d.h" +# include "UI_interface.hh" +# include "UI_view2d.hh" static StructRNA *rna_Space_refine(PointerRNA *ptr) { diff --git a/source/blender/makesrna/intern/rna_space_api.cc b/source/blender/makesrna/intern/rna_space_api.cc index 1420212f1b1..898bc62c2e2 100644 --- a/source/blender/makesrna/intern/rna_space_api.cc +++ b/source/blender/makesrna/intern/rna_space_api.cc @@ -17,9 +17,9 @@ # include "BKE_global.h" -# include "ED_fileselect.h" +# include "ED_fileselect.hh" # include "ED_screen.hh" -# include "ED_text.h" +# include "ED_text.hh" int rna_object_type_visibility_icon_get_common(int object_type_exclude_viewport, const int *object_type_exclude_select) diff --git a/source/blender/makesrna/intern/rna_text.cc b/source/blender/makesrna/intern/rna_text.cc index e0b485522b6..56259bf48e5 100644 --- a/source/blender/makesrna/intern/rna_text.cc +++ b/source/blender/makesrna/intern/rna_text.cc @@ -15,7 +15,7 @@ #include "BKE_text.h" -#include "ED_text.h" +#include "ED_text.hh" #include "RNA_define.h" diff --git a/source/blender/makesrna/intern/rna_text_api.cc b/source/blender/makesrna/intern/rna_text_api.cc index 4cce80f6954..4a3b53615ca 100644 --- a/source/blender/makesrna/intern/rna_text_api.cc +++ b/source/blender/makesrna/intern/rna_text_api.cc @@ -11,7 +11,7 @@ #include "BLI_utildefines.h" -#include "ED_text.h" +#include "ED_text.hh" #include "RNA_define.h" diff --git a/source/blender/makesrna/intern/rna_texture.cc b/source/blender/makesrna/intern/rna_texture.cc index 133ae068604..fdbd8d206e6 100644 --- a/source/blender/makesrna/intern/rna_texture.cc +++ b/source/blender/makesrna/intern/rna_texture.cc @@ -141,8 +141,8 @@ static const EnumPropertyItem blend_type_items[] = { # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" -# include "ED_node.h" -# include "ED_render.h" +# include "ED_node.hh" +# include "ED_render.hh" static StructRNA *rna_Texture_refine(PointerRNA *ptr) { diff --git a/source/blender/makesrna/intern/rna_ui.cc b/source/blender/makesrna/intern/rna_ui.cc index 91a0cf3d8cd..4fe58e98a9c 100644 --- a/source/blender/makesrna/intern/rna_ui.cc +++ b/source/blender/makesrna/intern/rna_ui.cc @@ -23,7 +23,7 @@ #include "RNA_enum_types.h" #include "rna_internal.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_toolsystem.h" #include "WM_types.hh" diff --git a/source/blender/makesrna/intern/rna_ui_api.cc b/source/blender/makesrna/intern/rna_ui_api.cc index f45ddda367c..9fd77b2bc47 100644 --- a/source/blender/makesrna/intern/rna_ui_api.cc +++ b/source/blender/makesrna/intern/rna_ui_api.cc @@ -18,9 +18,9 @@ #include "DNA_screen_types.h" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" #include "rna_internal.h" @@ -29,7 +29,7 @@ #define DEF_ICON_COLOR(name) {ICON_##name, (#name), 0, (#name), ""}, #define DEF_ICON_BLANK(name) const EnumPropertyItem rna_enum_icon_items[] = { -#include "UI_icons.h" +#include "UI_icons.hh" {0, nullptr, 0, nullptr, nullptr}, }; @@ -37,7 +37,7 @@ const EnumPropertyItem rna_enum_icon_items[] = { # include "DNA_asset_types.h" -# include "ED_geometry.h" +# include "ED_geometry.hh" const char *rna_translate_ui_text( const char *text, const char *text_ctxt, StructRNA *type, PropertyRNA *prop, bool translate) diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc index 7f88e2b226d..5707eb63366 100644 --- a/source/blender/makesrna/intern/rna_userdef.cc +++ b/source/blender/makesrna/intern/rna_userdef.cc @@ -37,7 +37,7 @@ #include "GPU_platform.h" -#include "UI_interface_icons.h" +#include "UI_interface_icons.hh" #include "rna_internal.h" @@ -185,7 +185,7 @@ static const EnumPropertyItem rna_enum_preference_gpu_backend_items[] = { # include "MEM_CacheLimiterC-Api.h" # include "MEM_guardedalloc.h" -# include "UI_interface.h" +# include "UI_interface.hh" # ifdef WITH_SDL_DYNLOAD # include "sdlew.h" diff --git a/source/blender/makesrna/intern/rna_wm.cc b/source/blender/makesrna/intern/rna_wm.cc index 859b09ce338..f4b401734b9 100644 --- a/source/blender/makesrna/intern/rna_wm.cc +++ b/source/blender/makesrna/intern/rna_wm.cc @@ -552,7 +552,7 @@ const EnumPropertyItem rna_enum_wm_report_items[] = { # include "ED_screen.hh" -# include "UI_interface.h" +# include "UI_interface.hh" # include "BKE_global.h" # include "BKE_idprop.h" diff --git a/source/blender/makesrna/intern/rna_wm_api.cc b/source/blender/makesrna/intern/rna_wm_api.cc index 56d7c7e0e0c..5e6117bbec2 100644 --- a/source/blender/makesrna/intern/rna_wm_api.cc +++ b/source/blender/makesrna/intern/rna_wm_api.cc @@ -19,7 +19,7 @@ #include "DNA_space_types.h" #include "DNA_windowmanager_types.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "wm_cursors.hh" #include "wm_event_types.hh" diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.cc b/source/blender/makesrna/intern/rna_wm_gizmo.cc index f6605bebfbc..b6f7e2ec30f 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo.cc +++ b/source/blender/makesrna/intern/rna_wm_gizmo.cc @@ -41,7 +41,7 @@ # include "ED_screen.hh" -# include "UI_interface.h" +# include "UI_interface.hh" # include "BKE_global.h" # include "BKE_idprop.h" diff --git a/source/blender/makesrna/intern/rna_wm_gizmo_api.cc b/source/blender/makesrna/intern/rna_wm_gizmo_api.cc index 98ab6a11447..4426451d919 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo_api.cc +++ b/source/blender/makesrna/intern/rna_wm_gizmo_api.cc @@ -25,9 +25,9 @@ #ifdef RNA_RUNTIME # include "BKE_context.h" -# include "UI_interface.h" +# include "UI_interface.hh" -# include "ED_gizmo_library.h" +# include "ED_gizmo_library.hh" static void rna_gizmo_draw_preset_box(wmGizmo *gz, const float matrix[16], int select_id) { diff --git a/source/blender/makesrna/intern/rna_workspace.cc b/source/blender/makesrna/intern/rna_workspace.cc index 40da95f0653..54ef16e5368 100644 --- a/source/blender/makesrna/intern/rna_workspace.cc +++ b/source/blender/makesrna/intern/rna_workspace.cc @@ -12,7 +12,7 @@ #include "BKE_workspace.h" -#include "ED_render.h" +#include "ED_render.hh" #include "RE_engine.h" @@ -33,8 +33,8 @@ # include "DNA_screen_types.h" # include "DNA_space_types.h" -# include "ED_asset.h" -# include "ED_paint.h" +# include "ED_asset.hh" +# include "ED_paint.hh" # include "RNA_access.h" diff --git a/source/blender/makesrna/intern/rna_world.cc b/source/blender/makesrna/intern/rna_world.cc index cdaabbcc1c8..b60f7c8d43e 100644 --- a/source/blender/makesrna/intern/rna_world.cc +++ b/source/blender/makesrna/intern/rna_world.cc @@ -32,7 +32,7 @@ # include "DEG_depsgraph.h" # include "DEG_depsgraph_build.h" -# include "ED_node.h" +# include "ED_node.hh" # include "WM_api.hh" diff --git a/source/blender/modifiers/intern/MOD_armature.cc b/source/blender/modifiers/intern/MOD_armature.cc index b0ff25ebe52..3c5461e351c 100644 --- a/source/blender/modifiers/intern/MOD_armature.cc +++ b/source/blender/modifiers/intern/MOD_armature.cc @@ -31,8 +31,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_array.cc b/source/blender/modifiers/intern/MOD_array.cc index d1e96ac0e78..f60429d62c8 100644 --- a/source/blender/modifiers/intern/MOD_array.cc +++ b/source/blender/modifiers/intern/MOD_array.cc @@ -37,8 +37,8 @@ #include "BKE_object_deform.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_bevel.cc b/source/blender/modifiers/intern/MOD_bevel.cc index 03ad0e387ec..013e3e821d5 100644 --- a/source/blender/modifiers/intern/MOD_bevel.cc +++ b/source/blender/modifiers/intern/MOD_bevel.cc @@ -29,8 +29,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc index 944393c767b..cf71ad17a1f 100644 --- a/source/blender/modifiers/intern/MOD_boolean.cc +++ b/source/blender/modifiers/intern/MOD_boolean.cc @@ -38,8 +38,8 @@ #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_build.cc b/source/blender/modifiers/intern/MOD_build.cc index 2600a6ce608..fa892e53457 100644 --- a/source/blender/modifiers/intern/MOD_build.cc +++ b/source/blender/modifiers/intern/MOD_build.cc @@ -31,8 +31,8 @@ #include "BKE_scene.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_cast.cc b/source/blender/modifiers/intern/MOD_cast.cc index 3c121426fb2..242a47320e3 100644 --- a/source/blender/modifiers/intern/MOD_cast.cc +++ b/source/blender/modifiers/intern/MOD_cast.cc @@ -29,8 +29,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_cloth.cc b/source/blender/modifiers/intern/MOD_cloth.cc index 7a95470f9f8..8f7c5839dc1 100644 --- a/source/blender/modifiers/intern/MOD_cloth.cc +++ b/source/blender/modifiers/intern/MOD_cloth.cc @@ -37,8 +37,8 @@ #include "BKE_pointcache.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_collision.cc b/source/blender/modifiers/intern/MOD_collision.cc index df9dae522de..73d58489910 100644 --- a/source/blender/modifiers/intern/MOD_collision.cc +++ b/source/blender/modifiers/intern/MOD_collision.cc @@ -33,8 +33,8 @@ #include "BKE_scene.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.cc b/source/blender/modifiers/intern/MOD_correctivesmooth.cc index 96e57449fce..a8e807aabdc 100644 --- a/source/blender/modifiers/intern/MOD_correctivesmooth.cc +++ b/source/blender/modifiers/intern/MOD_correctivesmooth.cc @@ -31,8 +31,8 @@ #include "BKE_mesh_wrapper.hh" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_curve.cc b/source/blender/modifiers/intern/MOD_curve.cc index 5bd7dee387b..204c20497a2 100644 --- a/source/blender/modifiers/intern/MOD_curve.cc +++ b/source/blender/modifiers/intern/MOD_curve.cc @@ -29,8 +29,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_datatransfer.cc b/source/blender/modifiers/intern/MOD_datatransfer.cc index 032d3e8cb2c..f82007c5a55 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.cc +++ b/source/blender/modifiers/intern/MOD_datatransfer.cc @@ -30,8 +30,8 @@ #include "BKE_report.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_decimate.cc b/source/blender/modifiers/intern/MOD_decimate.cc index 4a7661cf47c..e86d570e8b7 100644 --- a/source/blender/modifiers/intern/MOD_decimate.cc +++ b/source/blender/modifiers/intern/MOD_decimate.cc @@ -25,8 +25,8 @@ #include "BKE_mesh.hh" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_displace.cc b/source/blender/modifiers/intern/MOD_displace.cc index 9d0f24b8cc6..2be25b00339 100644 --- a/source/blender/modifiers/intern/MOD_displace.cc +++ b/source/blender/modifiers/intern/MOD_displace.cc @@ -33,8 +33,8 @@ #include "BKE_screen.h" #include "BKE_texture.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.cc b/source/blender/modifiers/intern/MOD_dynamicpaint.cc index 91cf87b8d4d..7dbe4291808 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.cc +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.cc @@ -30,8 +30,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_edgesplit.cc b/source/blender/modifiers/intern/MOD_edgesplit.cc index e0ff2a1a724..88a111a55ba 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.cc +++ b/source/blender/modifiers/intern/MOD_edgesplit.cc @@ -27,8 +27,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_explode.cc b/source/blender/modifiers/intern/MOD_explode.cc index 6fe7d4a436f..db9ee02bb13 100644 --- a/source/blender/modifiers/intern/MOD_explode.cc +++ b/source/blender/modifiers/intern/MOD_explode.cc @@ -35,8 +35,8 @@ #include "BKE_scene.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLO_read_write.h" diff --git a/source/blender/modifiers/intern/MOD_fluid.cc b/source/blender/modifiers/intern/MOD_fluid.cc index 4c6ad1f5568..17d392a574b 100644 --- a/source/blender/modifiers/intern/MOD_fluid.cc +++ b/source/blender/modifiers/intern/MOD_fluid.cc @@ -30,8 +30,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_hook.cc b/source/blender/modifiers/intern/MOD_hook.cc index fa63977657c..f6526833163 100644 --- a/source/blender/modifiers/intern/MOD_hook.cc +++ b/source/blender/modifiers/intern/MOD_hook.cc @@ -31,8 +31,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLO_read_write.h" diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.cc b/source/blender/modifiers/intern/MOD_laplaciandeform.cc index 5a85f7a8061..65f9325c67c 100644 --- a/source/blender/modifiers/intern/MOD_laplaciandeform.cc +++ b/source/blender/modifiers/intern/MOD_laplaciandeform.cc @@ -32,8 +32,8 @@ #include "BKE_particle.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLO_read_write.h" diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.cc b/source/blender/modifiers/intern/MOD_laplaciansmooth.cc index 53688cec949..ac2ae9210e7 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.cc +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.cc @@ -29,8 +29,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_lattice.cc b/source/blender/modifiers/intern/MOD_lattice.cc index 22e506c0af0..de8a18fecd9 100644 --- a/source/blender/modifiers/intern/MOD_lattice.cc +++ b/source/blender/modifiers/intern/MOD_lattice.cc @@ -26,8 +26,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc index 6e4506c281d..6dafb582002 100644 --- a/source/blender/modifiers/intern/MOD_mask.cc +++ b/source/blender/modifiers/intern/MOD_mask.cc @@ -34,8 +34,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc index 850b6f52edc..ca4601a5250 100644 --- a/source/blender/modifiers/intern/MOD_mesh_to_volume.cc +++ b/source/blender/modifiers/intern/MOD_mesh_to_volume.cc @@ -29,8 +29,8 @@ #include "GEO_mesh_to_volume.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLO_read_write.h" diff --git a/source/blender/modifiers/intern/MOD_meshcache.cc b/source/blender/modifiers/intern/MOD_meshcache.cc index 212c78006ea..5273914a8ea 100644 --- a/source/blender/modifiers/intern/MOD_meshcache.cc +++ b/source/blender/modifiers/intern/MOD_meshcache.cc @@ -32,8 +32,8 @@ #include "BKE_scene.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_meshdeform.cc b/source/blender/modifiers/intern/MOD_meshdeform.cc index fc98cbea154..179dc942fb0 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.cc +++ b/source/blender/modifiers/intern/MOD_meshdeform.cc @@ -32,8 +32,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLO_read_write.h" diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.cc b/source/blender/modifiers/intern/MOD_meshsequencecache.cc index 1477630a53a..493347c4a9e 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.cc +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.cc @@ -33,8 +33,8 @@ #include "BKE_scene.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_mirror.cc b/source/blender/modifiers/intern/MOD_mirror.cc index 9ad897ab575..9f58ca4965f 100644 --- a/source/blender/modifiers/intern/MOD_mirror.cc +++ b/source/blender/modifiers/intern/MOD_mirror.cc @@ -23,8 +23,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_multires.cc b/source/blender/modifiers/intern/MOD_multires.cc index 2667281db17..54b17ed65a8 100644 --- a/source/blender/modifiers/intern/MOD_multires.cc +++ b/source/blender/modifiers/intern/MOD_multires.cc @@ -33,8 +33,8 @@ #include "BKE_subdiv_mesh.hh" #include "BKE_subsurf.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index 76425fb3f66..1893c746c8c 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -61,9 +61,8 @@ #include "BLO_read_write.h" -#include "UI_interface.h" #include "UI_interface.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "BLT_translation.h" @@ -80,10 +79,10 @@ #include "MOD_nodes.hh" #include "MOD_ui_common.hh" -#include "ED_object.h" +#include "ED_object.hh" #include "ED_screen.hh" -#include "ED_spreadsheet.h" -#include "ED_undo.h" +#include "ED_spreadsheet.hh" +#include "ED_undo.hh" #include "ED_viewer_path.hh" #include "NOD_geometry.hh" diff --git a/source/blender/modifiers/intern/MOD_none.cc b/source/blender/modifiers/intern/MOD_none.cc index f93d8f96181..b374f88a148 100644 --- a/source/blender/modifiers/intern/MOD_none.cc +++ b/source/blender/modifiers/intern/MOD_none.cc @@ -10,7 +10,7 @@ #include "MOD_modifiertypes.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_normal_edit.cc b/source/blender/modifiers/intern/MOD_normal_edit.cc index 6520cac74cb..0939786d300 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.cc +++ b/source/blender/modifiers/intern/MOD_normal_edit.cc @@ -31,8 +31,8 @@ #include "BKE_mesh.hh" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_ocean.cc b/source/blender/modifiers/intern/MOD_ocean.cc index eb69606eb80..36d7e2594e7 100644 --- a/source/blender/modifiers/intern/MOD_ocean.cc +++ b/source/blender/modifiers/intern/MOD_ocean.cc @@ -30,8 +30,8 @@ #include "BKE_ocean.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_particleinstance.cc b/source/blender/modifiers/intern/MOD_particleinstance.cc index 3d200ad725c..890d5a992ab 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.cc +++ b/source/blender/modifiers/intern/MOD_particleinstance.cc @@ -32,8 +32,8 @@ #include "BKE_pointcache.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_particlesystem.cc b/source/blender/modifiers/intern/MOD_particlesystem.cc index a52c28432b0..e3dea1646ec 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.cc +++ b/source/blender/modifiers/intern/MOD_particlesystem.cc @@ -27,8 +27,8 @@ #include "BKE_particle.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_remesh.cc b/source/blender/modifiers/intern/MOD_remesh.cc index e52e08f2dc6..c7bee80e54b 100644 --- a/source/blender/modifiers/intern/MOD_remesh.cc +++ b/source/blender/modifiers/intern/MOD_remesh.cc @@ -27,8 +27,8 @@ #include "BKE_mesh_runtime.hh" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_screw.cc b/source/blender/modifiers/intern/MOD_screw.cc index 5a70d290595..6e3e6ab4af7 100644 --- a/source/blender/modifiers/intern/MOD_screw.cc +++ b/source/blender/modifiers/intern/MOD_screw.cc @@ -30,8 +30,8 @@ #include "BKE_mesh.hh" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_shapekey.cc b/source/blender/modifiers/intern/MOD_shapekey.cc index 7a8fea4578c..fbaca969e45 100644 --- a/source/blender/modifiers/intern/MOD_shapekey.cc +++ b/source/blender/modifiers/intern/MOD_shapekey.cc @@ -24,7 +24,7 @@ #include "MOD_modifiertypes.hh" -#include "UI_resources.h" +#include "UI_resources.hh" static void deform_verts(ModifierData * /*md*/, const ModifierEvalContext *ctx, diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.cc b/source/blender/modifiers/intern/MOD_shrinkwrap.cc index 51a20eac397..2e0bfa67580 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.cc +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.cc @@ -27,8 +27,8 @@ #include "BKE_screen.h" #include "BKE_shrinkwrap.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_simpledeform.cc b/source/blender/modifiers/intern/MOD_simpledeform.cc index fba10b3fb17..6acd810418a 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.cc +++ b/source/blender/modifiers/intern/MOD_simpledeform.cc @@ -27,8 +27,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_skin.cc b/source/blender/modifiers/intern/MOD_skin.cc index 4999dfa8750..73ef2db186c 100644 --- a/source/blender/modifiers/intern/MOD_skin.cc +++ b/source/blender/modifiers/intern/MOD_skin.cc @@ -67,8 +67,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_smooth.cc b/source/blender/modifiers/intern/MOD_smooth.cc index e4d762c88f6..c45cbb11322 100644 --- a/source/blender/modifiers/intern/MOD_smooth.cc +++ b/source/blender/modifiers/intern/MOD_smooth.cc @@ -29,8 +29,8 @@ #include "BKE_particle.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_softbody.cc b/source/blender/modifiers/intern/MOD_softbody.cc index fd997fe8f40..fc91884c5f1 100644 --- a/source/blender/modifiers/intern/MOD_softbody.cc +++ b/source/blender/modifiers/intern/MOD_softbody.cc @@ -23,8 +23,8 @@ #include "BKE_screen.h" #include "BKE_softbody.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_solidify.cc b/source/blender/modifiers/intern/MOD_solidify.cc index b0115a6312d..11549c0a525 100644 --- a/source/blender/modifiers/intern/MOD_solidify.cc +++ b/source/blender/modifiers/intern/MOD_solidify.cc @@ -21,8 +21,8 @@ #include "BKE_particle.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_subsurf.cc b/source/blender/modifiers/intern/MOD_subsurf.cc index afd0e40ba69..dda57d0406d 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.cc +++ b/source/blender/modifiers/intern/MOD_subsurf.cc @@ -35,8 +35,8 @@ #include "BKE_subdiv_modifier.hh" #include "BKE_subsurf.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RE_engine.h" diff --git a/source/blender/modifiers/intern/MOD_surface.cc b/source/blender/modifiers/intern/MOD_surface.cc index 8b230fa796a..2118eb500eb 100644 --- a/source/blender/modifiers/intern/MOD_surface.cc +++ b/source/blender/modifiers/intern/MOD_surface.cc @@ -25,8 +25,8 @@ #include "BKE_mesh.hh" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.cc b/source/blender/modifiers/intern/MOD_surfacedeform.cc index db39f102894..00f392d668b 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.cc +++ b/source/blender/modifiers/intern/MOD_surfacedeform.cc @@ -31,8 +31,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLO_read_write.h" diff --git a/source/blender/modifiers/intern/MOD_triangulate.cc b/source/blender/modifiers/intern/MOD_triangulate.cc index 898a4f78cfc..48e260ebe59 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.cc +++ b/source/blender/modifiers/intern/MOD_triangulate.cc @@ -25,8 +25,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_ui_common.cc b/source/blender/modifiers/intern/MOD_ui_common.cc index 9719968c946..6f2b70e5fa6 100644 --- a/source/blender/modifiers/intern/MOD_ui_common.cc +++ b/source/blender/modifiers/intern/MOD_ui_common.cc @@ -22,12 +22,12 @@ #include "DNA_scene_types.h" #include "DNA_screen_types.h" -#include "ED_object.h" +#include "ED_object.hh" #include "BLT_translation.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_uvproject.cc b/source/blender/modifiers/intern/MOD_uvproject.cc index f41a30c5207..08b86e2df33 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.cc +++ b/source/blender/modifiers/intern/MOD_uvproject.cc @@ -30,8 +30,8 @@ #include "BKE_mesh.hh" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_uvwarp.cc b/source/blender/modifiers/intern/MOD_uvwarp.cc index a5a22cbd0bb..77d418e91be 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.cc +++ b/source/blender/modifiers/intern/MOD_uvwarp.cc @@ -29,8 +29,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_volume_displace.cc b/source/blender/modifiers/intern/MOD_volume_displace.cc index 54d51a1554b..4f3c0640183 100644 --- a/source/blender/modifiers/intern/MOD_volume_displace.cc +++ b/source/blender/modifiers/intern/MOD_volume_displace.cc @@ -27,8 +27,8 @@ #include "DEG_depsgraph_build.h" #include "DEG_depsgraph_query.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLO_read_write.h" diff --git a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc index 09f03d4051f..2ab10a43e4c 100644 --- a/source/blender/modifiers/intern/MOD_volume_to_mesh.cc +++ b/source/blender/modifiers/intern/MOD_volume_to_mesh.cc @@ -27,8 +27,8 @@ #include "DNA_screen_types.h" #include "DNA_volume_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_warp.cc b/source/blender/modifiers/intern/MOD_warp.cc index 10fb2fca484..f6adc72ab31 100644 --- a/source/blender/modifiers/intern/MOD_warp.cc +++ b/source/blender/modifiers/intern/MOD_warp.cc @@ -35,8 +35,8 @@ #include "BKE_screen.h" #include "BKE_texture.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLO_read_write.h" diff --git a/source/blender/modifiers/intern/MOD_wave.cc b/source/blender/modifiers/intern/MOD_wave.cc index b5ad50d032d..cddc1d61bf9 100644 --- a/source/blender/modifiers/intern/MOD_wave.cc +++ b/source/blender/modifiers/intern/MOD_wave.cc @@ -31,8 +31,8 @@ #include "BKE_screen.h" #include "BKE_texture.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.cc b/source/blender/modifiers/intern/MOD_weighted_normal.cc index 70819c60065..670e7ee2d75 100644 --- a/source/blender/modifiers/intern/MOD_weighted_normal.cc +++ b/source/blender/modifiers/intern/MOD_weighted_normal.cc @@ -29,8 +29,8 @@ #include "BKE_mesh_mapping.hh" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_weightvg_util.cc b/source/blender/modifiers/intern/MOD_weightvg_util.cc index ac900c85968..6d05c06f22f 100644 --- a/source/blender/modifiers/intern/MOD_weightvg_util.cc +++ b/source/blender/modifiers/intern/MOD_weightvg_util.cc @@ -29,8 +29,8 @@ #include "BKE_scene.h" #include "BKE_texture.h" /* Texture masking. */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.cc b/source/blender/modifiers/intern/MOD_weightvgedit.cc index 59edeaab1ab..9089b3c0711 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.cc +++ b/source/blender/modifiers/intern/MOD_weightvgedit.cc @@ -33,8 +33,8 @@ #include "BKE_screen.h" #include "BKE_texture.h" /* Texture masking. */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLO_read_write.h" diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.cc b/source/blender/modifiers/intern/MOD_weightvgmix.cc index a8af9c730eb..f5964ccfcd7 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.cc +++ b/source/blender/modifiers/intern/MOD_weightvgmix.cc @@ -29,8 +29,8 @@ #include "BKE_screen.h" #include "BKE_texture.h" /* Texture masking. */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.cc b/source/blender/modifiers/intern/MOD_weightvgproximity.cc index 96bd066eb58..2175df980f2 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.cc +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.cc @@ -38,8 +38,8 @@ #include "BKE_screen.h" #include "BKE_texture.h" /* Texture masking. */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLO_read_write.h" diff --git a/source/blender/modifiers/intern/MOD_weld.cc b/source/blender/modifiers/intern/MOD_weld.cc index 69500648b5f..9c6a39c42f1 100644 --- a/source/blender/modifiers/intern/MOD_weld.cc +++ b/source/blender/modifiers/intern/MOD_weld.cc @@ -34,8 +34,8 @@ #include "BKE_modifier.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/modifiers/intern/MOD_wireframe.cc b/source/blender/modifiers/intern/MOD_wireframe.cc index e79e190736a..90239c690d3 100644 --- a/source/blender/modifiers/intern/MOD_wireframe.cc +++ b/source/blender/modifiers/intern/MOD_wireframe.cc @@ -22,8 +22,8 @@ #include "BKE_mesh.hh" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/nodes/composite/node_composite_tree.cc b/source/blender/nodes/composite/node_composite_tree.cc index bab90d4f8e7..f2512e1b019 100644 --- a/source/blender/nodes/composite/node_composite_tree.cc +++ b/source/blender/nodes/composite/node_composite_tree.cc @@ -21,7 +21,7 @@ #include "BKE_node_tree_update.h" #include "BKE_tracking.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "node_common.h" #include "node_util.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc index fd533b8967d..1c9bd8c21a1 100644 --- a/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc +++ b/source/blender/nodes/composite/nodes/node_composite_alpha_over.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc index 2785dd53ed3..28e34d73ac8 100644 --- a/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc +++ b/source/blender/nodes/composite/nodes/node_composite_antialiasing.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_algorithm_smaa.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc index 0b0d78c7b3e..02ab6e96c58 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bilateralblur.cc @@ -8,8 +8,8 @@ #include "BLI_math_base.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_blur.cc b/source/blender/nodes/composite/nodes/node_composite_blur.cc index 0f2f0acc59a..10311f3d984 100644 --- a/source/blender/nodes/composite/nodes/node_composite_blur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_blur.cc @@ -13,8 +13,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" #include "GPU_state.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc index 94217a88ed5..c955b6115ff 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehblur.cc @@ -9,8 +9,8 @@ #include "BLI_math_base.hh" #include "BLI_math_vector_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_texture.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc index b1b98767113..08163352084 100644 --- a/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc +++ b/source/blender/nodes/composite/nodes/node_composite_bokehimage.cc @@ -9,8 +9,8 @@ #include "BLI_math_base.h" #include "BLI_math_vector_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc index 88fb772c67e..0a13fde8f46 100644 --- a/source/blender/nodes/composite/nodes/node_composite_boxmask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_boxmask.cc @@ -10,8 +10,8 @@ #include "BLI_math_vector_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_brightness.cc b/source/blender/nodes/composite/nodes/node_composite_brightness.cc index 04150934dd9..9a86b8f06fb 100644 --- a/source/blender/nodes/composite/nodes/node_composite_brightness.cc +++ b/source/blender/nodes/composite/nodes/node_composite_brightness.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc index e6e143192f1..45f16053049 100644 --- a/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_channel_matte.cc @@ -8,8 +8,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc index e9bef79e1a8..5c8f9c98837 100644 --- a/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_chroma_matte.cc @@ -10,8 +10,8 @@ #include "BLI_math_rotation.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc index eeca40ad351..4030757db4f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_color_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_color_matte.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc index 8b93ac62eea..43c0212c82f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_color_spill.cc +++ b/source/blender/nodes/composite/nodes/node_composite_color_spill.cc @@ -8,8 +8,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc index 25117580a89..424aa37e2a5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc +++ b/source/blender/nodes/composite/nodes/node_composite_colorbalance.cc @@ -8,8 +8,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc index 61c492c8b5f..357aa1dca23 100644 --- a/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc +++ b/source/blender/nodes/composite/nodes/node_composite_colorcorrection.cc @@ -8,8 +8,8 @@ #include "IMB_colormanagement.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_composite.cc b/source/blender/nodes/composite/nodes/node_composite_composite.cc index ea735bf93b8..a68e24e1ea5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_composite.cc +++ b/source/blender/nodes/composite/nodes/node_composite_composite.cc @@ -8,8 +8,8 @@ #include "BLI_math_vector_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" #include "GPU_state.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc b/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc index 985c3f1fff2..d576478a816 100644 --- a/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc +++ b/source/blender/nodes/composite/nodes/node_composite_convert_color_space.cc @@ -8,8 +8,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "IMB_colormanagement.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_crop.cc b/source/blender/nodes/composite/nodes/node_composite_crop.cc index b569001457c..9d0f7400d8e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_crop.cc +++ b/source/blender/nodes/composite/nodes/node_composite_crop.cc @@ -13,8 +13,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" #include "GPU_texture.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_curves.cc b/source/blender/nodes/composite/nodes/node_composite_curves.cc index b61a680e239..4bb0cc3056d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_curves.cc +++ b/source/blender/nodes/composite/nodes/node_composite_curves.cc @@ -10,8 +10,8 @@ #include "BKE_colortools.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_defocus.cc b/source/blender/nodes/composite/nodes/node_composite_defocus.cc index ef04c540248..0c94c2fe8f3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_defocus.cc +++ b/source/blender/nodes/composite/nodes/node_composite_defocus.cc @@ -10,8 +10,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_denoise.cc b/source/blender/nodes/composite/nodes/node_composite_denoise.cc index 98df7836767..dd2793ae940 100644 --- a/source/blender/nodes/composite/nodes/node_composite_denoise.cc +++ b/source/blender/nodes/composite/nodes/node_composite_denoise.cc @@ -10,8 +10,8 @@ #include "MEM_guardedalloc.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_state.h" #include "GPU_texture.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_despeckle.cc b/source/blender/nodes/composite/nodes/node_composite_despeckle.cc index 58bad8e34ff..96a70b46a24 100644 --- a/source/blender/nodes/composite/nodes/node_composite_despeckle.cc +++ b/source/blender/nodes/composite/nodes/node_composite_despeckle.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc index cd5b65bb41f..edf1abafa3e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_diff_matte.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_dilate.cc b/source/blender/nodes/composite/nodes/node_composite_dilate.cc index 3a9c2a7a1c1..86039e12bb3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_dilate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_dilate.cc @@ -12,8 +12,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" #include "GPU_state.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc b/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc index 1c337c4d95b..2fca4093bc5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_directionalblur.cc @@ -9,8 +9,8 @@ #include "BLI_math_base.hh" #include "BLI_math_matrix.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc index e5965e6d4de..9059800605e 100644 --- a/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_distance_matte.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc b/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc index b2d07e9791d..26e72eeff4a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_double_edge_mask.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc index 2ccf8176f65..b4a8dfb8798 100644 --- a/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_ellipsemask.cc @@ -10,8 +10,8 @@ #include "BLI_math_vector_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_filter.cc b/source/blender/nodes/composite/nodes/node_composite_filter.cc index 8c91d683f89..b6deec974b7 100644 --- a/source/blender/nodes/composite/nodes/node_composite_filter.cc +++ b/source/blender/nodes/composite/nodes/node_composite_filter.cc @@ -8,8 +8,8 @@ #include "BLI_math_matrix_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_flip.cc b/source/blender/nodes/composite/nodes/node_composite_flip.cc index b06ab189fb4..f72252556d0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_flip.cc +++ b/source/blender/nodes/composite/nodes/node_composite_flip.cc @@ -9,8 +9,8 @@ #include "BLI_assert.h" #include "BLI_utildefines.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" #include "GPU_texture.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_glare.cc b/source/blender/nodes/composite/nodes/node_composite_glare.cc index 32158c1585a..314651f95b3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_glare.cc +++ b/source/blender/nodes/composite/nodes/node_composite_glare.cc @@ -19,8 +19,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "IMB_colormanagement.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_id_mask.cc b/source/blender/nodes/composite/nodes/node_composite_id_mask.cc index 07cd4bb9cec..2c24d61e2b5 100644 --- a/source/blender/nodes/composite/nodes/node_composite_id_mask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_id_mask.cc @@ -8,8 +8,8 @@ #include -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_image.cc b/source/blender/nodes/composite/nodes/node_composite_image.cc index 0862d785bc7..f5ff37be0a2 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.cc +++ b/source/blender/nodes/composite/nodes/node_composite_image.cc @@ -30,8 +30,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" #include "GPU_texture.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_inpaint.cc b/source/blender/nodes/composite/nodes/node_composite_inpaint.cc index 0c06d063e12..ffd0ee8811a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_inpaint.cc +++ b/source/blender/nodes/composite/nodes/node_composite_inpaint.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_invert.cc b/source/blender/nodes/composite/nodes/node_composite_invert.cc index 8317deee3b0..c25918329f3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_invert.cc +++ b/source/blender/nodes/composite/nodes/node_composite_invert.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_keying.cc b/source/blender/nodes/composite/nodes/node_composite_keying.cc index e40d0b9bd25..3de23f10887 100644 --- a/source/blender/nodes/composite/nodes/node_composite_keying.cc +++ b/source/blender/nodes/composite/nodes/node_composite_keying.cc @@ -12,8 +12,8 @@ #include "DNA_movieclip_types.h" #include "DNA_scene_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" #include "GPU_texture.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc index 51b24749fe7..26d59d42930 100644 --- a/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc +++ b/source/blender/nodes/composite/nodes/node_composite_keyingscreen.cc @@ -19,8 +19,8 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc b/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc index 312f5531539..8fb858c1586 100644 --- a/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc +++ b/source/blender/nodes/composite/nodes/node_composite_kuwahara.cc @@ -8,8 +8,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_lensdist.cc b/source/blender/nodes/composite/nodes/node_composite_lensdist.cc index 349b334559f..271069be88b 100644 --- a/source/blender/nodes/composite/nodes/node_composite_lensdist.cc +++ b/source/blender/nodes/composite/nodes/node_composite_lensdist.cc @@ -11,8 +11,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" #include "GPU_texture.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_levels.cc b/source/blender/nodes/composite/nodes/node_composite_levels.cc index af05bdc12d0..41b431e17f0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_levels.cc +++ b/source/blender/nodes/composite/nodes/node_composite_levels.cc @@ -12,8 +12,8 @@ #include "BLI_math_vector.hh" #include "BLI_math_vector_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "IMB_colormanagement.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc b/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc index 5ee38b36b82..22a80e758c7 100644 --- a/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_luma_matte.cc @@ -8,8 +8,8 @@ #include "IMB_colormanagement.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_map_range.cc b/source/blender/nodes/composite/nodes/node_composite_map_range.cc index e53d8e5a761..f9d208b99bc 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_range.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_range.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_map_uv.cc b/source/blender/nodes/composite/nodes/node_composite_map_uv.cc index ed5f5272aa4..c02bdda753d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_uv.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_uv.cc @@ -9,8 +9,8 @@ #include "GPU_shader.h" #include "GPU_texture.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" #include "COM_utilities.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_map_value.cc b/source/blender/nodes/composite/nodes/node_composite_map_value.cc index 2534d6fc355..bdb0116c02d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_map_value.cc +++ b/source/blender/nodes/composite/nodes/node_composite_map_value.cc @@ -10,8 +10,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_mask.cc b/source/blender/nodes/composite/nodes/node_composite_mask.cc index 2997b5e30c5..3bbd720caee 100644 --- a/source/blender/nodes/composite/nodes/node_composite_mask.cc +++ b/source/blender/nodes/composite/nodes/node_composite_mask.cc @@ -10,8 +10,8 @@ #include "DNA_mask_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_cached_mask.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc index 268d3b1afa1..1623c41ed21 100644 --- a/source/blender/nodes/composite/nodes/node_composite_movieclip.cc +++ b/source/blender/nodes/composite/nodes/node_composite_movieclip.cc @@ -17,8 +17,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" #include "GPU_texture.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc index 99c6b4c7d43..54955ad2f58 100644 --- a/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc +++ b/source/blender/nodes/composite/nodes/node_composite_moviedistortion.cc @@ -14,8 +14,8 @@ #include "BKE_lib_id.h" #include "BKE_tracking.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" #include "GPU_texture.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_output_file.cc b/source/blender/nodes/composite/nodes/node_composite_output_file.cc index 8e2738844b3..e878f319682 100644 --- a/source/blender/nodes/composite/nodes/node_composite_output_file.cc +++ b/source/blender/nodes/composite/nodes/node_composite_output_file.cc @@ -18,8 +18,8 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "WM_api.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc index 3f4871d100e..f59f81b7ed8 100644 --- a/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc +++ b/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.cc @@ -22,8 +22,8 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" #include "GPU_texture.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_premulkey.cc b/source/blender/nodes/composite/nodes/node_composite_premulkey.cc index 5aa23b7abfc..2958532ac62 100644 --- a/source/blender/nodes/composite/nodes/node_composite_premulkey.cc +++ b/source/blender/nodes/composite/nodes/node_composite_premulkey.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_rotate.cc b/source/blender/nodes/composite/nodes/node_composite_rotate.cc index fa8b6e42a66..242157ccd40 100644 --- a/source/blender/nodes/composite/nodes/node_composite_rotate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_rotate.cc @@ -9,8 +9,8 @@ #include "BLI_assert.h" #include "BLI_math_matrix.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_scale.cc b/source/blender/nodes/composite/nodes/node_composite_scale.cc index 1b62d96c29a..cab017ea35d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_scale.cc +++ b/source/blender/nodes/composite/nodes/node_composite_scale.cc @@ -13,8 +13,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc index 2d453d2720f..405178b4b8d 100644 --- a/source/blender/nodes/composite/nodes/node_composite_setalpha.cc +++ b/source/blender/nodes/composite/nodes/node_composite_setalpha.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_material.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc b/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc index 7b492f474fd..b0358ea0ee2 100644 --- a/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc +++ b/source/blender/nodes/composite/nodes/node_composite_split_viewer.cc @@ -9,8 +9,8 @@ #include "BKE_global.h" #include "BKE_image.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" #include "GPU_texture.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc index 8b319c82b82..86b516dfcf0 100644 --- a/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc +++ b/source/blender/nodes/composite/nodes/node_composite_stabilize2d.cc @@ -12,8 +12,8 @@ #include "BLI_math_matrix_types.hh" #include "BLI_math_vector_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "DNA_movieclip_types.h" #include "DNA_node_types.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc b/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc index 287a41c0363..536e1ccd868 100644 --- a/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc +++ b/source/blender/nodes/composite/nodes/node_composite_sunbeams.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_switch.cc b/source/blender/nodes/composite/nodes/node_composite_switch.cc index 101577269e1..1d3efb49de3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_switch.cc +++ b/source/blender/nodes/composite/nodes/node_composite_switch.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_switchview.cc b/source/blender/nodes/composite/nodes/node_composite_switchview.cc index 67d6d1ca111..4f9427ae444 100644 --- a/source/blender/nodes/composite/nodes/node_composite_switchview.cc +++ b/source/blender/nodes/composite/nodes/node_composite_switchview.cc @@ -9,8 +9,8 @@ #include "BKE_context.h" #include "BKE_lib_id.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_tonemap.cc b/source/blender/nodes/composite/nodes/node_composite_tonemap.cc index 9befe4cab9f..b80dd4e041c 100644 --- a/source/blender/nodes/composite/nodes/node_composite_tonemap.cc +++ b/source/blender/nodes/composite/nodes/node_composite_tonemap.cc @@ -15,8 +15,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "IMB_colormanagement.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_trackpos.cc b/source/blender/nodes/composite/nodes/node_composite_trackpos.cc index 6efc18d1d8f..6d48517602f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_trackpos.cc +++ b/source/blender/nodes/composite/nodes/node_composite_trackpos.cc @@ -21,8 +21,8 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_transform.cc b/source/blender/nodes/composite/nodes/node_composite_transform.cc index b3818ca4ea0..ed3bddce1f4 100644 --- a/source/blender/nodes/composite/nodes/node_composite_transform.cc +++ b/source/blender/nodes/composite/nodes/node_composite_transform.cc @@ -10,8 +10,8 @@ #include "BLI_math_matrix.hh" #include "BLI_math_vector.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_translate.cc b/source/blender/nodes/composite/nodes/node_composite_translate.cc index c5d7206ee3f..f0cf437e26a 100644 --- a/source/blender/nodes/composite/nodes/node_composite_translate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_translate.cc @@ -8,8 +8,8 @@ #include "BLI_math_matrix.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc b/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc index f12c5c81f37..827c970ffb8 100644 --- a/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc +++ b/source/blender/nodes/composite/nodes/node_composite_vec_blur.cc @@ -6,8 +6,8 @@ * \ingroup cmpnodes */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.cc b/source/blender/nodes/composite/nodes/node_composite_viewer.cc index a5b20246173..823388b77cc 100644 --- a/source/blender/nodes/composite/nodes/node_composite_viewer.cc +++ b/source/blender/nodes/composite/nodes/node_composite_viewer.cc @@ -13,8 +13,8 @@ #include "RNA_access.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_shader.h" #include "GPU_state.h" diff --git a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc index 8d0632c9505..66776ab4d96 100644 --- a/source/blender/nodes/composite/nodes/node_composite_zcombine.cc +++ b/source/blender/nodes/composite/nodes/node_composite_zcombine.cc @@ -10,8 +10,8 @@ #include "BLI_math_vector.hh" #include "BLI_math_vector_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "COM_algorithm_smaa.hh" #include "COM_node_operation.hh" diff --git a/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc b/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc index 6e533eec0e2..9d884c4d694 100644 --- a/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc +++ b/source/blender/nodes/function/nodes/node_fn_align_euler_to_vector.cc @@ -6,8 +6,8 @@ #include "RNA_enum_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_function_util.hh" diff --git a/source/blender/nodes/function/nodes/node_fn_boolean_math.cc b/source/blender/nodes/function/nodes/node_fn_boolean_math.cc index 49256ba8ea6..3088ab6d83a 100644 --- a/source/blender/nodes/function/nodes/node_fn_boolean_math.cc +++ b/source/blender/nodes/function/nodes/node_fn_boolean_math.cc @@ -8,8 +8,8 @@ #include "RNA_enum_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_socket_search_link.hh" diff --git a/source/blender/nodes/function/nodes/node_fn_combine_color.cc b/source/blender/nodes/function/nodes/node_fn_combine_color.cc index 63b13b9f4f6..b8543a36472 100644 --- a/source/blender/nodes/function/nodes/node_fn_combine_color.cc +++ b/source/blender/nodes/function/nodes/node_fn_combine_color.cc @@ -4,8 +4,8 @@ #include "node_function_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_fn_combine_color_cc { diff --git a/source/blender/nodes/function/nodes/node_fn_compare.cc b/source/blender/nodes/function/nodes/node_fn_compare.cc index 9a1e61b65b4..54e33d6222b 100644 --- a/source/blender/nodes/function/nodes/node_fn_compare.cc +++ b/source/blender/nodes/function/nodes/node_fn_compare.cc @@ -11,8 +11,8 @@ #include "BLT_translation.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_enum_types.h" diff --git a/source/blender/nodes/function/nodes/node_fn_float_to_int.cc b/source/blender/nodes/function/nodes/node_fn_float_to_int.cc index 4fb3d32da67..7c528628e20 100644 --- a/source/blender/nodes/function/nodes/node_fn_float_to_int.cc +++ b/source/blender/nodes/function/nodes/node_fn_float_to_int.cc @@ -10,8 +10,8 @@ #include "RNA_enum_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_function_util.hh" diff --git a/source/blender/nodes/function/nodes/node_fn_input_bool.cc b/source/blender/nodes/function/nodes/node_fn_input_bool.cc index 7c6e7d67b35..713d30651ca 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_bool.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_bool.cc @@ -6,8 +6,8 @@ #include "BLI_hash.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_fn_input_bool_cc { diff --git a/source/blender/nodes/function/nodes/node_fn_input_color.cc b/source/blender/nodes/function/nodes/node_fn_input_color.cc index 818c2a49ef9..081e8c5621d 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_color.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_color.cc @@ -6,8 +6,8 @@ #include "BLI_math_vector.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_fn_input_color_cc { diff --git a/source/blender/nodes/function/nodes/node_fn_input_int.cc b/source/blender/nodes/function/nodes/node_fn_input_int.cc index 2beb25e8f23..ab92dcf55fb 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_int.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_int.cc @@ -6,8 +6,8 @@ #include "BLI_hash.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_fn_input_int_cc { diff --git a/source/blender/nodes/function/nodes/node_fn_input_string.cc b/source/blender/nodes/function/nodes/node_fn_input_string.cc index df73c2a97cc..e8acf342cb8 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_string.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_string.cc @@ -4,8 +4,8 @@ #include "node_function_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_fn_input_string_cc { diff --git a/source/blender/nodes/function/nodes/node_fn_input_vector.cc b/source/blender/nodes/function/nodes/node_fn_input_vector.cc index 534dc233e20..9f32f63f7ea 100644 --- a/source/blender/nodes/function/nodes/node_fn_input_vector.cc +++ b/source/blender/nodes/function/nodes/node_fn_input_vector.cc @@ -6,8 +6,8 @@ #include "BLI_hash.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_fn_input_vector_cc { diff --git a/source/blender/nodes/function/nodes/node_fn_random_value.cc b/source/blender/nodes/function/nodes/node_fn_random_value.cc index 8d86732a6dd..40bebfb3a19 100644 --- a/source/blender/nodes/function/nodes/node_fn_random_value.cc +++ b/source/blender/nodes/function/nodes/node_fn_random_value.cc @@ -9,8 +9,8 @@ #include "NOD_socket_search_link.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_fn_random_value_cc { diff --git a/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc b/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc index e6332c4dc59..5766db4eab3 100644 --- a/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc +++ b/source/blender/nodes/function/nodes/node_fn_rotate_euler.cc @@ -8,8 +8,8 @@ #include "RNA_enum_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_function_util.hh" diff --git a/source/blender/nodes/function/nodes/node_fn_separate_color.cc b/source/blender/nodes/function/nodes/node_fn_separate_color.cc index 9617c701656..d4e7be08431 100644 --- a/source/blender/nodes/function/nodes/node_fn_separate_color.cc +++ b/source/blender/nodes/function/nodes/node_fn_separate_color.cc @@ -4,8 +4,8 @@ #include "node_function_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes { diff --git a/source/blender/nodes/geometry/node_geometry_tree.cc b/source/blender/nodes/geometry/node_geometry_tree.cc index 1bf048e1b5f..af8803edd41 100644 --- a/source/blender/nodes/geometry/node_geometry_tree.cc +++ b/source/blender/nodes/geometry/node_geometry_tree.cc @@ -20,7 +20,7 @@ #include "RNA_access.h" #include "RNA_prototypes.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "BLT_translation.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc b/source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc index 8df9cb50207..c048a33beb5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_accumulate_field.cc @@ -12,8 +12,8 @@ #include "node_geometry_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_geo_accumulate_field_cc { diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc index b315873cb54..e76be5f67f0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_capture.cc @@ -2,8 +2,8 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BKE_attribute_math.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_domain_size.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_domain_size.cc index aa06b693554..04ed7b179ac 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_domain_size.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_domain_size.cc @@ -2,8 +2,8 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc index 3626e1c8c42..16dbe760d44 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_statistic.cc @@ -5,8 +5,8 @@ #include #include -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BLI_array_utils.hh" #include "BLI_math_base_safe.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc index 25e9516fbf0..cf03c6a589c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_blur_attribute.cc @@ -20,8 +20,8 @@ #include "BKE_mesh.hh" #include "BKE_mesh_mapping.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_socket_search_link.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc index 0898a2960f6..ea486e3dda6 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_boolean.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_boolean.cc @@ -8,8 +8,8 @@ #include "DNA_mesh_types.h" #include "DNA_object_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc index c45555e5490..8547435097e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_collection_info.cc @@ -6,8 +6,8 @@ #include "DNA_collection_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BKE_collection.h" #include "BKE_instances.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc index 0cf4fafa0c8..5c62aacda62 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_endpoint_selection.cc @@ -6,8 +6,8 @@ #include "BKE_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc index e8a4a8c24a6..764948c8958 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fill.cc @@ -14,8 +14,8 @@ #include "BLI_task.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc index 5f4f180b7ef..a010b6647f6 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_fillet.cc @@ -2,8 +2,8 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GEO_fillet_curves.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc index 8d2d50d569c..874902282d1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_handle_type_selection.cc @@ -4,8 +4,8 @@ #include "BKE_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc index c4dde64a8de..da50a4f64f6 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_arc.cc @@ -8,8 +8,8 @@ #include "BKE_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc index 8f42464aeaf..a8c55c3d6e1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_bezier_segment.cc @@ -4,8 +4,8 @@ #include "BKE_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc index f5fdae7b5e5..046297675ea 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_circle.cc @@ -4,8 +4,8 @@ #include "BKE_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc index 391d3dec78a..98384c506d4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_line.cc @@ -4,8 +4,8 @@ #include "BKE_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc index 2d01de06d26..58209e6f476 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_primitive_quadrilateral.cc @@ -3,8 +3,8 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ #include "BKE_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_socket_search_link.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc index b47f298dc38..23d4271db1e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_resample.cc @@ -6,8 +6,8 @@ #include "BKE_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc index 039d96c2cda..6d3d85a65d9 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_sample.cc @@ -7,8 +7,8 @@ #include "BKE_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_socket_search_link.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc index d7bd3e5a278..d051e59f7b8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_set_handle_type.cc @@ -6,8 +6,8 @@ #include "BKE_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc index df3f5012b97..14015842d6a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_spline_type.cc @@ -4,8 +4,8 @@ #include "BKE_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GEO_set_curve_type.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc index 85e62f0f5b9..4c961c8e877 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_subdivide.cc @@ -6,8 +6,8 @@ #include "GEO_subdivide_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc index 8318d65ec8e..2e4c1986768 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_to_mesh.cc @@ -6,8 +6,8 @@ #include "BKE_curve_to_mesh.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc index 9a8b7c0e44c..3deb25aa6f6 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_to_points.cc @@ -13,8 +13,8 @@ #include "GEO_resample_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc index 02d9f605105..93e7ed39f8a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_curve_trim.cc @@ -5,8 +5,8 @@ #include "BKE_curves.hh" #include "BLI_task.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_socket_search_link.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc index 1b33b1ade17..42475992ea2 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_deform_curves_on_surface.cc @@ -15,8 +15,8 @@ #include "BLI_math_matrix.hh" #include "BLI_task.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc index 1a9de1214bb..9b3b51db171 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_delete_geometry.cc @@ -2,8 +2,8 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "DNA_pointcloud_types.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc index 0116062ea77..f18d10d2cc0 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_in_volume.cc @@ -15,8 +15,8 @@ #include "BKE_volume.h" #include "BKE_volume_openvdb.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "DEG_depsgraph_query.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc index 9c9569a4691..d45c44c3cff 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_distribute_points_on_faces.cc @@ -19,8 +19,8 @@ #include "BKE_mesh_sample.hh" #include "BKE_pointcloud.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc b/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc index c5e82c5a32a..3a6ffc5209b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_duplicate_elements.cc @@ -21,8 +21,8 @@ #include "node_geometry_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_geo_duplicate_elements_cc { diff --git a/source/blender/nodes/geometry/nodes/node_geo_evaluate_at_index.cc b/source/blender/nodes/geometry/nodes/node_geo_evaluate_at_index.cc index 325ec873ce2..4e845c242c8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_evaluate_at_index.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_evaluate_at_index.cc @@ -4,8 +4,8 @@ #include "node_geometry_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BKE_attribute_math.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_evaluate_on_domain.cc b/source/blender/nodes/geometry/nodes/node_geo_evaluate_on_domain.cc index 60bb527f4d4..ff4edc6904d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_evaluate_on_domain.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_evaluate_on_domain.cc @@ -4,8 +4,8 @@ #include "node_geometry_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BKE_attribute_math.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc index ff4dc548cde..5376c44b87d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_extrude_mesh.cc @@ -15,8 +15,8 @@ #include "BKE_mesh_mapping.hh" #include "BKE_mesh_runtime.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_image.cc b/source/blender/nodes/geometry/nodes/node_geo_image.cc index 525db542c6c..dce59f00f8d 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_image.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_image.cc @@ -6,8 +6,8 @@ #include "node_geometry_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_geo_image_cc { diff --git a/source/blender/nodes/geometry/nodes/node_geo_image_info.cc b/source/blender/nodes/geometry/nodes/node_geo_image_info.cc index 0bb60ab979a..123e92bd0a3 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_image_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_image_info.cc @@ -10,8 +10,8 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc b/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc index 1f16c6ba5bf..8de3fc1c9a8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_image_texture.cc @@ -14,8 +14,8 @@ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_geo_image_texture_cc { diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_material.cc b/source/blender/nodes/geometry/nodes/node_geo_input_material.cc index d7a79412e3d..529f94b5116 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_material.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_material.cc @@ -2,8 +2,8 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc index 2ea009cf3ca..893b367c6a8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_input_named_attribute.cc @@ -2,8 +2,8 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_socket_search_link.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc b/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc index ff626d81faf..f4efa1a01fd 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_instance_on_points.cc @@ -9,8 +9,8 @@ #include "BLI_math_matrix.hh" #include "BLI_task.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BKE_attribute_math.hh" #include "BKE_instances.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc b/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc index bbf34a92882..18c631c8d7b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_material_replace.cc @@ -4,8 +4,8 @@ #include "node_geometry_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc index e273b764c86..625fc2c8d18 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_material_selection.cc @@ -4,8 +4,8 @@ #include "node_geometry_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mean_filter_sdf_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mean_filter_sdf_volume.cc index 77523573fe8..e6485c0db19 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mean_filter_sdf_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mean_filter_sdf_volume.cc @@ -17,8 +17,8 @@ #include "NOD_add_node_search.hh" #include "NOD_socket_search_link.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_geo_mean_filter_sdf_volume_cc { diff --git a/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc b/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc index 1238f468606..b93939f1b85 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_merge_by_distance.cc @@ -8,8 +8,8 @@ #include "GEO_mesh_merge_by_distance.hh" #include "GEO_point_merge_by_distance.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc index 8bfa7fbaa2a..9f0139f9302 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc @@ -8,8 +8,8 @@ #include "BKE_material.h" #include "BKE_mesh.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc index b9a4ebd7356..01e43f3763c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc @@ -8,8 +8,8 @@ #include "BKE_material.h" #include "BKE_mesh.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc index edff5927462..1bcd17a36c9 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc @@ -8,8 +8,8 @@ #include "BKE_material.h" #include "BKE_mesh.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc index 63842393cc6..dc2949dfc38 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc @@ -10,8 +10,8 @@ #include "BKE_material.h" #include "BKE_mesh.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc index 0f1b606a575..3d58ca526bb 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc @@ -11,8 +11,8 @@ #include "BKE_material.h" #include "BKE_mesh.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_socket_search_link.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc index 044cb2904c5..2bf6fb5cdf4 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc @@ -10,8 +10,8 @@ #include "BKE_material.h" #include "BKE_mesh.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc index fdecfa645e3..0bb259481f6 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_subdivide.cc @@ -6,8 +6,8 @@ #include "BKE_subdiv.hh" #include "BKE_subdiv_mesh.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc index 61bfe17499c..b44ca430e1c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_points.cc @@ -12,8 +12,8 @@ #include "BKE_mesh.hh" #include "BKE_pointcloud.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc index e8dc2e22458..d2057efc2a7 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_sdf_volume.cc @@ -20,8 +20,8 @@ #include "NOD_add_node_search.hh" #include "NOD_socket_search_link.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_geo_mesh_to_sdf_volume_cc { diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc index 6d3197a9e78..4236977068a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_to_volume.cc @@ -17,8 +17,8 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_geo_mesh_to_volume_cc { diff --git a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc index 3ce22422ad2..120ab4cf74c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_object_info.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_object_info.cc @@ -9,8 +9,8 @@ #include "DNA_object_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_offset_sdf_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_offset_sdf_volume.cc index c64f21ecfa4..15eff1e4b78 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_offset_sdf_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_offset_sdf_volume.cc @@ -17,8 +17,8 @@ #include "NOD_add_node_search.hh" #include "NOD_socket_search_link.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_geo_offset_sdf_volume_cc { diff --git a/source/blender/nodes/geometry/nodes/node_geo_points_to_sdf_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_points_to_sdf_volume.cc index c2f85985ab2..0bdaadf1295 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_points_to_sdf_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_points_to_sdf_volume.cc @@ -13,8 +13,8 @@ #include "NOD_add_node_search.hh" #include "NOD_socket_search_link.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_geo_points_to_sdf_volume_cc { diff --git a/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc index 0a24cd9b430..ba581699b4f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_points_to_volume.cc @@ -17,8 +17,8 @@ #include "BKE_lib_id.h" #include "BKE_volume.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #ifdef WITH_OPENVDB namespace blender::nodes { diff --git a/source/blender/nodes/geometry/nodes/node_geo_proximity.cc b/source/blender/nodes/geometry/nodes/node_geo_proximity.cc index 8c19a4e413e..db4b5afd390 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_proximity.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_proximity.cc @@ -11,8 +11,8 @@ #include "BKE_bvhutils.h" #include "BKE_geometry_set.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_raycast.cc b/source/blender/nodes/geometry/nodes/node_geo_raycast.cc index f9dd36a1b20..fb80767d18c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_raycast.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_raycast.cc @@ -8,8 +8,8 @@ #include "BKE_bvhutils.h" #include "BKE_mesh_sample.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_socket_search_link.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc b/source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc index 788a827736e..5058f532da5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_realize_instances.cc @@ -6,8 +6,8 @@ #include "GEO_realize_instances.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_geo_realize_instances_cc { diff --git a/source/blender/nodes/geometry/nodes/node_geo_repeat_input.cc b/source/blender/nodes/geometry/nodes/node_geo_repeat_input.cc index 5057bf1d738..830f54381f1 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_repeat_input.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_repeat_input.cc @@ -7,8 +7,8 @@ #include "DEG_depsgraph_query.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_geometry.hh" #include "NOD_socket.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_repeat_output.cc b/source/blender/nodes/geometry/nodes/node_geo_repeat_output.cc index 80355cb0f0c..3942c0dacc5 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_repeat_output.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_repeat_output.cc @@ -7,8 +7,8 @@ #include "DEG_depsgraph_query.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_add_node_search.hh" #include "NOD_geometry.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_index.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_index.cc index 1b66d2b06f8..9e89a6b55cf 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_index.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_index.cc @@ -6,8 +6,8 @@ #include "BKE_attribute_math.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_socket_search_link.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc index 011c88ecb64..42ba38d5835 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest.cc @@ -10,8 +10,8 @@ #include "BKE_mesh.hh" #include "BKE_mesh_runtime.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc index 7916e8e7eed..3ceb5264d3c 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_nearest_surface.cc @@ -10,8 +10,8 @@ #include "BKE_mesh.hh" #include "BKE_mesh_sample.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_socket_search_link.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_uv_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_uv_surface.cc index 5196d4a03fd..27f2b323e15 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_uv_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_uv_surface.cc @@ -7,8 +7,8 @@ #include "BKE_mesh_sample.hh" #include "BKE_type_conversions.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GEO_reverse_uv_sampler.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_sample_volume.cc b/source/blender/nodes/geometry/nodes/node_geo_sample_volume.cc index 05e56b3c3c0..64c0751b831 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_sample_volume.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_sample_volume.cc @@ -15,8 +15,8 @@ #include "node_geometry_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #ifdef WITH_OPENVDB # include diff --git a/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc b/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc index 273a169eb27..288b232c8ce 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_scale_elements.cc @@ -12,8 +12,8 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BKE_mesh.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc b/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc index ff8f68ccaf4..c1e7a9416c8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_separate_geometry.cc @@ -2,8 +2,8 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc b/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc index ac3fd7b632d..45800e34d24 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_curve_handles.cc @@ -8,8 +8,8 @@ #include "BKE_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_curve_normal.cc b/source/blender/nodes/geometry/nodes/node_geo_set_curve_normal.cc index 2510acbc8a6..b6f25ff19ae 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_curve_normal.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_curve_normal.cc @@ -4,8 +4,8 @@ #include "BKE_curves.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_material.cc b/source/blender/nodes/geometry/nodes/node_geo_set_material.cc index 209f6f2be01..99a4a931e02 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_material.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_material.cc @@ -4,8 +4,8 @@ #include "node_geometry_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "DNA_curves_types.h" #include "DNA_mesh_types.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc b/source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc index d819ee0ccbc..b9fd6dd6615 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_simulation_input.cc @@ -7,8 +7,8 @@ #include "DEG_depsgraph_query.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_geometry.hh" #include "NOD_socket.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_simulation_output.cc b/source/blender/nodes/geometry/nodes/node_geo_simulation_output.cc index 95c345fc58d..d533f26bebc 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_simulation_output.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_simulation_output.cc @@ -15,7 +15,7 @@ #include "DEG_depsgraph_query.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "NOD_common.h" #include "NOD_socket.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc b/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc index 6d8180a1e77..4cd48449211 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_store_named_attribute.cc @@ -4,8 +4,8 @@ #include -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_enum_types.h" diff --git a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc index ba5871fb925..9308cb8bbaa 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_string_to_curves.cc @@ -17,8 +17,8 @@ #include "BLI_string_utf8.h" #include "BLI_task.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc index 032a9453b5b..7be1ad87522 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_subdivision_surface.cc @@ -13,8 +13,8 @@ #include "BKE_subdiv.hh" #include "BKE_subdiv_mesh.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_switch.cc b/source/blender/nodes/geometry/nodes/node_geo_switch.cc index c553346ed9a..3d8b4861cea 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_switch.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_switch.cc @@ -4,8 +4,8 @@ #include "node_geometry_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_socket_search_link.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_tool_set_face_set.cc b/source/blender/nodes/geometry/nodes/node_geo_tool_set_face_set.cc index 1b9a2a66d30..03600aaea44 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_tool_set_face_set.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_tool_set_face_set.cc @@ -4,8 +4,8 @@ #include "BKE_mesh.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_tool_set_selection.cc b/source/blender/nodes/geometry/nodes/node_geo_tool_set_selection.cc index 1007daa1b0e..307c324855e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_tool_set_selection.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_tool_set_selection.cc @@ -4,8 +4,8 @@ #include "BKE_mesh.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc b/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc index 1f754fa9e67..835d97e7357 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_triangulate.cc @@ -10,8 +10,8 @@ #include "DNA_mesh_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc b/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc index 482c2f5583d..d96821b1032 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_uv_unwrap.cc @@ -9,8 +9,8 @@ #include "BKE_mesh.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_geometry_util.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_viewer.cc b/source/blender/nodes/geometry/nodes/node_geo_viewer.cc index 2c52c11e76c..43b67882f9b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_viewer.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_viewer.cc @@ -4,10 +4,10 @@ #include "BKE_context.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" -#include "ED_node.h" +#include "ED_node.hh" #include "ED_viewer_path.hh" #include "NOD_socket_search_link.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc index 1fbc1747efb..46dcebd0853 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc @@ -21,8 +21,8 @@ #include "DNA_mesh_types.h" #include "DNA_meshdata_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_geo_volume_to_mesh_cc { diff --git a/source/blender/nodes/intern/node_socket.cc b/source/blender/nodes/intern/node_socket.cc index d9649dc29f0..88749692452 100644 --- a/source/blender/nodes/intern/node_socket.cc +++ b/source/blender/nodes/intern/node_socket.cc @@ -544,7 +544,7 @@ static void standard_node_socket_interface_from_socket(bNodeTree * /*ntree*/, node_socket_copy_default_value(stemp, sock); } -extern "C" void ED_init_standard_node_socket_type(bNodeSocketType *); +void ED_init_standard_node_socket_type(bNodeSocketType *); static bNodeSocketType *make_standard_socket_type(int type, int subtype) { @@ -591,7 +591,7 @@ static bNodeSocketType *make_standard_socket_type(int type, int subtype) return stype; } -extern "C" void ED_init_node_socket_type_virtual(bNodeSocketType *); +void ED_init_node_socket_type_virtual(bNodeSocketType *); static bNodeSocketType *make_socket_type_virtual() { diff --git a/source/blender/nodes/intern/socket_search_link.cc b/source/blender/nodes/intern/socket_search_link.cc index 742ef796448..1c5c44900a5 100644 --- a/source/blender/nodes/intern/socket_search_link.cc +++ b/source/blender/nodes/intern/socket_search_link.cc @@ -7,7 +7,7 @@ #include "BKE_context.h" #include "BKE_node.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLT_translation.h" diff --git a/source/blender/nodes/shader/node_shader_tree.cc b/source/blender/nodes/shader/node_shader_tree.cc index ade210e9c3b..e64d02f0649 100644 --- a/source/blender/nodes/shader/node_shader_tree.cc +++ b/source/blender/nodes/shader/node_shader_tree.cc @@ -40,7 +40,7 @@ #include "RE_texture.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "NOD_common.h" diff --git a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc index 94ccd837e46..ae1367abe7d 100644 --- a/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc +++ b/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_ambient_occlusion_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_attribute.cc b/source/blender/nodes/shader/nodes/node_shader_attribute.cc index ff55d83d7db..786ec3c5a39 100644 --- a/source/blender/nodes/shader/nodes/node_shader_attribute.cc +++ b/source/blender/nodes/shader/nodes/node_shader_attribute.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_attribute_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_bevel.cc b/source/blender/nodes/shader/nodes/node_shader_bevel.cc index a0eb36180ff..f8eb33651ea 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bevel.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bevel.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_bevel_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc index 7bdc5d0fdc6..af08a0c7ae5 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_bsdf_glossy_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc index fb587fb37de..40a70c7adff 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_bsdf_hair_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc index f813c37394f..ec5380f596e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_hair_principled.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_bsdf_hair_principled_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc index e5345c78414..607fc407936 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_principled.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BKE_node_runtime.hh" diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_sheen.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_sheen.cc index b45005db8e6..b6c96e7209b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_sheen.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_sheen.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_bsdf_sheen_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc b/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc index 79205b0d075..04e791d90c6 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_bsdf_toon_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_bump.cc b/source/blender/nodes/shader/nodes/node_shader_bump.cc index ff139ef0036..f868e450079 100644 --- a/source/blender/nodes/shader/nodes/node_shader_bump.cc +++ b/source/blender/nodes/shader/nodes/node_shader_bump.cc @@ -8,8 +8,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" /* **************** BUMP ******************** */ diff --git a/source/blender/nodes/shader/nodes/node_shader_clamp.cc b/source/blender/nodes/shader/nodes/node_shader_clamp.cc index e893073e532..29b85af2ccf 100644 --- a/source/blender/nodes/shader/nodes/node_shader_clamp.cc +++ b/source/blender/nodes/shader/nodes/node_shader_clamp.cc @@ -8,8 +8,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_clamp_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_ies_light.cc b/source/blender/nodes/shader/nodes/node_shader_ies_light.cc index e892e814b8c..524bc541d71 100644 --- a/source/blender/nodes/shader/nodes/node_shader_ies_light.cc +++ b/source/blender/nodes/shader/nodes/node_shader_ies_light.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_ies_light_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_map_range.cc b/source/blender/nodes/shader/nodes/node_shader_map_range.cc index 29d3d6a82f9..8ff8843aa20 100644 --- a/source/blender/nodes/shader/nodes/node_shader_map_range.cc +++ b/source/blender/nodes/shader/nodes/node_shader_map_range.cc @@ -14,8 +14,8 @@ #include "NOD_socket_search_link.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_map_range_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_mapping.cc b/source/blender/nodes/shader/nodes/node_shader_mapping.cc index aadf9abedd4..2af0f5a87a1 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mapping.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mapping.cc @@ -8,8 +8,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_mapping_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_mix.cc b/source/blender/nodes/shader/nodes/node_shader_mix.cc index ce3bd59e711..1b8658a1305 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mix.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mix.cc @@ -10,8 +10,8 @@ #include "BLI_math_quaternion.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "node_shader_util.hh" diff --git a/source/blender/nodes/shader/nodes/node_shader_normal_map.cc b/source/blender/nodes/shader/nodes/node_shader_normal_map.cc index 94cab2a82f8..4ba1a62322d 100644 --- a/source/blender/nodes/shader/nodes/node_shader_normal_map.cc +++ b/source/blender/nodes/shader/nodes/node_shader_normal_map.cc @@ -9,8 +9,8 @@ #include "DEG_depsgraph_query.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_normal_map_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_output_aov.cc b/source/blender/nodes/shader/nodes/node_shader_output_aov.cc index 0757c222cc4..3f7dcdb3a23 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_aov.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_aov.cc @@ -6,8 +6,8 @@ #include "BLI_hash.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_output_aov_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc b/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc index 74e63972b72..a266992de4f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc +++ b/source/blender/nodes/shader/nodes/node_shader_output_linestyle.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_output_linestyle_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_script.cc b/source/blender/nodes/shader/nodes/node_shader_script.cc index 9580339355a..96ef9a1a7b6 100644 --- a/source/blender/nodes/shader/nodes/node_shader_script.cc +++ b/source/blender/nodes/shader/nodes/node_shader_script.cc @@ -8,8 +8,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_script_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_sepcomb_color.cc b/source/blender/nodes/shader/nodes/node_shader_sepcomb_color.cc index fa46de788fc..c8a9ae62905 100644 --- a/source/blender/nodes/shader/nodes/node_shader_sepcomb_color.cc +++ b/source/blender/nodes/shader/nodes/node_shader_sepcomb_color.cc @@ -8,8 +8,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" static void node_combsep_color_init(bNodeTree * /*tree*/, bNode *node) { diff --git a/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc b/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc index fa55d2f291d..61bee7143cc 100644 --- a/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc +++ b/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "BKE_node_runtime.hh" diff --git a/source/blender/nodes/shader/nodes/node_shader_tangent.cc b/source/blender/nodes/shader/nodes/node_shader_tangent.cc index c5107706a1f..da62c149332 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tangent.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tangent.cc @@ -8,8 +8,8 @@ #include "DEG_depsgraph_query.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_tangent_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc b/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc index 2dac8a8e7f3..6cdd0dd0951 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_brick.cc @@ -6,8 +6,8 @@ #include "BLI_math_vector_types.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_tex_brick_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc b/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc index a62d79215e6..3ef882b73b7 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_coord.cc @@ -6,8 +6,8 @@ #include "DNA_customdata_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_tex_coord_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc index f1e2a65a4e5..b7c64bb6c0e 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_gradient.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_tex_gradient_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc b/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc index 291c1297958..66162ee3606 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_magic.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_tex_magic_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc index 3a2b223de3d..e84fa210bf8 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.cc @@ -6,8 +6,8 @@ #include "BLI_noise.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_tex_musgrave_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc index 041ec45c6fb..df069ca25dd 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc @@ -6,8 +6,8 @@ #include "BLI_noise.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_tex_noise_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.cc b/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.cc index 47768a5350b..d14fdc984cb 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_pointdensity.cc @@ -6,8 +6,8 @@ #include "RE_texture.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_tex_pointdensity_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc b/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc index 291c19c70c9..f31515ca6d1 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_sky.cc @@ -10,8 +10,8 @@ #include "BKE_context.h" #include "BKE_scene.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "NOD_socket_search_link.hh" diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc index 4585e9160fe..6451caf8f0c 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.cc @@ -6,8 +6,8 @@ #include "BLI_noise.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_tex_voronoi_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc b/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc index d5408b52e96..79eb823b2fb 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_wave.cc @@ -6,8 +6,8 @@ #include "BLI_noise.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_tex_wave_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc b/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc index e1217df5728..f11b8b79acf 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_white_noise.cc @@ -6,8 +6,8 @@ #include "BLI_noise.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_tex_white_noise_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_uv_along_stroke.cc b/source/blender/nodes/shader/nodes/node_shader_uv_along_stroke.cc index 6e83dd62f52..0d03c766aba 100644 --- a/source/blender/nodes/shader/nodes/node_shader_uv_along_stroke.cc +++ b/source/blender/nodes/shader/nodes/node_shader_uv_along_stroke.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_uv_along_stroke_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_uvmap.cc b/source/blender/nodes/shader/nodes/node_shader_uvmap.cc index 5241b8b96ad..aa999f32aa3 100644 --- a/source/blender/nodes/shader/nodes/node_shader_uvmap.cc +++ b/source/blender/nodes/shader/nodes/node_shader_uvmap.cc @@ -10,8 +10,8 @@ #include "DEG_depsgraph_query.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_uvmap_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc index 3f0fcc1b553..499693bc9ba 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_math.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_math.cc @@ -13,8 +13,8 @@ #include "RNA_enum_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_vector_math_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc b/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc index 6c4b133281e..5ce730667ea 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_rotate.cc @@ -8,8 +8,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_vector_rotate_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_vector_transform.cc b/source/blender/nodes/shader/nodes/node_shader_vector_transform.cc index 663f03cb408..63045849947 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vector_transform.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vector_transform.cc @@ -8,8 +8,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_vector_transform_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc index abe3cfae834..06375f3b2e8 100644 --- a/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc +++ b/source/blender/nodes/shader/nodes/node_shader_vertex_color.cc @@ -8,8 +8,8 @@ #include "DEG_depsgraph_query.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_vertex_color_cc { diff --git a/source/blender/nodes/shader/nodes/node_shader_wireframe.cc b/source/blender/nodes/shader/nodes/node_shader_wireframe.cc index a21456980ef..eb96283c711 100644 --- a/source/blender/nodes/shader/nodes/node_shader_wireframe.cc +++ b/source/blender/nodes/shader/nodes/node_shader_wireframe.cc @@ -4,8 +4,8 @@ #include "node_shader_util.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" namespace blender::nodes::node_shader_wireframe_cc { diff --git a/source/blender/nodes/texture/node_texture_tree.cc b/source/blender/nodes/texture/node_texture_tree.cc index 5788a3cb3af..3395a2a80b8 100644 --- a/source/blender/nodes/texture/node_texture_tree.cc +++ b/source/blender/nodes/texture/node_texture_tree.cc @@ -35,7 +35,7 @@ #include "RE_texture.h" -#include "UI_resources.h" +#include "UI_resources.hh" static void texture_get_from_context( const bContext *C, bNodeTreeType * /*treetype*/, bNodeTree **r_ntree, ID **r_id, ID **r_from) diff --git a/source/blender/python/bmesh/bmesh_py_api.cc b/source/blender/python/bmesh/bmesh_py_api.cc index 69608b14af2..5b7f1d827f2 100644 --- a/source/blender/python/bmesh/bmesh_py_api.cc +++ b/source/blender/python/bmesh/bmesh_py_api.cc @@ -88,7 +88,7 @@ static PyObject *bpy_bm_from_edit_mesh(PyObject * /*self*/, PyObject *value) return BPy_BMesh_CreatePyObject(bm, BPY_BMFLAG_IS_WRAPPED); } -extern "C" void EDBM_update_extern(Mesh *me, const bool do_tessface, const bool is_destructive); +void EDBM_update_extern(Mesh *me, const bool do_tessface, const bool is_destructive); PyDoc_STRVAR(bpy_bm_update_edit_mesh_doc, ".. method:: update_edit_mesh(mesh, loop_triangles=True, destructive=True)\n" diff --git a/source/blender/python/gpu/gpu_py_offscreen.cc b/source/blender/python/gpu/gpu_py_offscreen.cc index 5be752f349c..5939f565ff8 100644 --- a/source/blender/python/gpu/gpu_py_offscreen.cc +++ b/source/blender/python/gpu/gpu_py_offscreen.cc @@ -30,7 +30,7 @@ #include "GPU_texture.h" #include "GPU_viewport.h" -#include "ED_view3d_offscreen.h" +#include "ED_view3d_offscreen.hh" #include "../mathutils/mathutils.h" diff --git a/source/blender/python/intern/bpy_app.cc b/source/blender/python/intern/bpy_app.cc index 4a6dd5c0f31..650f149b207 100644 --- a/source/blender/python/intern/bpy_app.cc +++ b/source/blender/python/intern/bpy_app.cc @@ -44,7 +44,7 @@ #include "DNA_ID.h" -#include "UI_interface_icons.h" +#include "UI_interface_icons.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/python/intern/bpy_rna_anim.cc b/source/blender/python/intern/bpy_rna_anim.cc index 8b85880898a..a023a7d1e62 100644 --- a/source/blender/python/intern/bpy_rna_anim.cc +++ b/source/blender/python/intern/bpy_rna_anim.cc @@ -20,8 +20,8 @@ #include "DNA_anim_types.h" #include "DNA_scene_types.h" -#include "ED_keyframes_edit.h" -#include "ED_keyframing.h" +#include "ED_keyframes_edit.hh" +#include "ED_keyframing.hh" #include "BKE_anim_data.h" #include "BKE_animsys.h" diff --git a/source/blender/python/intern/bpy_rna_callback.cc b/source/blender/python/intern/bpy_rna_callback.cc index 6edf9926335..82d98f7ff07 100644 --- a/source/blender/python/intern/bpy_rna_callback.cc +++ b/source/blender/python/intern/bpy_rna_callback.cc @@ -24,7 +24,7 @@ #include "WM_api.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "BPY_extern.h" /* For public API. */ diff --git a/source/blender/python/intern/bpy_rna_ui.cc b/source/blender/python/intern/bpy_rna_ui.cc index 2d1f6a30dd1..5a62f51a078 100644 --- a/source/blender/python/intern/bpy_rna_ui.cc +++ b/source/blender/python/intern/bpy_rna_ui.cc @@ -14,7 +14,7 @@ #include "../generic/py_capi_utils.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "RNA_types.h" diff --git a/source/blender/shader_fx/intern/FX_shader_blur.cc b/source/blender/shader_fx/intern/FX_shader_blur.cc index f786bec9af4..8cae50ab98b 100644 --- a/source/blender/shader_fx/intern/FX_shader_blur.cc +++ b/source/blender/shader_fx/intern/FX_shader_blur.cc @@ -18,8 +18,8 @@ #include "DNA_screen_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/shader_fx/intern/FX_shader_colorize.cc b/source/blender/shader_fx/intern/FX_shader_colorize.cc index a199089f1c1..d5f3d382da4 100644 --- a/source/blender/shader_fx/intern/FX_shader_colorize.cc +++ b/source/blender/shader_fx/intern/FX_shader_colorize.cc @@ -18,8 +18,8 @@ #include "DNA_screen_types.h" #include "DNA_shader_fx_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/shader_fx/intern/FX_shader_flip.cc b/source/blender/shader_fx/intern/FX_shader_flip.cc index fb37626b6b2..03ee785cd83 100644 --- a/source/blender/shader_fx/intern/FX_shader_flip.cc +++ b/source/blender/shader_fx/intern/FX_shader_flip.cc @@ -20,8 +20,8 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/shader_fx/intern/FX_shader_glow.cc b/source/blender/shader_fx/intern/FX_shader_glow.cc index 6d4007d316d..ad60dcd5d6a 100644 --- a/source/blender/shader_fx/intern/FX_shader_glow.cc +++ b/source/blender/shader_fx/intern/FX_shader_glow.cc @@ -23,8 +23,8 @@ #include "BKE_screen.h" #include "BKE_shader_fx.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/shader_fx/intern/FX_shader_pixel.cc b/source/blender/shader_fx/intern/FX_shader_pixel.cc index 091418392f9..fa8ce1d62b1 100644 --- a/source/blender/shader_fx/intern/FX_shader_pixel.cc +++ b/source/blender/shader_fx/intern/FX_shader_pixel.cc @@ -17,8 +17,8 @@ #include "DNA_screen_types.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/shader_fx/intern/FX_shader_rim.cc b/source/blender/shader_fx/intern/FX_shader_rim.cc index 4500c3e02fe..3bac7d850d6 100644 --- a/source/blender/shader_fx/intern/FX_shader_rim.cc +++ b/source/blender/shader_fx/intern/FX_shader_rim.cc @@ -18,8 +18,8 @@ #include "BKE_context.h" #include "BKE_screen.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/shader_fx/intern/FX_shader_shadow.cc b/source/blender/shader_fx/intern/FX_shader_shadow.cc index 8134906bbd0..b3ce9009e26 100644 --- a/source/blender/shader_fx/intern/FX_shader_shadow.cc +++ b/source/blender/shader_fx/intern/FX_shader_shadow.cc @@ -23,8 +23,8 @@ #include "BKE_screen.h" #include "BKE_shader_fx.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/shader_fx/intern/FX_shader_swirl.cc b/source/blender/shader_fx/intern/FX_shader_swirl.cc index e02240c007b..55f7ca16900 100644 --- a/source/blender/shader_fx/intern/FX_shader_swirl.cc +++ b/source/blender/shader_fx/intern/FX_shader_swirl.cc @@ -24,8 +24,8 @@ #include "BKE_screen.h" #include "BKE_shader_fx.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/shader_fx/intern/FX_shader_wave.cc b/source/blender/shader_fx/intern/FX_shader_wave.cc index cc1d1ebf36b..3961d79f495 100644 --- a/source/blender/shader_fx/intern/FX_shader_wave.cc +++ b/source/blender/shader_fx/intern/FX_shader_wave.cc @@ -20,8 +20,8 @@ #include "BLT_translation.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/shader_fx/intern/FX_ui_common.cc b/source/blender/shader_fx/intern/FX_ui_common.cc index d05b2be3e2a..4c2072c6ed7 100644 --- a/source/blender/shader_fx/intern/FX_ui_common.cc +++ b/source/blender/shader_fx/intern/FX_ui_common.cc @@ -21,12 +21,12 @@ #include "DNA_screen_types.h" #include "DNA_shader_fx_types.h" -#include "ED_object.h" +#include "ED_object.hh" #include "BLT_translation.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_prototypes.h" diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc index 8287e958877..ef82d1a1953 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc @@ -28,9 +28,9 @@ #include "WM_types.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #ifdef WITH_PYTHON # include "BPY_extern.h" diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.cc index 8a0538d803d..372f2384775 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.cc +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.cc @@ -34,7 +34,7 @@ #include "wm_event_system.h" #include "ED_screen.hh" -#include "ED_undo.h" +#include "ED_undo.hh" /* own includes */ #include "wm_gizmo_intern.h" diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc index bd776f6fed2..e0d6de81ebb 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc @@ -21,8 +21,8 @@ #include "BKE_main.h" #include "ED_screen.hh" -#include "ED_select_utils.h" -#include "ED_view3d.h" +#include "ED_select_utils.hh" +#include "ED_view3d.hh" #include "GPU_framebuffer.h" #include "GPU_matrix.h" @@ -38,7 +38,7 @@ #include "wm_event_system.h" /* for tool-tips */ -#include "UI_interface.h" +#include "UI_interface.hh" #include "DEG_depsgraph.h" diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc index c431de5fbeb..ab46fc4ce08 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_target_props.cc @@ -21,9 +21,9 @@ #include "wm.hh" -#include "ED_keyframing.h" +#include "ED_keyframing.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" /* own includes */ #include "wm_gizmo_intern.h" diff --git a/source/blender/windowmanager/intern/wm_dragdrop.cc b/source/blender/windowmanager/intern/wm_dragdrop.cc index 385518adff0..5f5b1c7afbb 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.cc +++ b/source/blender/windowmanager/intern/wm_dragdrop.cc @@ -25,7 +25,7 @@ #include "BLI_blenlib.h" #include "BLI_math_color.h" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "BKE_context.h" #include "BKE_global.h" @@ -39,8 +39,8 @@ #include "BLO_readfile.h" -#include "ED_asset.h" -#include "ED_fileselect.h" +#include "ED_asset.hh" +#include "ED_fileselect.hh" #include "ED_screen.hh" #include "GPU_shader.h" @@ -49,9 +49,9 @@ #include "IMB_imbuf_types.h" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" #include "RNA_access.h" diff --git a/source/blender/windowmanager/intern/wm_draw.cc b/source/blender/windowmanager/intern/wm_draw.cc index 8abc582ce09..b5f8ab5b4cf 100644 --- a/source/blender/windowmanager/intern/wm_draw.cc +++ b/source/blender/windowmanager/intern/wm_draw.cc @@ -34,9 +34,9 @@ #include "GHOST_C-api.h" -#include "ED_node.h" +#include "ED_node.hh" #include "ED_screen.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "GPU_batch_presets.h" #include "GPU_context.h" @@ -59,7 +59,7 @@ #include "wm_surface.hh" #include "wm_window.hh" -#include "UI_resources.h" +#include "UI_resources.hh" #ifdef WITH_OPENSUBDIV # include "BKE_subsurf.hh" diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc index 6917d617170..7838128de82 100644 --- a/source/blender/windowmanager/intern/wm_event_system.cc +++ b/source/blender/windowmanager/intern/wm_event_system.cc @@ -50,20 +50,20 @@ #include "BLT_translation.h" -#include "ED_asset.h" -#include "ED_fileselect.h" -#include "ED_info.h" -#include "ED_render.h" +#include "ED_asset.hh" +#include "ED_fileselect.hh" +#include "ED_info.hh" +#include "ED_render.hh" #include "ED_screen.hh" -#include "ED_undo.h" +#include "ED_undo.hh" #include "ED_util.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "GPU_context.h" #include "RNA_access.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "PIL_time.h" diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc index c097f865724..ba0f925d7e4 100644 --- a/source/blender/windowmanager/intern/wm_files.cc +++ b/source/blender/windowmanager/intern/wm_files.cc @@ -92,27 +92,26 @@ #include "IMB_imbuf_types.h" #include "IMB_thumbs.h" -#include "ED_asset.h" +#include "ED_asset.hh" #include "ED_datafiles.h" -#include "ED_fileselect.h" -#include "ED_image.h" -#include "ED_outliner.h" -#include "ED_render.h" +#include "ED_fileselect.hh" +#include "ED_image.hh" +#include "ED_outliner.hh" +#include "ED_render.hh" #include "ED_screen.hh" -#include "ED_undo.h" +#include "ED_undo.hh" #include "ED_util.hh" -#include "ED_view3d.h" -#include "ED_view3d_offscreen.h" +#include "ED_view3d.hh" +#include "ED_view3d_offscreen.hh" #include "GHOST_C-api.h" #include "GHOST_Path-api.hh" #include "GPU_context.h" -#include "UI_interface.h" #include "UI_interface.hh" -#include "UI_resources.h" -#include "UI_view2d.h" +#include "UI_resources.hh" +#include "UI_view2d.hh" /* only to report a missing engine */ #include "RE_engine.h" diff --git a/source/blender/windowmanager/intern/wm_gesture.cc b/source/blender/windowmanager/intern/wm_gesture.cc index bc943522c04..a33cd9212ca 100644 --- a/source/blender/windowmanager/intern/wm_gesture.cc +++ b/source/blender/windowmanager/intern/wm_gesture.cc @@ -33,7 +33,7 @@ #include "GPU_immediate_util.h" #include "GPU_state.h" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" wmGesture *WM_gesture_new(wmWindow *window, const ARegion *region, const wmEvent *event, int type) { diff --git a/source/blender/windowmanager/intern/wm_gesture_ops.cc b/source/blender/windowmanager/intern/wm_gesture_ops.cc index f670e569781..4bd8cdf6915 100644 --- a/source/blender/windowmanager/intern/wm_gesture_ops.cc +++ b/source/blender/windowmanager/intern/wm_gesture_ops.cc @@ -29,9 +29,9 @@ #include "wm_event_types.hh" #include "ED_screen.hh" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "RNA_access.h" #include "RNA_define.h" diff --git a/source/blender/windowmanager/intern/wm_init_exit.cc b/source/blender/windowmanager/intern/wm_init_exit.cc index 03775fe2e90..9b0641ceeb1 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.cc +++ b/source/blender/windowmanager/intern/wm_init_exit.cc @@ -94,24 +94,24 @@ #include "wm_surface.hh" #include "wm_window.hh" -#include "ED_anim_api.h" -#include "ED_armature.h" -#include "ED_asset.h" -#include "ED_gpencil_legacy.h" -#include "ED_keyframes_edit.h" -#include "ED_keyframing.h" -#include "ED_node.h" -#include "ED_render.h" +#include "ED_anim_api.hh" +#include "ED_armature.hh" +#include "ED_asset.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_keyframes_edit.hh" +#include "ED_keyframing.hh" +#include "ED_node.hh" +#include "ED_render.hh" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_undo.h" +#include "ED_space_api.hh" +#include "ED_undo.hh" #include "ED_util.hh" -#include "ED_view3d.h" +#include "ED_view3d.hh" #include "BLF_api.h" #include "BLT_lang.h" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" #include "GPU_context.h" #include "GPU_init_exit.h" diff --git a/source/blender/windowmanager/intern/wm_keymap.cc b/source/blender/windowmanager/intern/wm_keymap.cc index a4123eb4543..598277d69a8 100644 --- a/source/blender/windowmanager/intern/wm_keymap.cc +++ b/source/blender/windowmanager/intern/wm_keymap.cc @@ -27,7 +27,7 @@ #include "BLF_api.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BKE_context.h" #include "BKE_global.h" diff --git a/source/blender/windowmanager/intern/wm_operator_props.cc b/source/blender/windowmanager/intern/wm_operator_props.cc index 0892712fa04..04081919797 100644 --- a/source/blender/windowmanager/intern/wm_operator_props.cc +++ b/source/blender/windowmanager/intern/wm_operator_props.cc @@ -18,14 +18,14 @@ #include "BLI_math_base.h" #include "BLI_rect.h" -#include "UI_resources.h" +#include "UI_resources.hh" #include "RNA_access.h" #include "RNA_define.h" #include "RNA_enum_types.h" #include "RNA_prototypes.h" -#include "ED_select_utils.h" +#include "ED_select_utils.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/windowmanager/intern/wm_operator_utils.cc b/source/blender/windowmanager/intern/wm_operator_utils.cc index c38bc66c892..d96d8b463a4 100644 --- a/source/blender/windowmanager/intern/wm_operator_utils.cc +++ b/source/blender/windowmanager/intern/wm_operator_utils.cc @@ -25,7 +25,7 @@ #include "MEM_guardedalloc.h" -#include "ED_object.h" +#include "ED_object.hh" #include "ED_screen.hh" /* -------------------------------------------------------------------- */ diff --git a/source/blender/windowmanager/intern/wm_operators.cc b/source/blender/windowmanager/intern/wm_operators.cc index c2c4315c410..44e94a15913 100644 --- a/source/blender/windowmanager/intern/wm_operators.cc +++ b/source/blender/windowmanager/intern/wm_operators.cc @@ -74,12 +74,12 @@ #include "IMB_imbuf_types.h" -#include "ED_fileselect.h" -#include "ED_gpencil_legacy.h" -#include "ED_numinput.h" +#include "ED_fileselect.hh" +#include "ED_gpencil_legacy.hh" +#include "ED_numinput.hh" #include "ED_screen.hh" -#include "ED_undo.h" -#include "ED_view3d.h" +#include "ED_undo.hh" +#include "ED_view3d.hh" #include "RNA_access.h" #include "RNA_define.h" @@ -87,9 +87,9 @@ #include "RNA_path.h" #include "RNA_prototypes.h" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/windowmanager/intern/wm_playanim.cc b/source/blender/windowmanager/intern/wm_playanim.cc index e09fc4f6673..5d24bda6eb5 100644 --- a/source/blender/windowmanager/intern/wm_playanim.cc +++ b/source/blender/windowmanager/intern/wm_playanim.cc @@ -47,7 +47,7 @@ #include "BKE_image.h" -#include "BIF_glutil.h" +#include "BIF_glutil.hh" #include "GPU_context.h" #include "GPU_framebuffer.h" diff --git a/source/blender/windowmanager/intern/wm_splash_screen.cc b/source/blender/windowmanager/intern/wm_splash_screen.cc index ca0630aebaf..ac679bfb614 100644 --- a/source/blender/windowmanager/intern/wm_splash_screen.cc +++ b/source/blender/windowmanager/intern/wm_splash_screen.cc @@ -43,9 +43,9 @@ #include "ED_datafiles.h" #include "ED_screen.hh" -#include "UI_interface.h" -#include "UI_interface_icons.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" +#include "UI_resources.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/windowmanager/intern/wm_stereo.cc b/source/blender/windowmanager/intern/wm_stereo.cc index af382229e1c..239c9746f83 100644 --- a/source/blender/windowmanager/intern/wm_stereo.cc +++ b/source/blender/windowmanager/intern/wm_stereo.cc @@ -37,8 +37,8 @@ #include "wm_draw.hh" #include "wm_window.hh" -#include "UI_interface.h" -#include "UI_resources.h" +#include "UI_interface.hh" +#include "UI_resources.hh" void wm_stereo3d_draw_sidebyside(wmWindow *win, int view) { diff --git a/source/blender/windowmanager/intern/wm_tooltip.cc b/source/blender/windowmanager/intern/wm_tooltip.cc index a6000a17280..6e8424db3d4 100644 --- a/source/blender/windowmanager/intern/wm_tooltip.cc +++ b/source/blender/windowmanager/intern/wm_tooltip.cc @@ -17,7 +17,7 @@ #include "ED_screen.hh" -#include "UI_interface.h" +#include "UI_interface.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/windowmanager/intern/wm_uilist_type.cc b/source/blender/windowmanager/intern/wm_uilist_type.cc index 5000eb1b4ee..626820c9472 100644 --- a/source/blender/windowmanager/intern/wm_uilist_type.cc +++ b/source/blender/windowmanager/intern/wm_uilist_type.cc @@ -19,7 +19,7 @@ #include "MEM_guardedalloc.h" -#include "UI_interface.h" +#include "UI_interface.hh" #include "BLI_ghash.h" #include "BLI_string.h" diff --git a/source/blender/windowmanager/intern/wm_window.cc b/source/blender/windowmanager/intern/wm_window.cc index 090eb376726..c00f4e67ab2 100644 --- a/source/blender/windowmanager/intern/wm_window.cc +++ b/source/blender/windowmanager/intern/wm_window.cc @@ -55,17 +55,17 @@ # include "wm_xr.h" #endif -#include "ED_anim_api.h" -#include "ED_fileselect.h" -#include "ED_render.h" -#include "ED_scene.h" +#include "ED_anim_api.hh" +#include "ED_fileselect.hh" +#include "ED_render.hh" +#include "ED_scene.hh" #include "ED_screen.hh" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" -#include "UI_interface.h" -#include "UI_interface_icons.h" +#include "UI_interface.hh" +#include "UI_interface_icons.hh" #include "PIL_time.h" @@ -80,7 +80,7 @@ #include "GPU_state.h" #include "GPU_texture.h" -#include "UI_resources.h" +#include "UI_resources.hh" /* for assert */ #ifndef NDEBUG diff --git a/source/blender/windowmanager/xr/intern/wm_xr_draw.cc b/source/blender/windowmanager/xr/intern/wm_xr_draw.cc index 8861c13d774..723d519baeb 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_draw.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_draw.cc @@ -17,7 +17,7 @@ #include "BLI_listbase.h" #include "BLI_math.h" -#include "ED_view3d_offscreen.h" +#include "ED_view3d_offscreen.hh" #include "GHOST_C-api.h" #include "GPU_batch_presets.h" diff --git a/source/blender/windowmanager/xr/intern/wm_xr_operators.cc b/source/blender/windowmanager/xr/intern/wm_xr_operators.cc index 11f3e77f398..f6ee02aa381 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_operators.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_operators.cc @@ -23,9 +23,9 @@ #include "DEG_depsgraph.h" #include "ED_screen.hh" -#include "ED_space_api.h" -#include "ED_transform_snap_object_context.h" -#include "ED_view3d.h" +#include "ED_space_api.hh" +#include "ED_transform_snap_object_context.hh" +#include "ED_view3d.hh" #include "GHOST_Types.h" diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.cc b/source/blender/windowmanager/xr/intern/wm_xr_session.cc index e72fdf01719..5cd5012f7b3 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_session.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_session.cc @@ -27,7 +27,7 @@ #include "DRW_engine.h" #include "ED_screen.hh" -#include "ED_space_api.h" +#include "ED_space_api.hh" #include "GHOST_C-api.h"