From 916d4c9d9b5b3946e11233bc4c828dccc51b2dec Mon Sep 17 00:00:00 2001 From: Hans Goudey Date: Mon, 25 Sep 2023 17:48:21 -0400 Subject: [PATCH] Cleanup: Move BKE_screen.h to C++ See #103343 --- .../blenkernel/{BKE_screen.h => BKE_screen.hh} | 12 ------------ source/blender/blenkernel/CMakeLists.txt | 2 +- source/blender/blenkernel/intern/blender.cc | 2 +- source/blender/blenkernel/intern/blendfile.cc | 2 +- source/blender/blenkernel/intern/camera.cc | 2 +- source/blender/blenkernel/intern/context.cc | 2 +- .../blenkernel/intern/gpencil_modifier_legacy.cc | 2 +- source/blender/blenkernel/intern/modifier.cc | 2 +- source/blender/blenkernel/intern/scene.cc | 2 +- source/blender/blenkernel/intern/screen.cc | 2 +- source/blender/blenkernel/intern/shader_fx.cc | 2 +- source/blender/blenloader/intern/readfile.cc | 2 +- source/blender/blenloader/intern/versioning_250.cc | 2 +- source/blender/blenloader/intern/versioning_260.cc | 2 +- source/blender/blenloader/intern/versioning_270.cc | 2 +- source/blender/blenloader/intern/versioning_280.cc | 2 +- source/blender/blenloader/intern/versioning_300.cc | 2 +- .../blender/blenloader/intern/versioning_defaults.cc | 2 +- source/blender/depsgraph/intern/depsgraph_tag.cc | 2 +- .../blender/draw/engines/eevee/eevee_motion_blur.cc | 2 +- source/blender/draw/intern/draw_manager_c.cc | 2 +- .../blender/editors/animation/anim_channels_edit.cc | 2 +- source/blender/editors/animation/anim_markers.cc | 2 +- source/blender/editors/animation/fmodifier_ui.cc | 2 +- source/blender/editors/armature/pose_slide.cc | 2 +- source/blender/editors/asset/intern/asset_list.cc | 2 +- source/blender/editors/asset/intern/asset_shelf.cc | 2 +- .../editors/asset/intern/asset_shelf_asset_view.cc | 2 +- .../asset/intern/asset_shelf_catalog_selector.cc | 2 +- .../blender/editors/geometry/node_group_operator.cc | 2 +- .../blender/editors/gpencil_legacy/annotate_paint.cc | 2 +- .../blender/editors/gpencil_legacy/gpencil_fill.cc | 2 +- .../blender/editors/gpencil_legacy/gpencil_paint.cc | 2 +- source/blender/editors/include/ED_geometry.hh | 2 +- .../interface/eyedroppers/eyedropper_color.cc | 2 +- .../interface/eyedroppers/eyedropper_datablock.cc | 2 +- .../interface/eyedroppers/eyedropper_depth.cc | 2 +- .../interface/eyedroppers/interface_eyedropper.cc | 2 +- source/blender/editors/interface/interface.cc | 2 +- .../editors/interface/interface_context_menu.cc | 2 +- .../editors/interface/interface_context_path.cc | 2 +- .../blender/editors/interface/interface_handlers.cc | 2 +- source/blender/editors/interface/interface_layout.cc | 2 +- source/blender/editors/interface/interface_ops.cc | 2 +- source/blender/editors/interface/interface_panel.cc | 2 +- .../editors/interface/interface_region_hud.cc | 2 +- .../editors/interface/interface_region_menu_pie.cc | 2 +- .../editors/interface/interface_region_menu_popup.cc | 2 +- .../editors/interface/interface_region_popover.cc | 2 +- .../editors/interface/interface_region_popup.cc | 2 +- .../editors/interface/interface_region_search.cc | 2 +- .../editors/interface/interface_region_tooltip.cc | 2 +- .../blender/editors/interface/interface_regions.cc | 2 +- .../interface/interface_template_asset_view.cc | 2 +- .../editors/interface/interface_template_list.cc | 2 +- .../interface/interface_template_search_menu.cc | 2 +- .../blender/editors/interface/interface_templates.cc | 2 +- source/blender/editors/interface/interface_utils.cc | 2 +- source/blender/editors/interface/view2d.cc | 2 +- .../editors/interface/views/interface_view.cc | 2 +- source/blender/editors/io/io_gpencil_export.cc | 2 +- source/blender/editors/io/io_gpencil_utils.cc | 2 +- source/blender/editors/mesh/editmesh_mask_extract.cc | 2 +- source/blender/editors/object/add_modifier_assets.cc | 2 +- source/blender/editors/object/object_bake_api.cc | 2 +- source/blender/editors/object/object_modes.cc | 2 +- source/blender/editors/physics/dynamicpaint_ops.cc | 2 +- source/blender/editors/physics/physics_fluid.cc | 2 +- source/blender/editors/render/render_internal.cc | 2 +- source/blender/editors/render/render_preview.cc | 2 +- source/blender/editors/render/render_view.cc | 2 +- source/blender/editors/screen/area.cc | 2 +- source/blender/editors/screen/area_utils.cc | 2 +- source/blender/editors/screen/screen_edit.cc | 2 +- source/blender/editors/screen/screen_geometry.cc | 2 +- source/blender/editors/screen/screen_ops.cc | 2 +- source/blender/editors/screen/screen_user_menu.cc | 2 +- source/blender/editors/screen/screendump.cc | 2 +- source/blender/editors/screen/workspace_edit.cc | 2 +- .../blender/editors/screen/workspace_layout_edit.cc | 2 +- .../blender/editors/sculpt_paint/paint_image_proj.cc | 2 +- source/blender/editors/sculpt_paint/sculpt_detail.cc | 2 +- .../blender/editors/space_action/action_buttons.cc | 2 +- source/blender/editors/space_action/space_action.cc | 2 +- source/blender/editors/space_api/spacetypes.cc | 2 +- .../blender/editors/space_buttons/buttons_context.cc | 2 +- source/blender/editors/space_buttons/buttons_ops.cc | 2 +- .../blender/editors/space_buttons/space_buttons.cc | 2 +- source/blender/editors/space_clip/clip_buttons.cc | 2 +- source/blender/editors/space_clip/space_clip.cc | 2 +- .../blender/editors/space_console/space_console.cc | 2 +- source/blender/editors/space_file/file_ops.cc | 2 +- source/blender/editors/space_file/file_panels.cc | 2 +- source/blender/editors/space_file/space_file.cc | 2 +- source/blender/editors/space_graph/graph_buttons.cc | 2 +- source/blender/editors/space_graph/graph_utils.cc | 2 +- source/blender/editors/space_graph/space_graph.cc | 2 +- source/blender/editors/space_image/image_buttons.cc | 2 +- source/blender/editors/space_image/space_image.cc | 2 +- source/blender/editors/space_info/info_ops.cc | 2 +- source/blender/editors/space_info/space_info.cc | 2 +- source/blender/editors/space_nla/nla_buttons.cc | 2 +- source/blender/editors/space_nla/nla_channels.cc | 2 +- source/blender/editors/space_nla/nla_draw.cc | 2 +- source/blender/editors/space_nla/nla_edit.cc | 2 +- source/blender/editors/space_nla/nla_ops.cc | 2 +- source/blender/editors/space_nla/nla_select.cc | 2 +- source/blender/editors/space_nla/space_nla.cc | 2 +- source/blender/editors/space_node/add_menu_assets.cc | 2 +- .../blender/editors/space_node/link_drag_search.cc | 2 +- .../blender/editors/space_node/node_context_path.cc | 2 +- .../blender/editors/space_node/node_relationships.cc | 2 +- source/blender/editors/space_node/node_view.cc | 2 +- source/blender/editors/space_node/space_node.cc | 2 +- .../blender/editors/space_outliner/outliner_tools.cc | 2 +- .../blender/editors/space_outliner/space_outliner.cc | 2 +- source/blender/editors/space_script/space_script.cc | 2 +- .../editors/space_sequencer/sequencer_buttons.cc | 2 +- .../space_sequencer/sequencer_channels_draw.cc | 2 +- .../editors/space_sequencer/space_sequencer.cc | 2 +- .../editors/space_spreadsheet/space_spreadsheet.cc | 2 +- .../editors/space_spreadsheet/spreadsheet_ops.cc | 2 +- .../editors/space_spreadsheet/spreadsheet_panels.cc | 2 +- .../space_spreadsheet/spreadsheet_row_filter_ui.cc | 2 +- .../editors/space_statusbar/space_statusbar.cc | 2 +- source/blender/editors/space_text/space_text.cc | 2 +- .../blender/editors/space_text/text_autocomplete.cc | 2 +- source/blender/editors/space_text/text_draw.cc | 2 +- source/blender/editors/space_text/text_header.cc | 2 +- source/blender/editors/space_topbar/space_topbar.cc | 2 +- .../blender/editors/space_userpref/space_userpref.cc | 2 +- source/blender/editors/space_view3d/space_view3d.cc | 2 +- .../blender/editors/space_view3d/view3d_buttons.cc | 2 +- .../editors/space_view3d/view3d_cursor_snap.cc | 2 +- source/blender/editors/space_view3d/view3d_edit.cc | 2 +- .../blender/editors/space_view3d/view3d_navigate.cc | 2 +- .../space_view3d/view3d_navigate_view_axis.cc | 2 +- .../space_view3d/view3d_navigate_view_camera.cc | 2 +- .../view3d_navigate_view_center_cursor.cc | 2 +- .../space_view3d/view3d_navigate_view_center_pick.cc | 2 +- .../space_view3d/view3d_navigate_view_orbit.cc | 2 +- .../editors/space_view3d/view3d_navigate_view_pan.cc | 2 +- .../space_view3d/view3d_navigate_view_zoom.cc | 2 +- .../blender/editors/space_view3d/view3d_project.cc | 2 +- source/blender/editors/space_view3d/view3d_utils.cc | 2 +- source/blender/editors/undo/ed_undo.cc | 2 +- source/blender/editors/util/ed_util.cc | 2 +- source/blender/editors/util/ed_util_imbuf.cc | 2 +- source/blender/editors/uvedit/uvedit_buttons.cc | 2 +- .../intern/MOD_gpencil_legacy_armature.cc | 2 +- .../intern/MOD_gpencil_legacy_array.cc | 2 +- .../intern/MOD_gpencil_legacy_build.cc | 2 +- .../intern/MOD_gpencil_legacy_color.cc | 2 +- .../intern/MOD_gpencil_legacy_dash.cc | 2 +- .../intern/MOD_gpencil_legacy_envelope.cc | 2 +- .../intern/MOD_gpencil_legacy_hook.cc | 2 +- .../intern/MOD_gpencil_legacy_lattice.cc | 2 +- .../intern/MOD_gpencil_legacy_length.cc | 2 +- .../intern/MOD_gpencil_legacy_lineart.cc | 2 +- .../intern/MOD_gpencil_legacy_mirror.cc | 2 +- .../intern/MOD_gpencil_legacy_multiply.cc | 2 +- .../intern/MOD_gpencil_legacy_noise.cc | 2 +- .../intern/MOD_gpencil_legacy_offset.cc | 2 +- .../intern/MOD_gpencil_legacy_opacity.cc | 2 +- .../intern/MOD_gpencil_legacy_outline.cc | 2 +- .../intern/MOD_gpencil_legacy_shrinkwrap.cc | 2 +- .../intern/MOD_gpencil_legacy_simplify.cc | 2 +- .../intern/MOD_gpencil_legacy_smooth.cc | 2 +- .../intern/MOD_gpencil_legacy_subdiv.cc | 2 +- .../intern/MOD_gpencil_legacy_texture.cc | 2 +- .../intern/MOD_gpencil_legacy_thick.cc | 2 +- .../intern/MOD_gpencil_legacy_time.cc | 2 +- .../intern/MOD_gpencil_legacy_tint.cc | 2 +- .../intern/MOD_gpencil_legacy_ui_common.cc | 2 +- .../intern/MOD_gpencil_legacy_weight_angle.cc | 2 +- .../intern/MOD_gpencil_legacy_weight_proximity.cc | 2 +- source/blender/io/alembic/intern/alembic_capi.cc | 2 +- source/blender/makesrna/intern/rna_scene.cc | 2 +- source/blender/makesrna/intern/rna_screen.cc | 2 +- source/blender/makesrna/intern/rna_space.cc | 2 +- source/blender/makesrna/intern/rna_timeline.cc | 2 +- source/blender/makesrna/intern/rna_ui.cc | 4 ++-- source/blender/makesrna/intern/rna_userdef.cc | 2 +- source/blender/makesrna/intern/rna_wm.cc | 2 +- source/blender/modifiers/intern/MOD_armature.cc | 2 +- source/blender/modifiers/intern/MOD_array.cc | 2 +- source/blender/modifiers/intern/MOD_bevel.cc | 2 +- source/blender/modifiers/intern/MOD_build.cc | 2 +- source/blender/modifiers/intern/MOD_cast.cc | 2 +- source/blender/modifiers/intern/MOD_cloth.cc | 2 +- source/blender/modifiers/intern/MOD_collision.cc | 2 +- .../blender/modifiers/intern/MOD_correctivesmooth.cc | 2 +- source/blender/modifiers/intern/MOD_curve.cc | 2 +- source/blender/modifiers/intern/MOD_datatransfer.cc | 2 +- source/blender/modifiers/intern/MOD_decimate.cc | 2 +- source/blender/modifiers/intern/MOD_displace.cc | 2 +- source/blender/modifiers/intern/MOD_dynamicpaint.cc | 2 +- source/blender/modifiers/intern/MOD_edgesplit.cc | 2 +- source/blender/modifiers/intern/MOD_explode.cc | 2 +- source/blender/modifiers/intern/MOD_fluid.cc | 2 +- source/blender/modifiers/intern/MOD_hook.cc | 2 +- .../blender/modifiers/intern/MOD_laplaciandeform.cc | 2 +- .../blender/modifiers/intern/MOD_laplaciansmooth.cc | 2 +- source/blender/modifiers/intern/MOD_lattice.cc | 2 +- source/blender/modifiers/intern/MOD_mask.cc | 2 +- source/blender/modifiers/intern/MOD_meshcache.cc | 2 +- source/blender/modifiers/intern/MOD_meshdeform.cc | 2 +- .../modifiers/intern/MOD_meshsequencecache.cc | 2 +- source/blender/modifiers/intern/MOD_mirror.cc | 2 +- source/blender/modifiers/intern/MOD_multires.cc | 2 +- source/blender/modifiers/intern/MOD_nodes.cc | 2 +- source/blender/modifiers/intern/MOD_normal_edit.cc | 2 +- source/blender/modifiers/intern/MOD_ocean.cc | 2 +- .../blender/modifiers/intern/MOD_particleinstance.cc | 2 +- .../blender/modifiers/intern/MOD_particlesystem.cc | 2 +- source/blender/modifiers/intern/MOD_remesh.cc | 2 +- source/blender/modifiers/intern/MOD_screw.cc | 2 +- source/blender/modifiers/intern/MOD_shrinkwrap.cc | 2 +- source/blender/modifiers/intern/MOD_simpledeform.cc | 2 +- source/blender/modifiers/intern/MOD_skin.cc | 2 +- source/blender/modifiers/intern/MOD_smooth.cc | 2 +- source/blender/modifiers/intern/MOD_softbody.cc | 2 +- source/blender/modifiers/intern/MOD_solidify.cc | 2 +- source/blender/modifiers/intern/MOD_subsurf.cc | 2 +- source/blender/modifiers/intern/MOD_surface.cc | 2 +- source/blender/modifiers/intern/MOD_surfacedeform.cc | 2 +- source/blender/modifiers/intern/MOD_triangulate.cc | 2 +- source/blender/modifiers/intern/MOD_ui_common.cc | 2 +- source/blender/modifiers/intern/MOD_uvproject.cc | 2 +- source/blender/modifiers/intern/MOD_uvwarp.cc | 2 +- source/blender/modifiers/intern/MOD_warp.cc | 2 +- source/blender/modifiers/intern/MOD_wave.cc | 2 +- .../blender/modifiers/intern/MOD_weighted_normal.cc | 2 +- source/blender/modifiers/intern/MOD_weightvgedit.cc | 2 +- source/blender/modifiers/intern/MOD_weightvgmix.cc | 2 +- .../modifiers/intern/MOD_weightvgproximity.cc | 2 +- source/blender/modifiers/intern/MOD_weld.cc | 2 +- source/blender/modifiers/intern/MOD_wireframe.cc | 2 +- source/blender/python/intern/bpy_rna_callback.cc | 2 +- source/blender/shader_fx/intern/FX_shader_blur.cc | 2 +- .../blender/shader_fx/intern/FX_shader_colorize.cc | 2 +- source/blender/shader_fx/intern/FX_shader_flip.cc | 2 +- source/blender/shader_fx/intern/FX_shader_glow.cc | 2 +- source/blender/shader_fx/intern/FX_shader_pixel.cc | 2 +- source/blender/shader_fx/intern/FX_shader_rim.cc | 2 +- source/blender/shader_fx/intern/FX_shader_shadow.cc | 2 +- source/blender/shader_fx/intern/FX_shader_swirl.cc | 2 +- source/blender/shader_fx/intern/FX_shader_wave.cc | 2 +- source/blender/shader_fx/intern/FX_ui_common.cc | 2 +- source/blender/windowmanager/intern/wm.cc | 2 +- source/blender/windowmanager/intern/wm_dragdrop.cc | 2 +- source/blender/windowmanager/intern/wm_draw.cc | 2 +- .../blender/windowmanager/intern/wm_event_system.cc | 2 +- source/blender/windowmanager/intern/wm_files.cc | 2 +- source/blender/windowmanager/intern/wm_init_exit.cc | 2 +- source/blender/windowmanager/intern/wm_keymap.cc | 2 +- source/blender/windowmanager/intern/wm_menu_type.cc | 2 +- source/blender/windowmanager/intern/wm_operators.cc | 2 +- source/blender/windowmanager/intern/wm_panel_type.cc | 2 +- .../blender/windowmanager/intern/wm_splash_screen.cc | 2 +- .../blender/windowmanager/intern/wm_uilist_type.cc | 2 +- source/blender/windowmanager/intern/wm_window.cc | 2 +- .../windowmanager/xr/intern/wm_xr_operators.cc | 2 +- .../blender/windowmanager/xr/intern/wm_xr_session.cc | 2 +- 264 files changed, 264 insertions(+), 276 deletions(-) rename source/blender/blenkernel/{BKE_screen.h => BKE_screen.hh} (99%) diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.hh similarity index 99% rename from source/blender/blenkernel/BKE_screen.h rename to source/blender/blenkernel/BKE_screen.hh index 77ebdc3df75..9dae08f621c 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.hh @@ -13,18 +13,10 @@ #include "BKE_context.h" -#ifdef __cplusplus namespace blender::asset_system { class AssetRepresentation; } using AssetRepresentationHandle = blender::asset_system::AssetRepresentation; -#else -typedef struct AssetRepresentationHandle AssetRepresentationHandle; -#endif - -#ifdef __cplusplus -extern "C" { -#endif struct ARegion; struct BlendDataReader; @@ -671,7 +663,3 @@ void BKE_screen_area_blend_read_after_liblink(struct BlendLibReader *reader, * Cannot use #IDTypeInfo callback yet, because of the return value. */ bool BKE_screen_blend_read_data(struct BlendDataReader *reader, struct bScreen *screen); - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 9b0382d6659..e46439cccaa 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -479,7 +479,7 @@ set(SRC BKE_report.h BKE_rigidbody.h BKE_scene.h - BKE_screen.h + BKE_screen.hh BKE_sequencer_offscreen.h BKE_shader_fx.h BKE_shrinkwrap.h diff --git a/source/blender/blenkernel/intern/blender.cc b/source/blender/blenkernel/intern/blender.cc index bae593f44f2..fa576b424e8 100644 --- a/source/blender/blenkernel/intern/blender.cc +++ b/source/blender/blenkernel/intern/blender.cc @@ -37,7 +37,7 @@ #include "BKE_node.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_studiolight.h" #include "DEG_depsgraph.hh" diff --git a/source/blender/blenkernel/intern/blendfile.cc b/source/blender/blenkernel/intern/blendfile.cc index 11ca3cda8a7..f162faeff22 100644 --- a/source/blender/blenkernel/intern/blendfile.cc +++ b/source/blender/blenkernel/intern/blendfile.cc @@ -53,7 +53,7 @@ #include "BKE_preferences.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_studiolight.h" #include "BKE_undo_system.h" #include "BKE_workspace.h" diff --git a/source/blender/blenkernel/intern/camera.cc b/source/blender/blenkernel/intern/camera.cc index 41e75f59b25..ff219d3e394 100644 --- a/source/blender/blenkernel/intern/camera.cc +++ b/source/blender/blenkernel/intern/camera.cc @@ -39,7 +39,7 @@ #include "BKE_main.h" #include "BKE_object.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLT_translation.h" diff --git a/source/blender/blenkernel/intern/context.cc b/source/blender/blenkernel/intern/context.cc index a7d6e4138f7..69ead24855b 100644 --- a/source/blender/blenkernel/intern/context.cc +++ b/source/blender/blenkernel/intern/context.cc @@ -36,7 +36,7 @@ #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_sound.h" #include "BKE_workspace.h" diff --git a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc index 377b5074a3d..81c79440449 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc +++ b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc @@ -40,7 +40,7 @@ #include "BKE_material.h" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_shrinkwrap.h" #include "DEG_depsgraph.hh" diff --git a/source/blender/blenkernel/intern/modifier.cc b/source/blender/blenkernel/intern/modifier.cc index 47b8cae664a..872dadf10cf 100644 --- a/source/blender/blenkernel/intern/modifier.cc +++ b/source/blender/blenkernel/intern/modifier.cc @@ -61,7 +61,7 @@ #include "BKE_multires.hh" #include "BKE_object.h" #include "BKE_pointcache.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" /* may move these, only for BKE_modifier_path_relbase */ #include "BKE_main.h" diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index 9bbdfc3273f..29c016a7d0a 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -86,7 +86,7 @@ #include "BKE_preview_image.hh" #include "BKE_rigidbody.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_sound.h" #include "BKE_unit.h" #include "BKE_workspace.h" diff --git a/source/blender/blenkernel/intern/screen.cc b/source/blender/blenkernel/intern/screen.cc index 0511b573207..bf864d88d1d 100644 --- a/source/blender/blenkernel/intern/screen.cc +++ b/source/blender/blenkernel/intern/screen.cc @@ -47,7 +47,7 @@ #include "BKE_lib_query.h" #include "BKE_node.h" #include "BKE_preview_image.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_viewer_path.h" #include "BKE_workspace.h" diff --git a/source/blender/blenkernel/intern/shader_fx.cc b/source/blender/blenkernel/intern/shader_fx.cc index 261065a7a52..5a13e89cbd1 100644 --- a/source/blender/blenkernel/intern/shader_fx.cc +++ b/source/blender/blenkernel/intern/shader_fx.cc @@ -28,7 +28,7 @@ #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_object.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_shader_fx.h" #include "DEG_depsgraph.hh" diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index e04c5b9b98a..693d4143701 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -85,7 +85,7 @@ #include "BKE_packedFile.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_undo_system.h" #include "BKE_workspace.h" diff --git a/source/blender/blenloader/intern/versioning_250.cc b/source/blender/blenloader/intern/versioning_250.cc index 68693513dd6..f6a1e6d1c84 100644 --- a/source/blender/blenloader/intern/versioning_250.cc +++ b/source/blender/blenloader/intern/versioning_250.cc @@ -65,7 +65,7 @@ #include "BKE_node_tree_update.h" #include "BKE_particle.h" #include "BKE_pointcache.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_sound.h" #include "BKE_texture.h" diff --git a/source/blender/blenloader/intern/versioning_260.cc b/source/blender/blenloader/intern/versioning_260.cc index cbdce6ae685..ac5dbbfca4d 100644 --- a/source/blender/blenloader/intern/versioning_260.cc +++ b/source/blender/blenloader/intern/versioning_260.cc @@ -62,7 +62,7 @@ #include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_text.h" /* for txt_extended_ascii_as_utf8 */ #include "BKE_texture.h" #include "BKE_tracking.h" diff --git a/source/blender/blenloader/intern/versioning_270.cc b/source/blender/blenloader/intern/versioning_270.cc index 0a9af003a0c..20a7568e74c 100644 --- a/source/blender/blenloader/intern/versioning_270.cc +++ b/source/blender/blenloader/intern/versioning_270.cc @@ -55,7 +55,7 @@ #include "BKE_modifier.h" #include "BKE_node.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_tracking.h" #include "DNA_material_types.h" diff --git a/source/blender/blenloader/intern/versioning_280.cc b/source/blender/blenloader/intern/versioning_280.cc index d9f92ab0fdc..ac9c22b3108 100644 --- a/source/blender/blenloader/intern/versioning_280.cc +++ b/source/blender/blenloader/intern/versioning_280.cc @@ -88,7 +88,7 @@ #include "BKE_pointcache.h" #include "BKE_report.h" #include "BKE_rigidbody.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_studiolight.h" #include "BKE_unit.h" #include "BKE_workspace.h" diff --git a/source/blender/blenloader/intern/versioning_300.cc b/source/blender/blenloader/intern/versioning_300.cc index e62a0fbeb94..80b486ef225 100644 --- a/source/blender/blenloader/intern/versioning_300.cc +++ b/source/blender/blenloader/intern/versioning_300.cc @@ -76,7 +76,7 @@ #include "BKE_modifier.h" #include "BKE_nla.h" #include "BKE_node.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_workspace.h" #include "RNA_access.hh" diff --git a/source/blender/blenloader/intern/versioning_defaults.cc b/source/blender/blenloader/intern/versioning_defaults.cc index 195bcd43d30..774b0f2b947 100644 --- a/source/blender/blenloader/intern/versioning_defaults.cc +++ b/source/blender/blenloader/intern/versioning_defaults.cc @@ -58,7 +58,7 @@ #include "BKE_node_runtime.hh" #include "BKE_node_tree_update.h" #include "BKE_paint.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_workspace.h" #include "BLO_readfile.h" diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index 3507cd8b449..f99fc7ac32e 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -33,7 +33,7 @@ #include "BKE_idtype.h" #include "BKE_node.hh" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_workspace.h" #include "DEG_depsgraph.hh" diff --git a/source/blender/draw/engines/eevee/eevee_motion_blur.cc b/source/blender/draw/engines/eevee/eevee_motion_blur.cc index c530c9a8713..3f27e094bbc 100644 --- a/source/blender/draw/engines/eevee/eevee_motion_blur.cc +++ b/source/blender/draw/engines/eevee/eevee_motion_blur.cc @@ -17,7 +17,7 @@ #include "BKE_camera.h" #include "BKE_duplilist.h" #include "BKE_object.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DNA_anim_types.h" #include "DNA_camera_types.h" diff --git a/source/blender/draw/intern/draw_manager_c.cc b/source/blender/draw/intern/draw_manager_c.cc index 94f4b3a1831..c27c6123715 100644 --- a/source/blender/draw/intern/draw_manager_c.cc +++ b/source/blender/draw/intern/draw_manager_c.cc @@ -37,7 +37,7 @@ #include "BKE_particle.h" #include "BKE_pointcache.h" #include "BKE_pointcloud.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_subdiv_modifier.hh" #include "BKE_viewer_path.h" #include "BKE_volume.h" diff --git a/source/blender/editors/animation/anim_channels_edit.cc b/source/blender/editors/animation/anim_channels_edit.cc index ce7b524378d..c7d0fff8072 100644 --- a/source/blender/editors/animation/anim_channels_edit.cc +++ b/source/blender/editors/animation/anim_channels_edit.cc @@ -38,7 +38,7 @@ #include "BKE_mask.h" #include "BKE_nla.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_build.hh" diff --git a/source/blender/editors/animation/anim_markers.cc b/source/blender/editors/animation/anim_markers.cc index 56f832e01b8..e9608b7905b 100644 --- a/source/blender/editors/animation/anim_markers.cc +++ b/source/blender/editors/animation/anim_markers.cc @@ -25,7 +25,7 @@ #include "BKE_main.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_unit.h" #include "RNA_access.hh" diff --git a/source/blender/editors/animation/fmodifier_ui.cc b/source/blender/editors/animation/fmodifier_ui.cc index db1d9e935ea..ddc3bab1b50 100644 --- a/source/blender/editors/animation/fmodifier_ui.cc +++ b/source/blender/editors/animation/fmodifier_ui.cc @@ -28,7 +28,7 @@ #include "BKE_context.h" #include "BKE_fcurve.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/armature/pose_slide.cc b/source/blender/editors/armature/pose_slide.cc index 07b604deef9..e55731b9b12 100644 --- a/source/blender/editors/armature/pose_slide.cc +++ b/source/blender/editors/armature/pose_slide.cc @@ -50,7 +50,7 @@ #include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_unit.h" #include "RNA_access.hh" diff --git a/source/blender/editors/asset/intern/asset_list.cc b/source/blender/editors/asset/intern/asset_list.cc index 91997a9b029..be94ca67610 100644 --- a/source/blender/editors/asset/intern/asset_list.cc +++ b/source/blender/editors/asset/intern/asset_list.cc @@ -18,7 +18,7 @@ #include "AS_asset_library.hh" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLI_map.hh" #include "BLI_string.h" diff --git a/source/blender/editors/asset/intern/asset_shelf.cc b/source/blender/editors/asset/intern/asset_shelf.cc index 78ab19593ad..5884fc07348 100644 --- a/source/blender/editors/asset/intern/asset_shelf.cc +++ b/source/blender/editors/asset/intern/asset_shelf.cc @@ -16,7 +16,7 @@ #include "BKE_context.h" #include "BKE_main.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLT_translation.h" 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 8ef2413c378..480e6d7c330 100644 --- a/source/blender/editors/asset/intern/asset_shelf_asset_view.cc +++ b/source/blender/editors/asset/intern/asset_shelf_asset_view.cc @@ -11,7 +11,7 @@ #include "AS_asset_library.hh" #include "AS_asset_representation.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLI_fnmatch.h" #include "BLI_string.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 25ec6477538..0f5c60d1150 100644 --- a/source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc +++ b/source/blender/editors/asset/intern/asset_shelf_catalog_selector.cc @@ -17,7 +17,7 @@ #include "DNA_screen_types.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/geometry/node_group_operator.cc b/source/blender/editors/geometry/node_group_operator.cc index b047fa236f0..b621756d0d6 100644 --- a/source/blender/editors/geometry/node_group_operator.cc +++ b/source/blender/editors/geometry/node_group_operator.cc @@ -32,7 +32,7 @@ #include "BKE_object.h" #include "BKE_pointcloud.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DNA_object_types.h" #include "DNA_scene_types.h" diff --git a/source/blender/editors/gpencil_legacy/annotate_paint.cc b/source/blender/editors/gpencil_legacy/annotate_paint.cc index ea9aa4fec06..ac2b4f38684 100644 --- a/source/blender/editors/gpencil_legacy/annotate_paint.cc +++ b/source/blender/editors/gpencil_legacy/annotate_paint.cc @@ -30,7 +30,7 @@ #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_tracking.h" #include "DNA_gpencil_legacy_types.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_fill.cc b/source/blender/editors/gpencil_legacy/gpencil_fill.cc index 6e8fec16ba3..0c86c0864e3 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_fill.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_fill.cc @@ -37,7 +37,7 @@ #include "BKE_material.h" #include "BKE_paint.hh" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_gpencil_legacy.hh" #include "ED_keyframing.hh" diff --git a/source/blender/editors/gpencil_legacy/gpencil_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_paint.cc index a7685b5b6db..d6adbe31987 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_paint.cc @@ -48,7 +48,7 @@ #include "BKE_material.h" #include "BKE_paint.hh" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_tracking.h" #include "UI_view2d.hh" diff --git a/source/blender/editors/include/ED_geometry.hh b/source/blender/editors/include/ED_geometry.hh index 90c1208ff62..08e810f3bae 100644 --- a/source/blender/editors/include/ED_geometry.hh +++ b/source/blender/editors/include/ED_geometry.hh @@ -13,7 +13,7 @@ #include "DNA_customdata_types.h" #include "BKE_attribute.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" struct Mesh; struct ReportList; diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_color.cc b/source/blender/editors/interface/eyedroppers/eyedropper_color.cc index 83daca63536..11e2961ac94 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_color.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_color.cc @@ -25,7 +25,7 @@ #include "BKE_image.h" #include "BKE_main.h" #include "BKE_node.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "NOD_composite.h" diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc b/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc index 4b715f50272..bed31872679 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_datablock.cc @@ -25,7 +25,7 @@ #include "BKE_context.h" #include "BKE_idtype.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "RNA_access.hh" diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc b/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc index 0a71a38b7ab..3ce8769111d 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_depth.cc @@ -24,7 +24,7 @@ #include "BKE_context.h" #include "BKE_lib_id.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_unit.h" #include "RNA_access.hh" diff --git a/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc b/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc index 44e7bd34753..52adb636bcb 100644 --- a/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc +++ b/source/blender/editors/interface/eyedroppers/interface_eyedropper.cc @@ -13,7 +13,7 @@ #include "BLI_math_vector.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" diff --git a/source/blender/editors/interface/interface.cc b/source/blender/editors/interface/interface.cc index 3a771e9fb4d..dd2e0a1eb71 100644 --- a/source/blender/editors/interface/interface.cc +++ b/source/blender/editors/interface/interface.cc @@ -38,7 +38,7 @@ #include "BKE_main.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_unit.h" #include "ED_asset.hh" diff --git a/source/blender/editors/interface/interface_context_menu.cc b/source/blender/editors/interface/interface_context_menu.cc index edf08a1f7e6..4f5d7cd5a29 100644 --- a/source/blender/editors/interface/interface_context_menu.cc +++ b/source/blender/editors/interface/interface_context_menu.cc @@ -24,7 +24,7 @@ #include "BKE_addon.h" #include "BKE_context.h" #include "BKE_idprop.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_asset.hh" #include "ED_keyframing.hh" diff --git a/source/blender/editors/interface/interface_context_path.cc b/source/blender/editors/interface/interface_context_path.cc index cae3eb96b91..5d319284db9 100644 --- a/source/blender/editors/interface/interface_context_path.cc +++ b/source/blender/editors/interface/interface_context_path.cc @@ -8,7 +8,7 @@ #include "BLI_vector.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "RNA_access.hh" diff --git a/source/blender/editors/interface/interface_handlers.cc b/source/blender/editors/interface/interface_handlers.cc index 18984883344..0ff7df353cc 100644 --- a/source/blender/editors/interface/interface_handlers.cc +++ b/source/blender/editors/interface/interface_handlers.cc @@ -44,7 +44,7 @@ #include "BKE_movieclip.h" #include "BKE_paint.hh" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_tracking.h" #include "BKE_unit.h" diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc index 39640c03856..1fb5268ccca 100644 --- a/source/blender/editors/interface/interface_layout.cc +++ b/source/blender/editors/interface/interface_layout.cc @@ -31,7 +31,7 @@ #include "BKE_context.h" #include "BKE_global.h" #include "BKE_idprop.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "RNA_access.hh" #include "RNA_prototypes.h" diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc index 63dd681380c..78fbcbb830e 100644 --- a/source/blender/editors/interface/interface_ops.cc +++ b/source/blender/editors/interface/interface_ops.cc @@ -35,7 +35,7 @@ #include "BKE_material.h" #include "BKE_node.hh" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_text.h" #include "IMB_colormanagement.h" diff --git a/source/blender/editors/interface/interface_panel.cc b/source/blender/editors/interface/interface_panel.cc index 99b246675b8..f25093cbc96 100644 --- a/source/blender/editors/interface/interface_panel.cc +++ b/source/blender/editors/interface/interface_panel.cc @@ -27,7 +27,7 @@ #include "DNA_userdef_types.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "RNA_access.hh" diff --git a/source/blender/editors/interface/interface_region_hud.cc b/source/blender/editors/interface/interface_region_hud.cc index 8bf55691b1e..3474bb442c7 100644 --- a/source/blender/editors/interface/interface_region_hud.cc +++ b/source/blender/editors/interface/interface_region_hud.cc @@ -21,7 +21,7 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/interface/interface_region_menu_pie.cc b/source/blender/editors/interface/interface_region_menu_pie.cc index 1aa06ee3709..a29c4e7f8cd 100644 --- a/source/blender/editors/interface/interface_region_menu_pie.cc +++ b/source/blender/editors/interface/interface_region_menu_pie.cc @@ -22,7 +22,7 @@ #include "PIL_time.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/interface/interface_region_menu_popup.cc b/source/blender/editors/interface/interface_region_menu_popup.cc index 6649c3f0ee0..a6f369452e4 100644 --- a/source/blender/editors/interface/interface_region_menu_popup.cc +++ b/source/blender/editors/interface/interface_region_menu_popup.cc @@ -26,7 +26,7 @@ #include "BKE_context.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/interface/interface_region_popover.cc b/source/blender/editors/interface/interface_region_popover.cc index 8b36a22e4eb..98625513e3d 100644 --- a/source/blender/editors/interface/interface_region_popover.cc +++ b/source/blender/editors/interface/interface_region_popover.cc @@ -37,7 +37,7 @@ #include "BKE_context.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/interface/interface_region_popup.cc b/source/blender/editors/interface/interface_region_popup.cc index 7a9ac6f01f3..d053205d0ee 100644 --- a/source/blender/editors/interface/interface_region_popup.cc +++ b/source/blender/editors/interface/interface_region_popup.cc @@ -22,7 +22,7 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/interface/interface_region_search.cc b/source/blender/editors/interface/interface_region_search.cc index c0d20b3781c..f26a3bceec9 100644 --- a/source/blender/editors/interface/interface_region_search.cc +++ b/source/blender/editors/interface/interface_region_search.cc @@ -24,7 +24,7 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/interface/interface_region_tooltip.cc b/source/blender/editors/interface/interface_region_tooltip.cc index 5d4e87f334d..4f86861003c 100644 --- a/source/blender/editors/interface/interface_region_tooltip.cc +++ b/source/blender/editors/interface/interface_region_tooltip.cc @@ -35,7 +35,7 @@ #include "BKE_context.h" #include "BKE_paint.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BIF_glutil.hh" diff --git a/source/blender/editors/interface/interface_regions.cc b/source/blender/editors/interface/interface_regions.cc index 276d2bb6b8e..1fdeabee9a2 100644 --- a/source/blender/editors/interface/interface_regions.cc +++ b/source/blender/editors/interface/interface_regions.cc @@ -15,7 +15,7 @@ #include "MEM_guardedalloc.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "WM_api.hh" #include "wm_draw.hh" diff --git a/source/blender/editors/interface/interface_template_asset_view.cc b/source/blender/editors/interface/interface_template_asset_view.cc index a848c882a5f..3b00950be4a 100644 --- a/source/blender/editors/interface/interface_template_asset_view.cc +++ b/source/blender/editors/interface/interface_template_asset_view.cc @@ -11,7 +11,7 @@ #include "DNA_space_types.h" #include "DNA_userdef_types.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLI_path_util.h" #include "BLI_string.h" diff --git a/source/blender/editors/interface/interface_template_list.cc b/source/blender/editors/interface/interface_template_list.cc index 2e03896beae..7184cfe73a3 100644 --- a/source/blender/editors/interface/interface_template_list.cc +++ b/source/blender/editors/interface/interface_template_list.cc @@ -17,7 +17,7 @@ #include "BLI_string_ref.hh" #include "BLI_utildefines.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/interface/interface_template_search_menu.cc b/source/blender/editors/interface/interface_template_search_menu.cc index d8a1c8689fe..7ec732370fd 100644 --- a/source/blender/editors/interface/interface_template_search_menu.cc +++ b/source/blender/editors/interface/interface_template_search_menu.cc @@ -38,7 +38,7 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/interface/interface_templates.cc b/source/blender/editors/interface/interface_templates.cc index ede3457e3f8..38671ad9c90 100644 --- a/source/blender/editors/interface/interface_templates.cc +++ b/source/blender/editors/interface/interface_templates.cc @@ -65,7 +65,7 @@ #include "BKE_particle.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_shader_fx.h" #include "DEG_depsgraph.hh" diff --git a/source/blender/editors/interface/interface_utils.cc b/source/blender/editors/interface/interface_utils.cc index a31a2af4bd8..f5a2e2d8e0e 100644 --- a/source/blender/editors/interface/interface_utils.cc +++ b/source/blender/editors/interface/interface_utils.cc @@ -27,7 +27,7 @@ #include "BKE_idprop.h" #include "BKE_lib_id.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/interface/view2d.cc b/source/blender/editors/interface/view2d.cc index d3c09777acd..155a271a906 100644 --- a/source/blender/editors/interface/view2d.cc +++ b/source/blender/editors/interface/view2d.cc @@ -29,7 +29,7 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "GPU_immediate.h" #include "GPU_matrix.h" diff --git a/source/blender/editors/interface/views/interface_view.cc b/source/blender/editors/interface/views/interface_view.cc index f00e6f827bc..c25560a9e14 100644 --- a/source/blender/editors/interface/views/interface_view.cc +++ b/source/blender/editors/interface/views/interface_view.cc @@ -23,7 +23,7 @@ #include "DNA_screen_types.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLI_listbase.h" #include "BLI_map.hh" diff --git a/source/blender/editors/io/io_gpencil_export.cc b/source/blender/editors/io/io_gpencil_export.cc index 54f7f133db0..899d9becf90 100644 --- a/source/blender/editors/io/io_gpencil_export.cc +++ b/source/blender/editors/io/io_gpencil_export.cc @@ -17,7 +17,7 @@ # include "BKE_gpencil_legacy.h" # include "BKE_main.h" # include "BKE_report.h" -# include "BKE_screen.h" +# include "BKE_screen.hh" # include "BLT_translation.h" diff --git a/source/blender/editors/io/io_gpencil_utils.cc b/source/blender/editors/io/io_gpencil_utils.cc index fd19f7289dd..b24cf451988 100644 --- a/source/blender/editors/io/io_gpencil_utils.cc +++ b/source/blender/editors/io/io_gpencil_utils.cc @@ -11,7 +11,7 @@ # include "DNA_space_types.h" # include "BKE_context.h" -# include "BKE_screen.h" +# include "BKE_screen.hh" # include "WM_api.hh" diff --git a/source/blender/editors/mesh/editmesh_mask_extract.cc b/source/blender/editors/mesh/editmesh_mask_extract.cc index 0b2760ffe12..3a2dbe34f0a 100644 --- a/source/blender/editors/mesh/editmesh_mask_extract.cc +++ b/source/blender/editors/mesh/editmesh_mask_extract.cc @@ -20,7 +20,7 @@ #include "BKE_modifier.h" #include "BKE_paint.hh" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_shrinkwrap.h" #include "BLI_math_vector.h" diff --git a/source/blender/editors/object/add_modifier_assets.cc b/source/blender/editors/object/add_modifier_assets.cc index 62e381c21ad..41cb7d34556 100644 --- a/source/blender/editors/object/add_modifier_assets.cc +++ b/source/blender/editors/object/add_modifier_assets.cc @@ -19,7 +19,7 @@ #include "BKE_idprop.h" #include "BKE_lib_id.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/object/object_bake_api.cc b/source/blender/editors/object/object_bake_api.cc index 4353e86e096..18268041a86 100644 --- a/source/blender/editors/object/object_bake_api.cc +++ b/source/blender/editors/object/object_bake_api.cc @@ -41,7 +41,7 @@ #include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_build.hh" diff --git a/source/blender/editors/object/object_modes.cc b/source/blender/editors/object/object_modes.cc index 81343d4a0ba..3372ec96553 100644 --- a/source/blender/editors/object/object_modes.cc +++ b/source/blender/editors/object/object_modes.cc @@ -30,7 +30,7 @@ #include "BKE_paint.hh" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLI_math_vector.h" diff --git a/source/blender/editors/physics/dynamicpaint_ops.cc b/source/blender/editors/physics/dynamicpaint_ops.cc index f9b6c4c74cb..b411c2097eb 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.cc +++ b/source/blender/editors/physics/dynamicpaint_ops.cc @@ -32,7 +32,7 @@ #include "BKE_modifier.h" #include "BKE_object_deform.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_build.hh" diff --git a/source/blender/editors/physics/physics_fluid.cc b/source/blender/editors/physics/physics_fluid.cc index 0819382e175..6f11694c486 100644 --- a/source/blender/editors/physics/physics_fluid.cc +++ b/source/blender/editors/physics/physics_fluid.cc @@ -29,7 +29,7 @@ #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" diff --git a/source/blender/editors/render/render_internal.cc b/source/blender/editors/render/render_internal.cc index bcb6b6e0177..4b48c288b64 100644 --- a/source/blender/editors/render/render_internal.cc +++ b/source/blender/editors/render/render_internal.cc @@ -42,7 +42,7 @@ #include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "NOD_composite.h" diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc index 851f507d2c8..f8cfbe31c20 100644 --- a/source/blender/editors/render/render_preview.cc +++ b/source/blender/editors/render/render_preview.cc @@ -62,7 +62,7 @@ #include "BKE_pose_backup.h" #include "BKE_preview_image.hh" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_texture.h" #include "BKE_world.h" diff --git a/source/blender/editors/render/render_view.cc b/source/blender/editors/render/render_view.cc index c46ad2ae1ac..7f1e07cd5b8 100644 --- a/source/blender/editors/render/render_view.cc +++ b/source/blender/editors/render/render_view.cc @@ -21,7 +21,7 @@ #include "BKE_main.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/screen/area.cc b/source/blender/editors/screen/area.cc index 12f01a6cd0b..bc8373288e3 100644 --- a/source/blender/editors/screen/area.cc +++ b/source/blender/editors/screen/area.cc @@ -22,7 +22,7 @@ #include "BKE_context.h" #include "BKE_global.h" #include "BKE_image.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_workspace.h" #include "RNA_access.hh" diff --git a/source/blender/editors/screen/area_utils.cc b/source/blender/editors/screen/area_utils.cc index 961c146a180..585192d76be 100644 --- a/source/blender/editors/screen/area_utils.cc +++ b/source/blender/editors/screen/area_utils.cc @@ -10,7 +10,7 @@ #include "DNA_userdef_types.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLI_blenlib.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/screen/screen_edit.cc b/source/blender/editors/screen/screen_edit.cc index bd9f0dc3f0a..7afd54aa614 100644 --- a/source/blender/editors/screen/screen_edit.cc +++ b/source/blender/editors/screen/screen_edit.cc @@ -27,7 +27,7 @@ #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_sound.h" #include "BKE_workspace.h" diff --git a/source/blender/editors/screen/screen_geometry.cc b/source/blender/editors/screen/screen_geometry.cc index 1a2cb58287c..cdef6ec1a5c 100644 --- a/source/blender/editors/screen/screen_geometry.cc +++ b/source/blender/editors/screen/screen_geometry.cc @@ -14,7 +14,7 @@ #include "BLI_math_vector.h" #include "BLI_rect.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DNA_screen_types.h" #include "DNA_windowmanager_types.h" diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc index 13b062ba644..89fab6d0cda 100644 --- a/source/blender/editors/screen/screen_ops.cc +++ b/source/blender/editors/screen/screen_ops.cc @@ -44,7 +44,7 @@ #include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_sound.h" #include "BKE_workspace.h" diff --git a/source/blender/editors/screen/screen_user_menu.cc b/source/blender/editors/screen/screen_user_menu.cc index f8b566f4b28..9687f091313 100644 --- a/source/blender/editors/screen/screen_user_menu.cc +++ b/source/blender/editors/screen/screen_user_menu.cc @@ -24,7 +24,7 @@ #include "BKE_blender_user_menu.h" #include "BKE_context.h" #include "BKE_idprop.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/screen/screendump.cc b/source/blender/editors/screen/screendump.cc index 1954d70a407..f7ea7acf32b 100644 --- a/source/blender/editors/screen/screendump.cc +++ b/source/blender/editors/screen/screendump.cc @@ -28,7 +28,7 @@ #include "BKE_image_format.h" #include "BKE_main.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/screen/workspace_edit.cc b/source/blender/editors/screen/workspace_edit.cc index 792c52f7839..ad972d80a96 100644 --- a/source/blender/editors/screen/workspace_edit.cc +++ b/source/blender/editors/screen/workspace_edit.cc @@ -19,7 +19,7 @@ #include "BKE_context.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_workspace.h" #include "BLO_readfile.h" diff --git a/source/blender/editors/screen/workspace_layout_edit.cc b/source/blender/editors/screen/workspace_layout_edit.cc index 11acd94192e..9d1dd18b576 100644 --- a/source/blender/editors/screen/workspace_layout_edit.cc +++ b/source/blender/editors/screen/workspace_layout_edit.cc @@ -16,7 +16,7 @@ #include "BKE_context.h" #include "BKE_main.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_workspace.h" #include "WM_api.hh" diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc index 17b99f96928..89892418ab6 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc @@ -71,7 +71,7 @@ #include "BKE_paint.hh" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DNA_screen_types.h" #include "DNA_space_types.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_detail.cc b/source/blender/editors/sculpt_paint/sculpt_detail.cc index 289d3039a62..c858589a33f 100644 --- a/source/blender/editors/sculpt_paint/sculpt_detail.cc +++ b/source/blender/editors/sculpt_paint/sculpt_detail.cc @@ -19,7 +19,7 @@ #include "BKE_context.h" #include "BKE_paint.hh" #include "BKE_pbvh_api.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" diff --git a/source/blender/editors/space_action/action_buttons.cc b/source/blender/editors/space_action/action_buttons.cc index e80c610b1c8..ddc5b0aee32 100644 --- a/source/blender/editors/space_action/action_buttons.cc +++ b/source/blender/editors/space_action/action_buttons.cc @@ -14,7 +14,7 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "action_intern.hh" /* own include */ diff --git a/source/blender/editors/space_action/space_action.cc b/source/blender/editors/space_action/space_action.cc index 37da9ac6867..8a2de2fa64f 100644 --- a/source/blender/editors/space_action/space_action.cc +++ b/source/blender/editors/space_action/space_action.cc @@ -24,7 +24,7 @@ #include "BKE_lib_query.h" #include "BKE_lib_remap.h" #include "BKE_nla.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "RNA_access.hh" #include "RNA_define.hh" diff --git a/source/blender/editors/space_api/spacetypes.cc b/source/blender/editors/space_api/spacetypes.cc index df95b4c4e06..9919538a88c 100644 --- a/source/blender/editors/space_api/spacetypes.cc +++ b/source/blender/editors/space_api/spacetypes.cc @@ -17,7 +17,7 @@ #include "DNA_windowmanager_types.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "GPU_state.h" diff --git a/source/blender/editors/space_buttons/buttons_context.cc b/source/blender/editors/space_buttons/buttons_context.cc index fd91df247f8..a3226858ce3 100644 --- a/source/blender/editors/space_buttons/buttons_context.cc +++ b/source/blender/editors/space_buttons/buttons_context.cc @@ -37,7 +37,7 @@ #include "BKE_object.h" #include "BKE_paint.hh" #include "BKE_particle.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "RNA_access.hh" #include "RNA_prototypes.h" diff --git a/source/blender/editors/space_buttons/buttons_ops.cc b/source/blender/editors/space_buttons/buttons_ops.cc index d78f7b7257c..2bea5abda00 100644 --- a/source/blender/editors/space_buttons/buttons_ops.cc +++ b/source/blender/editors/space_buttons/buttons_ops.cc @@ -23,7 +23,7 @@ #include "BKE_context.h" #include "BKE_main.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_buttons/space_buttons.cc b/source/blender/editors/space_buttons/space_buttons.cc index 1d6417e9aa9..38473005511 100644 --- a/source/blender/editors/space_buttons/space_buttons.cc +++ b/source/blender/editors/space_buttons/space_buttons.cc @@ -20,7 +20,7 @@ #include "BKE_lib_query.h" #include "BKE_lib_remap.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_shader_fx.h" #include "ED_buttons.hh" diff --git a/source/blender/editors/space_clip/clip_buttons.cc b/source/blender/editors/space_clip/clip_buttons.cc index 421d47b5a80..23c63b93b49 100644 --- a/source/blender/editors/space_clip/clip_buttons.cc +++ b/source/blender/editors/space_clip/clip_buttons.cc @@ -25,7 +25,7 @@ #include "BKE_context.h" #include "BKE_movieclip.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_tracking.h" #include "DEG_depsgraph.hh" diff --git a/source/blender/editors/space_clip/space_clip.cc b/source/blender/editors/space_clip/space_clip.cc index 49516d6eeae..5ed42a1b17d 100644 --- a/source/blender/editors/space_clip/space_clip.cc +++ b/source/blender/editors/space_clip/space_clip.cc @@ -26,7 +26,7 @@ #include "BKE_lib_query.h" #include "BKE_lib_remap.h" #include "BKE_movieclip.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_tracking.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/space_console/space_console.cc b/source/blender/editors/space_console/space_console.cc index 4ee01c0220b..e7d941a8374 100644 --- a/source/blender/editors/space_console/space_console.cc +++ b/source/blender/editors/space_console/space_console.cc @@ -16,7 +16,7 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_screen.hh" #include "ED_space_api.hh" diff --git a/source/blender/editors/space_file/file_ops.cc b/source/blender/editors/space_file/file_ops.cc index 365031942a8..3e830dc8891 100644 --- a/source/blender/editors/space_file/file_ops.cc +++ b/source/blender/editors/space_file/file_ops.cc @@ -17,7 +17,7 @@ #include "BKE_global.h" #include "BKE_main.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/space_file/file_panels.cc b/source/blender/editors/space_file/file_panels.cc index 6505b4853a7..10f989062f7 100644 --- a/source/blender/editors/space_file/file_panels.cc +++ b/source/blender/editors/space_file/file_panels.cc @@ -10,7 +10,7 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/space_file/space_file.cc b/source/blender/editors/space_file/space_file.cc index 79f68712fa3..bbb9a7c9d30 100644 --- a/source/blender/editors/space_file/space_file.cc +++ b/source/blender/editors/space_file/space_file.cc @@ -22,7 +22,7 @@ #include "BKE_lib_remap.h" #include "BKE_main.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "RNA_access.hh" #include "RNA_define.hh" diff --git a/source/blender/editors/space_graph/graph_buttons.cc b/source/blender/editors/space_graph/graph_buttons.cc index 7f96fc99233..cc7e27e0709 100644 --- a/source/blender/editors/space_graph/graph_buttons.cc +++ b/source/blender/editors/space_graph/graph_buttons.cc @@ -32,7 +32,7 @@ #include "BKE_fcurve_driver.h" #include "BKE_global.h" #include "BKE_main.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_unit.h" #include "DEG_depsgraph.hh" diff --git a/source/blender/editors/space_graph/graph_utils.cc b/source/blender/editors/space_graph/graph_utils.cc index f9b87847521..41ccce93839 100644 --- a/source/blender/editors/space_graph/graph_utils.cc +++ b/source/blender/editors/space_graph/graph_utils.cc @@ -21,7 +21,7 @@ #include "BKE_context.h" #include "BKE_fcurve.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_anim_api.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/space_graph/space_graph.cc b/source/blender/editors/space_graph/space_graph.cc index cc228b19763..83fe497296f 100644 --- a/source/blender/editors/space_graph/space_graph.cc +++ b/source/blender/editors/space_graph/space_graph.cc @@ -23,7 +23,7 @@ #include "BKE_fcurve.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_anim_api.hh" #include "ED_markers.hh" diff --git a/source/blender/editors/space_image/image_buttons.cc b/source/blender/editors/space_image/image_buttons.cc index 5ea1bc56c0e..86cd3873f65 100644 --- a/source/blender/editors/space_image/image_buttons.cc +++ b/source/blender/editors/space_image/image_buttons.cc @@ -24,7 +24,7 @@ #include "BKE_image_format.h" #include "BKE_node.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "RE_pipeline.h" diff --git a/source/blender/editors/space_image/space_image.cc b/source/blender/editors/space_image/space_image.cc index 85486930cc7..5687d7b02b0 100644 --- a/source/blender/editors/space_image/space_image.cc +++ b/source/blender/editors/space_image/space_image.cc @@ -25,7 +25,7 @@ #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "RNA_access.hh" #include "RNA_define.hh" diff --git a/source/blender/editors/space_info/info_ops.cc b/source/blender/editors/space_info/info_ops.cc index 9ee4864d323..78bb6ff4cc7 100644 --- a/source/blender/editors/space_info/info_ops.cc +++ b/source/blender/editors/space_info/info_ops.cc @@ -28,7 +28,7 @@ #include "BKE_main.h" #include "BKE_packedFile.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_info/space_info.cc b/source/blender/editors/space_info/space_info.cc index 36d7f16cc4a..950817ad2f0 100644 --- a/source/blender/editors/space_info/space_info.cc +++ b/source/blender/editors/space_info/space_info.cc @@ -15,7 +15,7 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_screen.hh" #include "ED_space_api.hh" diff --git a/source/blender/editors/space_nla/nla_buttons.cc b/source/blender/editors/space_nla/nla_buttons.cc index 21aaf67357d..2f94498f161 100644 --- a/source/blender/editors/space_nla/nla_buttons.cc +++ b/source/blender/editors/space_nla/nla_buttons.cc @@ -24,7 +24,7 @@ #include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_nla.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/space_nla/nla_channels.cc b/source/blender/editors/space_nla/nla_channels.cc index fba1681a468..6e32f629bbe 100644 --- a/source/blender/editors/space_nla/nla_channels.cc +++ b/source/blender/editors/space_nla/nla_channels.cc @@ -25,7 +25,7 @@ #include "BKE_nla.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_anim_api.hh" #include "ED_keyframes_edit.hh" diff --git a/source/blender/editors/space_nla/nla_draw.cc b/source/blender/editors/space_nla/nla_draw.cc index 1b3b324e940..96f02659a2f 100644 --- a/source/blender/editors/space_nla/nla_draw.cc +++ b/source/blender/editors/space_nla/nla_draw.cc @@ -27,7 +27,7 @@ #include "BKE_context.h" #include "BKE_fcurve.h" #include "BKE_nla.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_anim_api.hh" #include "ED_keyframes_draw.hh" diff --git a/source/blender/editors/space_nla/nla_edit.cc b/source/blender/editors/space_nla/nla_edit.cc index 834d6110044..aea0f98efcd 100644 --- a/source/blender/editors/space_nla/nla_edit.cc +++ b/source/blender/editors/space_nla/nla_edit.cc @@ -28,7 +28,7 @@ #include "BKE_main.h" #include "BKE_nla.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_anim_api.hh" #include "ED_keyframes_edit.hh" diff --git a/source/blender/editors/space_nla/nla_ops.cc b/source/blender/editors/space_nla/nla_ops.cc index e46c960ffe6..b85fda5fa37 100644 --- a/source/blender/editors/space_nla/nla_ops.cc +++ b/source/blender/editors/space_nla/nla_ops.cc @@ -12,7 +12,7 @@ #include "DNA_scene_types.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_anim_api.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/space_nla/nla_select.cc b/source/blender/editors/space_nla/nla_select.cc index ac44c1f5804..bff75c136e8 100644 --- a/source/blender/editors/space_nla/nla_select.cc +++ b/source/blender/editors/space_nla/nla_select.cc @@ -19,7 +19,7 @@ #include "BKE_context.h" #include "BKE_nla.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_anim_api.hh" #include "ED_keyframes_edit.hh" diff --git a/source/blender/editors/space_nla/space_nla.cc b/source/blender/editors/space_nla/space_nla.cc index b96be397e48..191576d3260 100644 --- a/source/blender/editors/space_nla/space_nla.cc +++ b/source/blender/editors/space_nla/space_nla.cc @@ -20,7 +20,7 @@ #include "BKE_context.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_anim_api.hh" #include "ED_markers.hh" diff --git a/source/blender/editors/space_node/add_menu_assets.cc b/source/blender/editors/space_node/add_menu_assets.cc index 28d91f36fab..95b756bacc5 100644 --- a/source/blender/editors/space_node/add_menu_assets.cc +++ b/source/blender/editors/space_node/add_menu_assets.cc @@ -15,7 +15,7 @@ #include "BKE_asset.h" #include "BKE_idprop.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLT_translation.h" diff --git a/source/blender/editors/space_node/link_drag_search.cc b/source/blender/editors/space_node/link_drag_search.cc index b322e7fe29e..d76e5031802 100644 --- a/source/blender/editors/space_node/link_drag_search.cc +++ b/source/blender/editors/space_node/link_drag_search.cc @@ -14,7 +14,7 @@ #include "BKE_lib_id.h" #include "BKE_node_runtime.hh" #include "BKE_node_tree_update.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_string_search.hh" diff --git a/source/blender/editors/space_node/node_context_path.cc b/source/blender/editors/space_node/node_context_path.cc index e02e2e631ef..6775094e585 100644 --- a/source/blender/editors/space_node/node_context_path.cc +++ b/source/blender/editors/space_node/node_context_path.cc @@ -16,7 +16,7 @@ #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "RNA_access.hh" #include "RNA_prototypes.h" diff --git a/source/blender/editors/space_node/node_relationships.cc b/source/blender/editors/space_node/node_relationships.cc index 0b90bf7d78c..27bb1604807 100644 --- a/source/blender/editors/space_node/node_relationships.cc +++ b/source/blender/editors/space_node/node_relationships.cc @@ -23,7 +23,7 @@ #include "BKE_node.hh" #include "BKE_node_runtime.hh" #include "BKE_node_tree_update.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_node.hh" /* own include */ #include "ED_render.hh" diff --git a/source/blender/editors/space_node/node_view.cc b/source/blender/editors/space_node/node_view.cc index ea08d17ed29..ddd97fc2fd7 100644 --- a/source/blender/editors/space_node/node_view.cc +++ b/source/blender/editors/space_node/node_view.cc @@ -18,7 +18,7 @@ #include "BKE_main.h" #include "BKE_node.hh" #include "BKE_node_runtime.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_image.hh" #include "ED_node.hh" /* own include */ diff --git a/source/blender/editors/space_node/space_node.cc b/source/blender/editors/space_node/space_node.cc index d35dac2be6e..9ea0dff3004 100644 --- a/source/blender/editors/space_node/space_node.cc +++ b/source/blender/editors/space_node/space_node.cc @@ -32,7 +32,7 @@ #include "BKE_node.hh" #include "BKE_node_runtime.hh" #include "BKE_node_tree_zones.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_node.hh" #include "ED_node_preview.hh" diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc index e9cc10cedd7..da0d6ae1f6b 100644 --- a/source/blender/editors/space_outliner/outliner_tools.cc +++ b/source/blender/editors/space_outliner/outliner_tools.cc @@ -56,7 +56,7 @@ #include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_build.hh" diff --git a/source/blender/editors/space_outliner/space_outliner.cc b/source/blender/editors/space_outliner/space_outliner.cc index 8b8495d51c4..6a2d290a34f 100644 --- a/source/blender/editors/space_outliner/space_outliner.cc +++ b/source/blender/editors/space_outliner/space_outliner.cc @@ -22,7 +22,7 @@ #include "BKE_lib_query.h" #include "BKE_lib_remap.h" #include "BKE_outliner_treehash.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_screen.hh" #include "ED_space_api.hh" diff --git a/source/blender/editors/space_script/space_script.cc b/source/blender/editors/space_script/space_script.cc index 394a61425f8..3746a735b05 100644 --- a/source/blender/editors/space_script/space_script.cc +++ b/source/blender/editors/space_script/space_script.cc @@ -16,7 +16,7 @@ #include "BKE_context.h" #include "BKE_lib_query.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_screen.hh" #include "ED_space_api.hh" diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.cc b/source/blender/editors/space_sequencer/sequencer_buttons.cc index a9e952e3220..e28d153127c 100644 --- a/source/blender/editors/space_sequencer/sequencer_buttons.cc +++ b/source/blender/editors/space_sequencer/sequencer_buttons.cc @@ -19,7 +19,7 @@ #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_screen.hh" #include "ED_sequencer.hh" diff --git a/source/blender/editors/space_sequencer/sequencer_channels_draw.cc b/source/blender/editors/space_sequencer/sequencer_channels_draw.cc index c827bb8272d..c755b833284 100644 --- a/source/blender/editors/space_sequencer/sequencer_channels_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_channels_draw.cc @@ -12,7 +12,7 @@ #include "DNA_screen_types.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLI_blenlib.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_sequencer/space_sequencer.cc b/source/blender/editors/space_sequencer/space_sequencer.cc index 5423a02a52d..a4beeac8ba5 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.cc +++ b/source/blender/editors/space_sequencer/space_sequencer.cc @@ -23,7 +23,7 @@ #include "BKE_global.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_sequencer_offscreen.h" #include "GPU_state.h" diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc index 03877605a20..a688f7dd387 100644 --- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc +++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc @@ -9,7 +9,7 @@ #include "BKE_global.h" #include "BKE_lib_remap.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_screen.hh" #include "ED_space_api.hh" diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_ops.cc b/source/blender/editors/space_spreadsheet/spreadsheet_ops.cc index 0b325d20d7e..ac2f605ae23 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_ops.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_ops.cc @@ -1,7 +1,7 @@ /* SPDX-FileCopyrightText: 2023 Blender Authors * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DNA_space_types.h" diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_panels.cc b/source/blender/editors/space_spreadsheet/spreadsheet_panels.cc index 15a5eb480b4..3efbc461dbe 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_panels.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_panels.cc @@ -5,7 +5,7 @@ #include "BLI_listbase.h" #include "BLI_string.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLT_translation.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 80c07fb748e..115cbc01f05 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_row_filter_ui.cc @@ -11,7 +11,7 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "RNA_access.hh" #include "RNA_prototypes.h" diff --git a/source/blender/editors/space_statusbar/space_statusbar.cc b/source/blender/editors/space_statusbar/space_statusbar.cc index 50a096e09b6..fb9fe295946 100644 --- a/source/blender/editors/space_statusbar/space_statusbar.cc +++ b/source/blender/editors/space_statusbar/space_statusbar.cc @@ -14,7 +14,7 @@ #include "BLI_blenlib.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_screen.hh" #include "ED_space_api.hh" diff --git a/source/blender/editors/space_text/space_text.cc b/source/blender/editors/space_text/space_text.cc index f3b2ab3af50..a16cfde5e75 100644 --- a/source/blender/editors/space_text/space_text.cc +++ b/source/blender/editors/space_text/space_text.cc @@ -19,7 +19,7 @@ #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_lib_remap.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_screen.hh" #include "ED_space_api.hh" diff --git a/source/blender/editors/space_text/text_autocomplete.cc b/source/blender/editors/space_text/text_autocomplete.cc index c7aa0867445..b0b56b55ec8 100644 --- a/source/blender/editors/space_text/text_autocomplete.cc +++ b/source/blender/editors/space_text/text_autocomplete.cc @@ -17,7 +17,7 @@ #include "BLI_ghash.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_text.h" #include "BKE_text_suggestions.h" diff --git a/source/blender/editors/space_text/text_draw.cc b/source/blender/editors/space_text/text_draw.cc index 380fe2c45db..d0353e6ba69 100644 --- a/source/blender/editors/space_text/text_draw.cc +++ b/source/blender/editors/space_text/text_draw.cc @@ -17,7 +17,7 @@ #include "DNA_text_types.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_text.h" #include "BKE_text_suggestions.h" diff --git a/source/blender/editors/space_text/text_header.cc b/source/blender/editors/space_text/text_header.cc index a80da135d1f..56cbc036b60 100644 --- a/source/blender/editors/space_text/text_header.cc +++ b/source/blender/editors/space_text/text_header.cc @@ -13,7 +13,7 @@ #include "BLI_blenlib.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/space_topbar/space_topbar.cc b/source/blender/editors/space_topbar/space_topbar.cc index fce425ac86d..83fbd4d6815 100644 --- a/source/blender/editors/space_topbar/space_topbar.cc +++ b/source/blender/editors/space_topbar/space_topbar.cc @@ -19,7 +19,7 @@ #include "BKE_blendfile.h" #include "BKE_context.h" #include "BKE_global.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_undo_system.h" #include "ED_screen.hh" diff --git a/source/blender/editors/space_userpref/space_userpref.cc b/source/blender/editors/space_userpref/space_userpref.cc index 2d3884fc580..2e8fd580ac9 100644 --- a/source/blender/editors/space_userpref/space_userpref.cc +++ b/source/blender/editors/space_userpref/space_userpref.cc @@ -15,7 +15,7 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_screen.hh" #include "ED_space_api.hh" diff --git a/source/blender/editors/space_view3d/space_view3d.cc b/source/blender/editors/space_view3d/space_view3d.cc index ab193b37218..cbd13f9fc37 100644 --- a/source/blender/editors/space_view3d/space_view3d.cc +++ b/source/blender/editors/space_view3d/space_view3d.cc @@ -49,7 +49,7 @@ #include "BKE_mesh.hh" #include "BKE_object.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_viewer_path.h" #include "BKE_workspace.h" diff --git a/source/blender/editors/space_view3d/view3d_buttons.cc b/source/blender/editors/space_view3d/view3d_buttons.cc index e2d50bcb39e..fd5340265f0 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.cc +++ b/source/blender/editors/space_view3d/view3d_buttons.cc @@ -43,7 +43,7 @@ #include "BKE_object.h" #include "BKE_object_deform.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" diff --git a/source/blender/editors/space_view3d/view3d_cursor_snap.cc b/source/blender/editors/space_view3d/view3d_cursor_snap.cc index 8275704115c..6b9d4406575 100644 --- a/source/blender/editors/space_view3d/view3d_cursor_snap.cc +++ b/source/blender/editors/space_view3d/view3d_cursor_snap.cc @@ -23,7 +23,7 @@ #include "BKE_main.h" #include "BKE_object.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "GPU_immediate.h" #include "GPU_matrix.h" diff --git a/source/blender/editors/space_view3d/view3d_edit.cc b/source/blender/editors/space_view3d/view3d_edit.cc index fffb3857610..e207985cbd1 100644 --- a/source/blender/editors/space_view3d/view3d_edit.cc +++ b/source/blender/editors/space_view3d/view3d_edit.cc @@ -28,7 +28,7 @@ #include "BKE_object.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/editors/space_view3d/view3d_navigate.cc b/source/blender/editors/space_view3d/view3d_navigate.cc index 20b3f74a432..4c91c0715bf 100644 --- a/source/blender/editors/space_view3d/view3d_navigate.cc +++ b/source/blender/editors/space_view3d/view3d_navigate.cc @@ -26,7 +26,7 @@ #include "BKE_object.h" #include "BKE_paint.hh" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_vfont.h" #include "DEG_depsgraph_query.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 17d0d06c6d2..d1fe909d4b7 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_axis.cc @@ -24,7 +24,7 @@ #include "BKE_object.h" #include "BKE_paint.hh" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_vfont.h" #include "DEG_depsgraph_query.hh" 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 1dfa6ff9064..5d1799b7c07 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_camera.cc @@ -22,7 +22,7 @@ #include "BKE_object.h" #include "BKE_paint.hh" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_vfont.h" #include "DEG_depsgraph_query.hh" 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 bdcbf482cd5..391b61db1e6 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 @@ -23,7 +23,7 @@ #include "BKE_object.h" #include "BKE_paint.hh" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_vfont.h" #include "DEG_depsgraph_query.hh" 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 a6a8328116d..3bacd0e4c2d 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 @@ -23,7 +23,7 @@ #include "BKE_object.h" #include "BKE_paint.hh" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_vfont.h" #include "DEG_depsgraph_query.hh" 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 bbdc6f898b2..3a03d123e41 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_orbit.cc @@ -24,7 +24,7 @@ #include "BKE_object.h" #include "BKE_paint.hh" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_vfont.h" #include "DEG_depsgraph_query.hh" 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 364523b7956..6c27e12b01a 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_pan.cc @@ -22,7 +22,7 @@ #include "BKE_object.h" #include "BKE_paint.hh" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_vfont.h" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/editors/space_view3d/view3d_navigate_view_zoom.cc b/source/blender/editors/space_view3d/view3d_navigate_view_zoom.cc index b6dbad4c219..8134ba57e36 100644 --- a/source/blender/editors/space_view3d/view3d_navigate_view_zoom.cc +++ b/source/blender/editors/space_view3d/view3d_navigate_view_zoom.cc @@ -10,7 +10,7 @@ #include "BLI_rect.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/editors/space_view3d/view3d_project.cc b/source/blender/editors/space_view3d/view3d_project.cc index 1bc2994eb7a..6635d2b7212 100644 --- a/source/blender/editors/space_view3d/view3d_project.cc +++ b/source/blender/editors/space_view3d/view3d_project.cc @@ -20,7 +20,7 @@ #include "BLI_math_vector.h" #include "BKE_camera.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "GPU_matrix.h" diff --git a/source/blender/editors/space_view3d/view3d_utils.cc b/source/blender/editors/space_view3d/view3d_utils.cc index c0a5a2492a4..341d434d6da 100644 --- a/source/blender/editors/space_view3d/view3d_utils.cc +++ b/source/blender/editors/space_view3d/view3d_utils.cc @@ -34,7 +34,7 @@ #include "BKE_context.h" #include "BKE_object.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/editors/undo/ed_undo.cc b/source/blender/editors/undo/ed_undo.cc index 5ea54da5394..9de79973dcd 100644 --- a/source/blender/editors/undo/ed_undo.cc +++ b/source/blender/editors/undo/ed_undo.cc @@ -29,7 +29,7 @@ #include "BKE_paint.hh" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_undo_system.h" #include "BKE_workspace.h" diff --git a/source/blender/editors/util/ed_util.cc b/source/blender/editors/util/ed_util.cc index 13a17f95015..0a84efe2591 100644 --- a/source/blender/editors/util/ed_util.cc +++ b/source/blender/editors/util/ed_util.cc @@ -29,7 +29,7 @@ #include "BKE_object.h" #include "BKE_packedFile.h" #include "BKE_paint.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_undo_system.h" #include "DEG_depsgraph.hh" diff --git a/source/blender/editors/util/ed_util_imbuf.cc b/source/blender/editors/util/ed_util_imbuf.cc index 9f1c16d6a70..f7a364e0e06 100644 --- a/source/blender/editors/util/ed_util_imbuf.cc +++ b/source/blender/editors/util/ed_util_imbuf.cc @@ -15,7 +15,7 @@ #include "BKE_context.h" #include "BKE_image.h" #include "BKE_main.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "ED_image.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/uvedit/uvedit_buttons.cc b/source/blender/editors/uvedit/uvedit_buttons.cc index 00095c09a3d..8015c66e2ec 100644 --- a/source/blender/editors/uvedit/uvedit_buttons.cc +++ b/source/blender/editors/uvedit/uvedit_buttons.cc @@ -27,7 +27,7 @@ #include "BKE_customdata.h" #include "BKE_editmesh.h" #include "BKE_layer.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" 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 f3213f8778e..37c7489c3c6 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 @@ -31,7 +31,7 @@ #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "MEM_guardedalloc.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 5b0e8fd74ba..8bbaaa97923 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 @@ -35,7 +35,7 @@ #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" 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 b03b21d18b8..16988f0a31b 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 @@ -36,7 +36,7 @@ #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" 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 ae566080c5e..4610e8171bc 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 @@ -28,7 +28,7 @@ #include "BKE_lib_query.h" #include "BKE_main.h" #include "BKE_material.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" 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 46287a76c91..94a2c099a27 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 @@ -28,7 +28,7 @@ #include "BKE_lib_query.h" #include "BKE_main.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "MEM_guardedalloc.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 fae625b5406..8780071cdf5 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 @@ -30,7 +30,7 @@ #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_build.hh" 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 d99e42b86bc..f59dab771dc 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 @@ -36,7 +36,7 @@ #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" 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 c00a4492799..7a35b835368 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 @@ -31,7 +31,7 @@ #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" 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 e89816368de..93ea7ed0666 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 @@ -30,7 +30,7 @@ #include "BKE_lib_query.h" #include "BKE_main.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "MEM_guardedalloc.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 02c59e2b60e..a57283cf6f6 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 @@ -29,7 +29,7 @@ #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lib_query.h" #include "BKE_main.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" 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 3fe9092ea3b..f2e632a9dfa 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 @@ -31,7 +31,7 @@ #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" 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 09fe056203b..0c200afaced 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 @@ -31,7 +31,7 @@ #include "BKE_lib_query.h" #include "BKE_main.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_build.hh" 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 79c81b6e60e..41b5ff60a14 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 @@ -32,7 +32,7 @@ #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_query.hh" 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 2fd29a1bb9d..28a067af775 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 @@ -33,7 +33,7 @@ #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_build.hh" 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 e11348e5749..e0fa1e9869d 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 @@ -27,7 +27,7 @@ #include "BKE_lib_query.h" #include "BKE_main.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" 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 7246d2e152a..845e9eea63b 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 @@ -32,7 +32,7 @@ #include "BKE_main.h" #include "BKE_material.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" 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 9e5603af994..4660da2afe7 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 @@ -31,7 +31,7 @@ #include "BKE_main.h" #include "BKE_modifier.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_shrinkwrap.h" #include "MEM_guardedalloc.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 efc8d88a95c..25c7ba09c92 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 @@ -25,7 +25,7 @@ #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" 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 35b66cfcd48..7a50252f1f1 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 @@ -28,7 +28,7 @@ #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" 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 246b4de752c..38c178a1373 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 @@ -25,7 +25,7 @@ #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" 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 c779e31acaf..c3f5cbfeff2 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 @@ -27,7 +27,7 @@ #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" 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 611babaca9e..7e73938cbc9 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 @@ -27,7 +27,7 @@ #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" 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 0fdb4542954..8ba9add092c 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 @@ -34,7 +34,7 @@ #include "BKE_lib_query.h" #include "BKE_main.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "RNA_access.hh" #include "RNA_prototypes.h" 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 701fb39a41c..acaa049488b 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 @@ -36,7 +36,7 @@ #include "BKE_material.h" #include "BKE_modifier.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "MEM_guardedalloc.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 64b89b22518..fb75b22bea3 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 @@ -14,7 +14,7 @@ #include "BKE_context.h" #include "BKE_gpencil_modifier_legacy.h" #include "BKE_material.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DNA_material_types.h" #include "DNA_object_types.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 22b74fee1b1..98a5f7d693c 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 @@ -28,7 +28,7 @@ #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_build.hh" 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 369433c4dca..1692b1d054c 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 @@ -29,7 +29,7 @@ #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_build.hh" diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc index a6de5a67341..32cc2d412eb 100644 --- a/source/blender/io/alembic/intern/alembic_capi.cc +++ b/source/blender/io/alembic/intern/alembic_capi.cc @@ -38,7 +38,7 @@ #include "BKE_lib_id.h" #include "BKE_object.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" #include "DEG_depsgraph_build.hh" diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc index 4401d8ee882..2263945df39 100644 --- a/source/blender/makesrna/intern/rna_scene.cc +++ b/source/blender/makesrna/intern/rna_scene.cc @@ -738,7 +738,7 @@ const EnumPropertyItem rna_enum_grease_pencil_selectmode_items[] = { # include "BKE_node.h" # include "BKE_pointcache.h" # include "BKE_scene.h" -# include "BKE_screen.h" +# include "BKE_screen.hh" # include "BKE_unit.h" # include "NOD_composite.h" diff --git a/source/blender/makesrna/intern/rna_screen.cc b/source/blender/makesrna/intern/rna_screen.cc index c548c4af317..22ac150f653 100644 --- a/source/blender/makesrna/intern/rna_screen.cc +++ b/source/blender/makesrna/intern/rna_screen.cc @@ -50,7 +50,7 @@ const EnumPropertyItem rna_enum_region_type_items[] = { # include "RNA_access.hh" # include "BKE_global.h" -# include "BKE_screen.h" +# include "BKE_screen.hh" # include "BKE_workspace.h" # include "DEG_depsgraph.hh" diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc index 2b53d544f98..6b577532a78 100644 --- a/source/blender/makesrna/intern/rna_space.cc +++ b/source/blender/makesrna/intern/rna_space.cc @@ -556,7 +556,7 @@ static const EnumPropertyItem rna_enum_curve_display_handle_items[] = { # include "BKE_paint.hh" # include "BKE_preferences.h" # include "BKE_scene.h" -# include "BKE_screen.h" +# include "BKE_screen.hh" # include "BKE_workspace.h" # include "DEG_depsgraph.hh" diff --git a/source/blender/makesrna/intern/rna_timeline.cc b/source/blender/makesrna/intern/rna_timeline.cc index 634671c185c..e8beb21615e 100644 --- a/source/blender/makesrna/intern/rna_timeline.cc +++ b/source/blender/makesrna/intern/rna_timeline.cc @@ -20,7 +20,7 @@ # include "BKE_idprop.h" # include "BKE_scene.h" -# include "BKE_screen.h" +# include "BKE_screen.hh" # include "WM_api.hh" # include "DEG_depsgraph_build.hh" diff --git a/source/blender/makesrna/intern/rna_ui.cc b/source/blender/makesrna/intern/rna_ui.cc index ead05e0b4d0..4446dc645d0 100644 --- a/source/blender/makesrna/intern/rna_ui.cc +++ b/source/blender/makesrna/intern/rna_ui.cc @@ -14,7 +14,7 @@ #include "BLT_translation.h" #include "BKE_idprop.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLI_listbase.h" @@ -63,7 +63,7 @@ const EnumPropertyItem rna_enum_uilist_layout_type_items[] = { # include "BKE_context.h" # include "BKE_main.h" # include "BKE_report.h" -# include "BKE_screen.h" +# include "BKE_screen.hh" # include "ED_asset_shelf.h" diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc index e8a503880f1..19beb53c38c 100644 --- a/source/blender/makesrna/intern/rna_userdef.cc +++ b/source/blender/makesrna/intern/rna_userdef.cc @@ -173,7 +173,7 @@ static const EnumPropertyItem rna_enum_preference_gpu_backend_items[] = { # include "BKE_object.h" # include "BKE_paint.hh" # include "BKE_preferences.h" -# include "BKE_screen.h" +# include "BKE_screen.hh" # include "DEG_depsgraph.hh" diff --git a/source/blender/makesrna/intern/rna_wm.cc b/source/blender/makesrna/intern/rna_wm.cc index c17c99dd253..14aa836107a 100644 --- a/source/blender/makesrna/intern/rna_wm.cc +++ b/source/blender/makesrna/intern/rna_wm.cc @@ -19,7 +19,7 @@ #include "BLT_translation.h" #include "BKE_keyconfig.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_workspace.h" #include "RNA_access.hh" diff --git a/source/blender/modifiers/intern/MOD_armature.cc b/source/blender/modifiers/intern/MOD_armature.cc index 70179f8cd7e..aec4b493359 100644 --- a/source/blender/modifiers/intern/MOD_armature.cc +++ b/source/blender/modifiers/intern/MOD_armature.cc @@ -29,7 +29,7 @@ #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_array.cc b/source/blender/modifiers/intern/MOD_array.cc index d3365c733d9..1b8c1b85b63 100644 --- a/source/blender/modifiers/intern/MOD_array.cc +++ b/source/blender/modifiers/intern/MOD_array.cc @@ -36,7 +36,7 @@ #include "BKE_mesh.hh" #include "BKE_modifier.h" #include "BKE_object_deform.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_bevel.cc b/source/blender/modifiers/intern/MOD_bevel.cc index f8123c59310..673505e7502 100644 --- a/source/blender/modifiers/intern/MOD_bevel.cc +++ b/source/blender/modifiers/intern/MOD_bevel.cc @@ -26,7 +26,7 @@ #include "BKE_deform.h" #include "BKE_mesh.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_build.cc b/source/blender/modifiers/intern/MOD_build.cc index d04f253c6fa..fcc765ef52d 100644 --- a/source/blender/modifiers/intern/MOD_build.cc +++ b/source/blender/modifiers/intern/MOD_build.cc @@ -29,7 +29,7 @@ #include "BKE_modifier.h" #include "BKE_particle.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_cast.cc b/source/blender/modifiers/intern/MOD_cast.cc index 0b4e37e34cb..47c7388a2ee 100644 --- a/source/blender/modifiers/intern/MOD_cast.cc +++ b/source/blender/modifiers/intern/MOD_cast.cc @@ -27,7 +27,7 @@ #include "BKE_mesh_runtime.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_cloth.cc b/source/blender/modifiers/intern/MOD_cloth.cc index 0bc14ede17d..e34e738c1fd 100644 --- a/source/blender/modifiers/intern/MOD_cloth.cc +++ b/source/blender/modifiers/intern/MOD_cloth.cc @@ -35,7 +35,7 @@ #include "BKE_mesh.hh" #include "BKE_modifier.h" #include "BKE_pointcache.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_collision.cc b/source/blender/modifiers/intern/MOD_collision.cc index 08e02f695a2..d2289c1bf9e 100644 --- a/source/blender/modifiers/intern/MOD_collision.cc +++ b/source/blender/modifiers/intern/MOD_collision.cc @@ -32,7 +32,7 @@ #include "BKE_modifier.h" #include "BKE_pointcache.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.cc b/source/blender/modifiers/intern/MOD_correctivesmooth.cc index d6a5194ef18..10bb74dd4e1 100644 --- a/source/blender/modifiers/intern/MOD_correctivesmooth.cc +++ b/source/blender/modifiers/intern/MOD_correctivesmooth.cc @@ -29,7 +29,7 @@ #include "BKE_lib_id.h" #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_curve.cc b/source/blender/modifiers/intern/MOD_curve.cc index c7d5c2945e7..9aa9edd1ddd 100644 --- a/source/blender/modifiers/intern/MOD_curve.cc +++ b/source/blender/modifiers/intern/MOD_curve.cc @@ -27,7 +27,7 @@ #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_datatransfer.cc b/source/blender/modifiers/intern/MOD_datatransfer.cc index 51e1c53b818..ee331b821c5 100644 --- a/source/blender/modifiers/intern/MOD_datatransfer.cc +++ b/source/blender/modifiers/intern/MOD_datatransfer.cc @@ -26,7 +26,7 @@ #include "BKE_mesh_remap.hh" #include "BKE_modifier.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_decimate.cc b/source/blender/modifiers/intern/MOD_decimate.cc index 77253273a2b..bde363094bd 100644 --- a/source/blender/modifiers/intern/MOD_decimate.cc +++ b/source/blender/modifiers/intern/MOD_decimate.cc @@ -22,7 +22,7 @@ #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_mesh.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_displace.cc b/source/blender/modifiers/intern/MOD_displace.cc index 6dd88b45a46..182104c0c20 100644 --- a/source/blender/modifiers/intern/MOD_displace.cc +++ b/source/blender/modifiers/intern/MOD_displace.cc @@ -31,7 +31,7 @@ #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_texture.h" #include "UI_interface.hh" diff --git a/source/blender/modifiers/intern/MOD_dynamicpaint.cc b/source/blender/modifiers/intern/MOD_dynamicpaint.cc index e19685598fe..5db2285a040 100644 --- a/source/blender/modifiers/intern/MOD_dynamicpaint.cc +++ b/source/blender/modifiers/intern/MOD_dynamicpaint.cc @@ -28,7 +28,7 @@ #include "BKE_lib_query.h" #include "BKE_mesh.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_edgesplit.cc b/source/blender/modifiers/intern/MOD_edgesplit.cc index f6524774466..69035f8e713 100644 --- a/source/blender/modifiers/intern/MOD_edgesplit.cc +++ b/source/blender/modifiers/intern/MOD_edgesplit.cc @@ -24,7 +24,7 @@ #include "BKE_context.h" #include "BKE_mesh.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_explode.cc b/source/blender/modifiers/intern/MOD_explode.cc index fa8019f8be4..226f19f3490 100644 --- a/source/blender/modifiers/intern/MOD_explode.cc +++ b/source/blender/modifiers/intern/MOD_explode.cc @@ -35,7 +35,7 @@ #include "BKE_modifier.h" #include "BKE_particle.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_fluid.cc b/source/blender/modifiers/intern/MOD_fluid.cc index c2d79b940c0..f9adce46b46 100644 --- a/source/blender/modifiers/intern/MOD_fluid.cc +++ b/source/blender/modifiers/intern/MOD_fluid.cc @@ -28,7 +28,7 @@ #include "BKE_layer.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_hook.cc b/source/blender/modifiers/intern/MOD_hook.cc index 721d37c15b5..b1ca31f09d6 100644 --- a/source/blender/modifiers/intern/MOD_hook.cc +++ b/source/blender/modifiers/intern/MOD_hook.cc @@ -30,7 +30,7 @@ #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_laplaciandeform.cc b/source/blender/modifiers/intern/MOD_laplaciandeform.cc index 5f1c57f0c96..8455b3a3f1f 100644 --- a/source/blender/modifiers/intern/MOD_laplaciandeform.cc +++ b/source/blender/modifiers/intern/MOD_laplaciandeform.cc @@ -31,7 +31,7 @@ #include "BKE_mesh_runtime.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_particle.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_laplaciansmooth.cc b/source/blender/modifiers/intern/MOD_laplaciansmooth.cc index c7817ec40b4..479fc90060f 100644 --- a/source/blender/modifiers/intern/MOD_laplaciansmooth.cc +++ b/source/blender/modifiers/intern/MOD_laplaciansmooth.cc @@ -26,7 +26,7 @@ #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_lattice.cc b/source/blender/modifiers/intern/MOD_lattice.cc index ac493aedd92..de7781736e4 100644 --- a/source/blender/modifiers/intern/MOD_lattice.cc +++ b/source/blender/modifiers/intern/MOD_lattice.cc @@ -24,7 +24,7 @@ #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc index 4041770f954..ede6fe10ab3 100644 --- a/source/blender/modifiers/intern/MOD_mask.cc +++ b/source/blender/modifiers/intern/MOD_mask.cc @@ -31,7 +31,7 @@ #include "BKE_lib_query.h" #include "BKE_mesh.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_meshcache.cc b/source/blender/modifiers/intern/MOD_meshcache.cc index fc8bb72342c..a7aa6d2393a 100644 --- a/source/blender/modifiers/intern/MOD_meshcache.cc +++ b/source/blender/modifiers/intern/MOD_meshcache.cc @@ -32,7 +32,7 @@ #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_meshdeform.cc b/source/blender/modifiers/intern/MOD_meshdeform.cc index 7ad3cf9178e..3f7e9b770ca 100644 --- a/source/blender/modifiers/intern/MOD_meshdeform.cc +++ b/source/blender/modifiers/intern/MOD_meshdeform.cc @@ -31,7 +31,7 @@ #include "BKE_mesh_runtime.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.cc b/source/blender/modifiers/intern/MOD_meshsequencecache.cc index a9ddff30e5c..e6f210cfb0c 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.cc +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.cc @@ -31,7 +31,7 @@ #include "BKE_mesh.hh" #include "BKE_object.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_mirror.cc b/source/blender/modifiers/intern/MOD_mirror.cc index 13a8a92f2ce..6f1943a381f 100644 --- a/source/blender/modifiers/intern/MOD_mirror.cc +++ b/source/blender/modifiers/intern/MOD_mirror.cc @@ -20,7 +20,7 @@ #include "BKE_lib_query.h" #include "BKE_mesh_mirror.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_multires.cc b/source/blender/modifiers/intern/MOD_multires.cc index 5fa01f949f4..88cb63f1b12 100644 --- a/source/blender/modifiers/intern/MOD_multires.cc +++ b/source/blender/modifiers/intern/MOD_multires.cc @@ -26,7 +26,7 @@ #include "BKE_modifier.h" #include "BKE_multires.hh" #include "BKE_paint.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_subdiv.hh" #include "BKE_subdiv_ccg.hh" #include "BKE_subdiv_deform.hh" diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index 7db40270a3a..5f0720154b9 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -55,7 +55,7 @@ #include "BKE_node_tree_update.h" #include "BKE_object.h" #include "BKE_pointcloud.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_workspace.h" #include "BLO_read_write.hh" diff --git a/source/blender/modifiers/intern/MOD_normal_edit.cc b/source/blender/modifiers/intern/MOD_normal_edit.cc index 88593e4ebb4..2960b35c7f1 100644 --- a/source/blender/modifiers/intern/MOD_normal_edit.cc +++ b/source/blender/modifiers/intern/MOD_normal_edit.cc @@ -30,7 +30,7 @@ #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_ocean.cc b/source/blender/modifiers/intern/MOD_ocean.cc index 351321d467a..5545fc97196 100644 --- a/source/blender/modifiers/intern/MOD_ocean.cc +++ b/source/blender/modifiers/intern/MOD_ocean.cc @@ -26,7 +26,7 @@ #include "BKE_mesh.hh" #include "BKE_modifier.h" #include "BKE_ocean.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_particleinstance.cc b/source/blender/modifiers/intern/MOD_particleinstance.cc index 04e16d25b12..feb7a982f25 100644 --- a/source/blender/modifiers/intern/MOD_particleinstance.cc +++ b/source/blender/modifiers/intern/MOD_particleinstance.cc @@ -32,7 +32,7 @@ #include "BKE_modifier.h" #include "BKE_particle.h" #include "BKE_pointcache.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_particlesystem.cc b/source/blender/modifiers/intern/MOD_particlesystem.cc index 091dc5c9f83..92f0f6e5d8f 100644 --- a/source/blender/modifiers/intern/MOD_particlesystem.cc +++ b/source/blender/modifiers/intern/MOD_particlesystem.cc @@ -25,7 +25,7 @@ #include "BKE_mesh_legacy_convert.hh" #include "BKE_modifier.h" #include "BKE_particle.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_remesh.cc b/source/blender/modifiers/intern/MOD_remesh.cc index 2e199f5a411..4f0b4ae4b91 100644 --- a/source/blender/modifiers/intern/MOD_remesh.cc +++ b/source/blender/modifiers/intern/MOD_remesh.cc @@ -25,7 +25,7 @@ #include "BKE_mesh.hh" #include "BKE_mesh_remesh_voxel.hh" #include "BKE_mesh_runtime.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_screw.cc b/source/blender/modifiers/intern/MOD_screw.cc index b7a5967ee8f..be8fdb511d5 100644 --- a/source/blender/modifiers/intern/MOD_screw.cc +++ b/source/blender/modifiers/intern/MOD_screw.cc @@ -31,7 +31,7 @@ #include "BKE_lib_id.h" #include "BKE_lib_query.h" #include "BKE_mesh.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_shrinkwrap.cc b/source/blender/modifiers/intern/MOD_shrinkwrap.cc index 494e3553623..f6e39f4a6d4 100644 --- a/source/blender/modifiers/intern/MOD_shrinkwrap.cc +++ b/source/blender/modifiers/intern/MOD_shrinkwrap.cc @@ -24,7 +24,7 @@ #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_shrinkwrap.h" #include "UI_interface.hh" diff --git a/source/blender/modifiers/intern/MOD_simpledeform.cc b/source/blender/modifiers/intern/MOD_simpledeform.cc index 1f5c155969d..134cb859413 100644 --- a/source/blender/modifiers/intern/MOD_simpledeform.cc +++ b/source/blender/modifiers/intern/MOD_simpledeform.cc @@ -26,7 +26,7 @@ #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_skin.cc b/source/blender/modifiers/intern/MOD_skin.cc index 666d7c911be..b511214a5ad 100644 --- a/source/blender/modifiers/intern/MOD_skin.cc +++ b/source/blender/modifiers/intern/MOD_skin.cc @@ -65,7 +65,7 @@ #include "BKE_mesh.hh" #include "BKE_mesh_mapping.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_smooth.cc b/source/blender/modifiers/intern/MOD_smooth.cc index 4555987a630..1288d82a063 100644 --- a/source/blender/modifiers/intern/MOD_smooth.cc +++ b/source/blender/modifiers/intern/MOD_smooth.cc @@ -26,7 +26,7 @@ #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_particle.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_softbody.cc b/source/blender/modifiers/intern/MOD_softbody.cc index 692c3377855..b54a7e94487 100644 --- a/source/blender/modifiers/intern/MOD_softbody.cc +++ b/source/blender/modifiers/intern/MOD_softbody.cc @@ -20,7 +20,7 @@ #include "BKE_context.h" #include "BKE_layer.h" #include "BKE_particle.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_softbody.h" #include "UI_interface.hh" diff --git a/source/blender/modifiers/intern/MOD_solidify.cc b/source/blender/modifiers/intern/MOD_solidify.cc index 5485484056c..1bf2c057ccb 100644 --- a/source/blender/modifiers/intern/MOD_solidify.cc +++ b/source/blender/modifiers/intern/MOD_solidify.cc @@ -19,7 +19,7 @@ #include "BKE_context.h" #include "BKE_particle.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_subsurf.cc b/source/blender/modifiers/intern/MOD_subsurf.cc index 943d52db10f..16b3212b082 100644 --- a/source/blender/modifiers/intern/MOD_subsurf.cc +++ b/source/blender/modifiers/intern/MOD_subsurf.cc @@ -27,7 +27,7 @@ #include "BKE_editmesh.h" #include "BKE_mesh.hh" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_subdiv.hh" #include "BKE_subdiv_ccg.hh" #include "BKE_subdiv_deform.hh" diff --git a/source/blender/modifiers/intern/MOD_surface.cc b/source/blender/modifiers/intern/MOD_surface.cc index 3d52ccc3a6f..64c3e72f837 100644 --- a/source/blender/modifiers/intern/MOD_surface.cc +++ b/source/blender/modifiers/intern/MOD_surface.cc @@ -23,7 +23,7 @@ #include "BKE_context.h" #include "BKE_lib_id.h" #include "BKE_mesh.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_surfacedeform.cc b/source/blender/modifiers/intern/MOD_surfacedeform.cc index e7e2c4265d4..d73e09a3a9b 100644 --- a/source/blender/modifiers/intern/MOD_surfacedeform.cc +++ b/source/blender/modifiers/intern/MOD_surfacedeform.cc @@ -29,7 +29,7 @@ #include "BKE_mesh_runtime.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_triangulate.cc b/source/blender/modifiers/intern/MOD_triangulate.cc index c684c9af8dc..a9d29d02ebb 100644 --- a/source/blender/modifiers/intern/MOD_triangulate.cc +++ b/source/blender/modifiers/intern/MOD_triangulate.cc @@ -23,7 +23,7 @@ #include "BKE_context.h" #include "BKE_mesh.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_ui_common.cc b/source/blender/modifiers/intern/MOD_ui_common.cc index 4d8493f57e5..8b224fe60cd 100644 --- a/source/blender/modifiers/intern/MOD_ui_common.cc +++ b/source/blender/modifiers/intern/MOD_ui_common.cc @@ -14,7 +14,7 @@ #include "BKE_context.h" #include "BKE_modifier.h" #include "BKE_object.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DNA_object_force_types.h" #include "DNA_object_types.h" diff --git a/source/blender/modifiers/intern/MOD_uvproject.cc b/source/blender/modifiers/intern/MOD_uvproject.cc index 5c82f060ab6..ccf23741e5b 100644 --- a/source/blender/modifiers/intern/MOD_uvproject.cc +++ b/source/blender/modifiers/intern/MOD_uvproject.cc @@ -29,7 +29,7 @@ #include "BKE_lib_query.h" #include "BKE_material.h" #include "BKE_mesh.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_uvwarp.cc b/source/blender/modifiers/intern/MOD_uvwarp.cc index 3870fb28bf9..5cb57d0b956 100644 --- a/source/blender/modifiers/intern/MOD_uvwarp.cc +++ b/source/blender/modifiers/intern/MOD_uvwarp.cc @@ -28,7 +28,7 @@ #include "BKE_lib_query.h" #include "BKE_mesh.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_warp.cc b/source/blender/modifiers/intern/MOD_warp.cc index c4f774d7bff..1d6053f3fd6 100644 --- a/source/blender/modifiers/intern/MOD_warp.cc +++ b/source/blender/modifiers/intern/MOD_warp.cc @@ -32,7 +32,7 @@ #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_texture.h" #include "UI_interface.hh" diff --git a/source/blender/modifiers/intern/MOD_wave.cc b/source/blender/modifiers/intern/MOD_wave.cc index 83037f10674..093c211d545 100644 --- a/source/blender/modifiers/intern/MOD_wave.cc +++ b/source/blender/modifiers/intern/MOD_wave.cc @@ -27,7 +27,7 @@ #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_texture.h" #include "UI_interface.hh" diff --git a/source/blender/modifiers/intern/MOD_weighted_normal.cc b/source/blender/modifiers/intern/MOD_weighted_normal.cc index 737eb4b3c59..b462c986c77 100644 --- a/source/blender/modifiers/intern/MOD_weighted_normal.cc +++ b/source/blender/modifiers/intern/MOD_weighted_normal.cc @@ -27,7 +27,7 @@ #include "BKE_lib_id.h" #include "BKE_mesh.hh" #include "BKE_mesh_mapping.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_weightvgedit.cc b/source/blender/modifiers/intern/MOD_weightvgedit.cc index 330a9e35af4..5ddae895aeb 100644 --- a/source/blender/modifiers/intern/MOD_weightvgedit.cc +++ b/source/blender/modifiers/intern/MOD_weightvgedit.cc @@ -30,7 +30,7 @@ #include "BKE_lib_query.h" #include "BKE_mesh.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_texture.h" /* Texture masking. */ #include "UI_interface.hh" diff --git a/source/blender/modifiers/intern/MOD_weightvgmix.cc b/source/blender/modifiers/intern/MOD_weightvgmix.cc index e1465827e68..1c19ee59033 100644 --- a/source/blender/modifiers/intern/MOD_weightvgmix.cc +++ b/source/blender/modifiers/intern/MOD_weightvgmix.cc @@ -25,7 +25,7 @@ #include "BKE_lib_query.h" #include "BKE_mesh.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_texture.h" /* Texture masking. */ #include "UI_interface.hh" diff --git a/source/blender/modifiers/intern/MOD_weightvgproximity.cc b/source/blender/modifiers/intern/MOD_weightvgproximity.cc index 4b3fc2424a4..fc22a548068 100644 --- a/source/blender/modifiers/intern/MOD_weightvgproximity.cc +++ b/source/blender/modifiers/intern/MOD_weightvgproximity.cc @@ -36,7 +36,7 @@ #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_texture.h" /* Texture masking. */ #include "UI_interface.hh" diff --git a/source/blender/modifiers/intern/MOD_weld.cc b/source/blender/modifiers/intern/MOD_weld.cc index 276b2a6157c..8d439730d77 100644 --- a/source/blender/modifiers/intern/MOD_weld.cc +++ b/source/blender/modifiers/intern/MOD_weld.cc @@ -32,7 +32,7 @@ #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/modifiers/intern/MOD_wireframe.cc b/source/blender/modifiers/intern/MOD_wireframe.cc index c6252326593..e9df4da1e3f 100644 --- a/source/blender/modifiers/intern/MOD_wireframe.cc +++ b/source/blender/modifiers/intern/MOD_wireframe.cc @@ -20,7 +20,7 @@ #include "BKE_context.h" #include "BKE_deform.h" #include "BKE_mesh.hh" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/python/intern/bpy_rna_callback.cc b/source/blender/python/intern/bpy_rna_callback.cc index 7853c0fcc8a..345bf7a7d25 100644 --- a/source/blender/python/intern/bpy_rna_callback.cc +++ b/source/blender/python/intern/bpy_rna_callback.cc @@ -20,7 +20,7 @@ #include "RNA_enum_types.hh" #include "RNA_prototypes.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "WM_api.hh" diff --git a/source/blender/shader_fx/intern/FX_shader_blur.cc b/source/blender/shader_fx/intern/FX_shader_blur.cc index a6fddd4330a..d51de08d34f 100644 --- a/source/blender/shader_fx/intern/FX_shader_blur.cc +++ b/source/blender/shader_fx/intern/FX_shader_blur.cc @@ -14,7 +14,7 @@ #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DNA_screen_types.h" diff --git a/source/blender/shader_fx/intern/FX_shader_colorize.cc b/source/blender/shader_fx/intern/FX_shader_colorize.cc index dff4dfb7724..caae90a5706 100644 --- a/source/blender/shader_fx/intern/FX_shader_colorize.cc +++ b/source/blender/shader_fx/intern/FX_shader_colorize.cc @@ -9,7 +9,7 @@ #include #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLI_utildefines.h" diff --git a/source/blender/shader_fx/intern/FX_shader_flip.cc b/source/blender/shader_fx/intern/FX_shader_flip.cc index 46187b8dad7..04cfb5c3611 100644 --- a/source/blender/shader_fx/intern/FX_shader_flip.cc +++ b/source/blender/shader_fx/intern/FX_shader_flip.cc @@ -18,7 +18,7 @@ #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/shader_fx/intern/FX_shader_glow.cc b/source/blender/shader_fx/intern/FX_shader_glow.cc index 6a082dca09e..e0126fbfc7c 100644 --- a/source/blender/shader_fx/intern/FX_shader_glow.cc +++ b/source/blender/shader_fx/intern/FX_shader_glow.cc @@ -20,7 +20,7 @@ #include "BKE_context.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_shader_fx.h" #include "UI_interface.hh" diff --git a/source/blender/shader_fx/intern/FX_shader_pixel.cc b/source/blender/shader_fx/intern/FX_shader_pixel.cc index 6ae218612a4..c0ee8fdd861 100644 --- a/source/blender/shader_fx/intern/FX_shader_pixel.cc +++ b/source/blender/shader_fx/intern/FX_shader_pixel.cc @@ -13,7 +13,7 @@ #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DNA_screen_types.h" diff --git a/source/blender/shader_fx/intern/FX_shader_rim.cc b/source/blender/shader_fx/intern/FX_shader_rim.cc index 6713c29d2f0..985b6e34461 100644 --- a/source/blender/shader_fx/intern/FX_shader_rim.cc +++ b/source/blender/shader_fx/intern/FX_shader_rim.cc @@ -16,7 +16,7 @@ #include "BLT_translation.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "UI_interface.hh" #include "UI_resources.hh" diff --git a/source/blender/shader_fx/intern/FX_shader_shadow.cc b/source/blender/shader_fx/intern/FX_shader_shadow.cc index 440593207fc..72374e8aa53 100644 --- a/source/blender/shader_fx/intern/FX_shader_shadow.cc +++ b/source/blender/shader_fx/intern/FX_shader_shadow.cc @@ -20,7 +20,7 @@ #include "BKE_context.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_shader_fx.h" #include "UI_interface.hh" diff --git a/source/blender/shader_fx/intern/FX_shader_swirl.cc b/source/blender/shader_fx/intern/FX_shader_swirl.cc index fde1f5b7483..1ba583400ec 100644 --- a/source/blender/shader_fx/intern/FX_shader_swirl.cc +++ b/source/blender/shader_fx/intern/FX_shader_swirl.cc @@ -21,7 +21,7 @@ #include "BKE_context.h" #include "BKE_lib_query.h" #include "BKE_modifier.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_shader_fx.h" #include "UI_interface.hh" diff --git a/source/blender/shader_fx/intern/FX_shader_wave.cc b/source/blender/shader_fx/intern/FX_shader_wave.cc index c165d763135..3975c51fe7b 100644 --- a/source/blender/shader_fx/intern/FX_shader_wave.cc +++ b/source/blender/shader_fx/intern/FX_shader_wave.cc @@ -14,7 +14,7 @@ #include "DNA_screen_types.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLI_utildefines.h" diff --git a/source/blender/shader_fx/intern/FX_ui_common.cc b/source/blender/shader_fx/intern/FX_ui_common.cc index 36cce800029..83f83fb8e08 100644 --- a/source/blender/shader_fx/intern/FX_ui_common.cc +++ b/source/blender/shader_fx/intern/FX_ui_common.cc @@ -13,7 +13,7 @@ #include "BKE_context.h" #include "BKE_object.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_shader_fx.h" #include "DNA_object_types.h" diff --git a/source/blender/windowmanager/intern/wm.cc b/source/blender/windowmanager/intern/wm.cc index 558c576e756..3228c9e01d0 100644 --- a/source/blender/windowmanager/intern/wm.cc +++ b/source/blender/windowmanager/intern/wm.cc @@ -36,7 +36,7 @@ #include "BKE_lib_query.h" #include "BKE_main.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_workspace.h" #include "WM_api.hh" diff --git a/source/blender/windowmanager/intern/wm_dragdrop.cc b/source/blender/windowmanager/intern/wm_dragdrop.cc index 2df601e068e..1f269149379 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.cc +++ b/source/blender/windowmanager/intern/wm_dragdrop.cc @@ -33,7 +33,7 @@ #include "BKE_idtype.h" #include "BKE_lib_id.h" #include "BKE_main.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "GHOST_C-api.h" diff --git a/source/blender/windowmanager/intern/wm_draw.cc b/source/blender/windowmanager/intern/wm_draw.cc index ea8cecdb77f..01194298869 100644 --- a/source/blender/windowmanager/intern/wm_draw.cc +++ b/source/blender/windowmanager/intern/wm_draw.cc @@ -31,7 +31,7 @@ #include "BKE_image.h" #include "BKE_main.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "GHOST_C-api.h" diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc index 877ddf594c5..b5a82c0143f 100644 --- a/source/blender/windowmanager/intern/wm_event_system.cc +++ b/source/blender/windowmanager/intern/wm_event_system.cc @@ -41,7 +41,7 @@ #include "BKE_main.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_undo_system.h" #include "BKE_workspace.h" diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc index 5bad4d74d89..fb3b1bd221a 100644 --- a/source/blender/windowmanager/intern/wm_files.cc +++ b/source/blender/windowmanager/intern/wm_files.cc @@ -79,7 +79,7 @@ #include "BKE_packedFile.h" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_sound.h" #include "BKE_undo_system.h" #include "BKE_workspace.h" diff --git a/source/blender/windowmanager/intern/wm_init_exit.cc b/source/blender/windowmanager/intern/wm_init_exit.cc index d47aca93b30..f2c1693d730 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.cc +++ b/source/blender/windowmanager/intern/wm_init_exit.cc @@ -53,7 +53,7 @@ #include "BKE_preview_image.hh" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_sound.h" #include "BKE_vfont.h" diff --git a/source/blender/windowmanager/intern/wm_keymap.cc b/source/blender/windowmanager/intern/wm_keymap.cc index 60e6dc395e0..34dff0e3751 100644 --- a/source/blender/windowmanager/intern/wm_keymap.cc +++ b/source/blender/windowmanager/intern/wm_keymap.cc @@ -32,7 +32,7 @@ #include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_main.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_workspace.h" #include "BLT_translation.h" diff --git a/source/blender/windowmanager/intern/wm_menu_type.cc b/source/blender/windowmanager/intern/wm_menu_type.cc index ba8af097d0a..1a4db759ee9 100644 --- a/source/blender/windowmanager/intern/wm_menu_type.cc +++ b/source/blender/windowmanager/intern/wm_menu_type.cc @@ -21,7 +21,7 @@ #include "BLI_utildefines.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_workspace.h" #include "WM_api.hh" diff --git a/source/blender/windowmanager/intern/wm_operators.cc b/source/blender/windowmanager/intern/wm_operators.cc index 18b9f02e978..5f99638a69a 100644 --- a/source/blender/windowmanager/intern/wm_operators.cc +++ b/source/blender/windowmanager/intern/wm_operators.cc @@ -60,7 +60,7 @@ #include "BKE_preview_image.hh" #include "BKE_report.h" #include "BKE_scene.h" -#include "BKE_screen.h" /* BKE_ST_MAXNAME */ +#include "BKE_screen.hh" /* BKE_ST_MAXNAME */ #include "BKE_unit.h" #include "BKE_idtype.h" diff --git a/source/blender/windowmanager/intern/wm_panel_type.cc b/source/blender/windowmanager/intern/wm_panel_type.cc index 2d00f36ce21..ac7c0e7115e 100644 --- a/source/blender/windowmanager/intern/wm_panel_type.cc +++ b/source/blender/windowmanager/intern/wm_panel_type.cc @@ -21,7 +21,7 @@ #include "BLI_ghash.h" #include "BLI_utildefines.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "WM_api.hh" diff --git a/source/blender/windowmanager/intern/wm_splash_screen.cc b/source/blender/windowmanager/intern/wm_splash_screen.cc index 09c1ea08bcd..96eda527605 100644 --- a/source/blender/windowmanager/intern/wm_splash_screen.cc +++ b/source/blender/windowmanager/intern/wm_splash_screen.cc @@ -30,7 +30,7 @@ #include "BKE_appdir.h" #include "BKE_blender_version.h" #include "BKE_context.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLT_translation.h" diff --git a/source/blender/windowmanager/intern/wm_uilist_type.cc b/source/blender/windowmanager/intern/wm_uilist_type.cc index 6de3165d451..97537fe8e94 100644 --- a/source/blender/windowmanager/intern/wm_uilist_type.cc +++ b/source/blender/windowmanager/intern/wm_uilist_type.cc @@ -26,7 +26,7 @@ #include "BLI_utildefines.h" #include "BKE_main.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/windowmanager/intern/wm_window.cc b/source/blender/windowmanager/intern/wm_window.cc index a5f90ad36df..7cf27da99a3 100644 --- a/source/blender/windowmanager/intern/wm_window.cc +++ b/source/blender/windowmanager/intern/wm_window.cc @@ -37,7 +37,7 @@ #include "BKE_layer.h" #include "BKE_main.h" #include "BKE_report.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BKE_workspace.h" #include "RNA_access.hh" diff --git a/source/blender/windowmanager/xr/intern/wm_xr_operators.cc b/source/blender/windowmanager/xr/intern/wm_xr_operators.cc index 67a6ad0af0d..5b7c2f8aa20 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_operators.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_operators.cc @@ -20,7 +20,7 @@ #include "BKE_global.h" #include "BKE_idprop.h" #include "BKE_main.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "DEG_depsgraph.hh" diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.cc b/source/blender/windowmanager/xr/intern/wm_xr_session.cc index 8c7dcf48806..de118fa9ae2 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_session.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_session.cc @@ -12,7 +12,7 @@ #include "BKE_idprop.h" #include "BKE_main.h" #include "BKE_scene.h" -#include "BKE_screen.h" +#include "BKE_screen.hh" #include "BLI_listbase.h" #include "BLI_math_matrix.h"