From 54618dbae3d955dda22c708c8821fdcd4163cd01 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Sat, 10 Feb 2024 18:25:14 +0100 Subject: [PATCH] Cleanup: Make `BKE_global.h` a Cpp header. --- .../blenkernel/{BKE_global.h => BKE_global.hh} | 18 +++++------------- source/blender/blenkernel/CMakeLists.txt | 2 +- source/blender/blenkernel/intern/anim_data.cc | 2 +- source/blender/blenkernel/intern/anim_sys.cc | 2 +- source/blender/blenkernel/intern/blender.cc | 2 +- .../blenkernel/intern/blender_copybuffer.cc | 2 +- .../blender/blenkernel/intern/blender_undo.cc | 2 +- source/blender/blenkernel/intern/blendfile.cc | 2 +- source/blender/blenkernel/intern/cloth.cc | 2 +- source/blender/blenkernel/intern/constraint.cc | 2 +- source/blender/blenkernel/intern/curves.cc | 2 +- source/blender/blenkernel/intern/effect.cc | 2 +- source/blender/blenkernel/intern/fcurve.cc | 2 +- .../blender/blenkernel/intern/fcurve_driver.cc | 2 +- source/blender/blenkernel/intern/fluid.cc | 2 +- source/blender/blenkernel/intern/icons.cc | 2 +- source/blender/blenkernel/intern/idprop.cc | 2 +- source/blender/blenkernel/intern/image.cc | 2 +- source/blender/blenkernel/intern/image_gpu.cc | 2 +- .../intern/image_partial_update_test.cc | 2 +- source/blender/blenkernel/intern/image_save.cc | 2 +- source/blender/blenkernel/intern/ipo.cc | 2 +- source/blender/blenkernel/intern/lib_id.cc | 2 +- .../blender/blenkernel/intern/lib_override.cc | 2 +- .../blenkernel/intern/lib_remap_test.cc | 2 +- source/blender/blenkernel/intern/main.cc | 2 +- .../blenkernel/intern/mball_tessellate.cc | 2 +- source/blender/blenkernel/intern/mesh.cc | 2 +- .../blenkernel/intern/mesh_legacy_convert.cc | 2 +- .../blender/blenkernel/intern/mesh_normals.cc | 2 +- source/blender/blenkernel/intern/modifier.cc | 2 +- source/blender/blenkernel/intern/movieclip.cc | 2 +- source/blender/blenkernel/intern/nla.cc | 2 +- source/blender/blenkernel/intern/node.cc | 2 +- source/blender/blenkernel/intern/object.cc | 2 +- .../blender/blenkernel/intern/object_dupli.cc | 2 +- .../blenkernel/intern/particle_distribute.cc | 2 +- source/blender/blenkernel/intern/pbvh_bmesh.cc | 2 +- .../blender/blenkernel/intern/pbvh_pixels.cc | 2 +- source/blender/blenkernel/intern/pointcache.cc | 2 +- source/blender/blenkernel/intern/pointcloud.cc | 2 +- source/blender/blenkernel/intern/report.cc | 2 +- source/blender/blenkernel/intern/rigidbody.cc | 2 +- source/blender/blenkernel/intern/softbody.cc | 2 +- source/blender/blenkernel/intern/sound.cc | 2 +- source/blender/blenkernel/intern/subdiv_ccg.cc | 2 +- .../blender/blenkernel/intern/tracking_auto.cc | 2 +- .../blender/blenkernel/intern/undo_system.cc | 2 +- source/blender/blenkernel/intern/vfont.cc | 2 +- source/blender/blenkernel/intern/volume.cc | 2 +- source/blender/blenkernel/intern/workspace.cc | 2 +- .../blender/blenkernel/intern/writeffmpeg.cc | 2 +- source/blender/blenloader/intern/readfile.cc | 2 +- .../blenloader/intern/versioning_250.cc | 2 +- .../blenloader/intern/versioning_280.cc | 2 +- source/blender/blenloader/intern/writefile.cc | 2 +- .../tests/blendfile_loading_base_test.cc | 2 +- .../blender/bmesh/intern/bmesh_mesh_normals.cc | 2 +- .../bmesh/operators/bmo_mesh_convert.cc | 2 +- .../compositor/intern/COM_WorkScheduler.cc | 2 +- .../operations/COM_CompositorOperation.cc | 2 +- .../operations/COM_PreviewOperation.h | 2 +- .../operations/COM_ViewerOperation.h | 2 +- .../depsgraph/intern/builder/pipeline.cc | 2 +- .../depsgraph/intern/debug/deg_debug.cc | 2 +- .../blender/depsgraph/intern/debug/deg_debug.h | 2 +- source/blender/depsgraph/intern/depsgraph.cc | 2 +- .../blender/depsgraph/intern/depsgraph_tag.cc | 2 +- .../blender/depsgraph/intern/eval/deg_eval.cc | 2 +- .../intern/eval/deg_eval_copy_on_write.cc | 2 +- .../blender/draw/engines/basic/basic_engine.cc | 2 +- .../draw/engines/eevee/eevee_effects.cc | 2 +- .../draw/engines/eevee/eevee_lightcache.cc | 2 +- .../draw/engines/eevee/eevee_materials.cc | 2 +- .../draw/engines/eevee/eevee_occlusion.cc | 2 +- .../blender/draw/engines/eevee/eevee_render.cc | 2 +- .../draw/engines/eevee/eevee_renderpasses.cc | 2 +- .../draw/engines/eevee/eevee_volumes.cc | 2 +- .../draw/engines/eevee_next/eevee_engine.cc | 2 +- .../draw/engines/eevee_next/eevee_hizbuffer.cc | 2 +- .../draw/engines/eevee_next/eevee_instance.cc | 2 +- .../engines/eevee_next/eevee_lightcache.cc | 2 +- .../draw/engines/eevee_next/eevee_raytrace.cc | 2 +- .../draw/engines/eevee_next/eevee_shadow.cc | 2 +- .../draw/engines/eevee_next/eevee_view.cc | 2 +- .../draw/engines/gpencil/gpencil_engine_c.cc | 2 +- .../draw/engines/overlay/overlay_extra.cc | 2 +- .../draw/engines/overlay/overlay_outline.cc | 2 +- .../draw/engines/overlay/overlay_private.hh | 2 +- .../draw/engines/overlay/overlay_wireframe.cc | 2 +- source/blender/draw/intern/DRW_gpu_wrapper.hh | 2 +- .../draw/intern/draw_cache_impl_volume.cc | 2 +- source/blender/draw/intern/draw_command.hh | 2 +- source/blender/draw/intern/draw_common.cc | 2 +- source/blender/draw/intern/draw_manager.cc | 2 +- source/blender/draw/intern/draw_manager_c.cc | 2 +- .../blender/draw/intern/draw_manager_data.cc | 2 +- .../blender/draw/intern/draw_manager_exec.cc | 2 +- .../draw/intern/draw_manager_profiling.cc | 2 +- .../blender/draw/intern/draw_manager_shader.cc | 2 +- .../blender/draw/intern/draw_manager_text.cc | 2 +- .../blender/draw/intern/draw_texture_pool.cc | 2 +- source/blender/draw/intern/draw_view_c.cc | 2 +- source/blender/draw/intern/draw_volume.cc | 2 +- .../editors/animation/anim_channels_edit.cc | 2 +- source/blender/editors/animation/anim_draw.cc | 2 +- .../blender/editors/animation/anim_filter.cc | 2 +- source/blender/editors/animation/anim_ops.cc | 2 +- source/blender/editors/animation/keyframing.cc | 2 +- .../blender/editors/armature/armature_edit.cc | 2 +- .../blender/editors/armature/armature_utils.cc | 2 +- source/blender/editors/armature/pose_edit.cc | 2 +- .../editors/asset/intern/asset_mark_clear.cc | 2 +- source/blender/editors/curve/editcurve.cc | 2 +- .../editors/geometry/geometry_randomization.cc | 2 +- .../gizmo_library/gizmo_library_utils.cc | 2 +- .../gizmo_library/gizmo_types/snap3d_gizmo.cc | 2 +- .../editors/gpencil_legacy/annotate_draw.cc | 2 +- .../editors/gpencil_legacy/annotate_paint.cc | 2 +- .../editors/gpencil_legacy/drawgpencil.cc | 2 +- .../editors/gpencil_legacy/gpencil_convert.cc | 2 +- .../editors/gpencil_legacy/gpencil_edit.cc | 2 +- .../editors/gpencil_legacy/gpencil_paint.cc | 2 +- .../gpencil_legacy/gpencil_primitive.cc | 2 +- .../gpencil_legacy/gpencil_trace_ops.cc | 2 +- source/blender/editors/include/ED_undo.hh | 2 +- .../editors/interface/interface_anim.cc | 2 +- .../editors/interface/interface_icons.cc | 2 +- .../editors/interface/interface_layout.cc | 2 +- .../blender/editors/interface/interface_ops.cc | 2 +- .../editors/interface/interface_style.cc | 2 +- .../interface_template_search_menu.cc | 2 +- .../interface_template_search_operator.cc | 2 +- .../editors/interface/interface_templates.cc | 2 +- .../editors/interface/interface_utils.cc | 2 +- source/blender/editors/interface/view2d.cc | 2 +- source/blender/editors/mesh/editface.cc | 2 +- source/blender/editors/mesh/editmesh_bevel.cc | 2 +- source/blender/editors/mesh/editmesh_bisect.cc | 2 +- source/blender/editors/mesh/editmesh_inset.cc | 2 +- source/blender/editors/mesh/editmesh_utils.cc | 2 +- source/blender/editors/object/object_bake.cc | 2 +- .../blender/editors/object/object_bake_api.cc | 2 +- .../editors/object/object_bake_simulation.cc | 2 +- source/blender/editors/object/object_edit.cc | 2 +- .../blender/editors/object/object_modifier.cc | 2 +- source/blender/editors/object/object_remesh.cc | 2 +- .../editors/physics/dynamicpaint_ops.cc | 2 +- .../blender/editors/physics/particle_edit.cc | 2 +- .../blender/editors/physics/particle_object.cc | 2 +- .../blender/editors/physics/physics_fluid.cc | 2 +- .../editors/physics/physics_pointcache.cc | 2 +- .../blender/editors/render/render_internal.cc | 2 +- source/blender/editors/render/render_opengl.cc | 2 +- .../blender/editors/render/render_preview.cc | 2 +- .../blender/editors/render/render_shading.cc | 2 +- source/blender/editors/render/render_view.cc | 2 +- source/blender/editors/scene/scene_edit.cc | 2 +- source/blender/editors/screen/area.cc | 2 +- source/blender/editors/screen/screen_edit.cc | 2 +- source/blender/editors/screen/screen_ops.cc | 2 +- source/blender/editors/screen/screendump.cc | 2 +- .../editors/sculpt_paint/paint_image_proj.cc | 2 +- .../editors/sculpt_paint/sculpt_dyntopo.cc | 2 +- .../editors/sculpt_paint/sculpt_undo.cc | 2 +- source/blender/editors/sound/sound_ops.cc | 2 +- .../editors/space_action/action_edit.cc | 2 +- .../blender/editors/space_clip/clip_editor.cc | 2 +- source/blender/editors/space_clip/clip_ops.cc | 2 +- .../editors/space_clip/tracking_ops_solve.cc | 2 +- .../editors/space_clip/tracking_ops_track.cc | 2 +- .../editors/space_console/space_console.cc | 2 +- source/blender/editors/space_file/file_ops.cc | 2 +- source/blender/editors/space_file/filelist.cc | 2 +- .../blender/editors/space_file/space_file.cc | 2 +- .../editors/space_graph/graph_buttons.cc | 2 +- .../blender/editors/space_graph/graph_edit.cc | 2 +- .../blender/editors/space_graph/graph_ops.cc | 2 +- .../blender/editors/space_image/image_edit.cc | 2 +- .../blender/editors/space_image/image_ops.cc | 2 +- source/blender/editors/space_info/info_ops.cc | 2 +- source/blender/editors/space_nla/nla_tracks.cc | 2 +- source/blender/editors/space_node/clipboard.cc | 2 +- source/blender/editors/space_node/node_draw.cc | 2 +- source/blender/editors/space_node/node_edit.cc | 2 +- .../editors/space_node/node_shader_preview.cc | 2 +- .../editors/space_outliner/outliner_tools.cc | 2 +- .../editors/space_sequencer/sequencer_add.cc | 2 +- .../space_sequencer/sequencer_buttons.cc | 2 +- .../space_sequencer/sequencer_drag_drop.cc | 2 +- .../editors/space_sequencer/sequencer_edit.cc | 2 +- .../space_sequencer/sequencer_preview.cc | 2 +- .../space_sequencer/sequencer_preview_draw.cc | 2 +- .../editors/space_sequencer/sequencer_proxy.cc | 2 +- .../space_sequencer/sequencer_thumbnails.cc | 2 +- .../space_sequencer/sequencer_timeline_draw.cc | 2 +- .../editors/space_sequencer/space_sequencer.cc | 2 +- .../space_spreadsheet/space_spreadsheet.cc | 2 +- .../spreadsheet_data_source_geometry.cc | 2 +- .../blender/editors/space_text/space_text.cc | 2 +- .../editors/space_topbar/space_topbar.cc | 2 +- .../blender/editors/space_view3d/drawobject.cc | 2 +- .../editors/space_view3d/space_view3d.cc | 2 +- .../editors/space_view3d/view3d_cursor_snap.cc | 2 +- .../editors/space_view3d/view3d_draw.cc | 2 +- .../view3d_gizmo_preselect_type.cc | 2 +- .../space_view3d/view3d_gizmo_tool_generic.cc | 2 +- .../editors/space_view3d/view3d_select.cc | 2 +- .../editors/space_view3d/view3d_view.cc | 2 +- .../editors/transform/transform_convert.cc | 2 +- .../editors/transform/transform_gizmo_2d.cc | 2 +- .../editors/transform/transform_gizmo_3d.cc | 2 +- .../transform/transform_gizmo_3d_cage.cc | 2 +- .../transform/transform_gizmo_extrude_3d.cc | 2 +- .../blender/editors/transform/transform_ops.cc | 2 +- .../transform_snap_object_editmesh.cc | 2 +- source/blender/editors/undo/ed_undo.cc | 2 +- source/blender/editors/util/ed_util.cc | 2 +- .../editors/uvedit/uvedit_unwrap_ops.cc | 2 +- .../freestyle/intern/application/AppView.cpp | 2 +- .../intern/application/Controller.cpp | 2 +- .../blender_interface/BlenderFileLoader.cpp | 2 +- .../BlenderStrokeRenderer.cpp | 2 +- .../intern/blender_interface/FRS_freestyle.cpp | 2 +- .../freestyle/intern/geometry/FastGrid.cpp | 2 +- .../freestyle/intern/geometry/GeomCleaner.cpp | 2 +- .../intern/stroke/BasicStrokeShaders.cpp | 2 +- .../blender/freestyle/intern/stroke/Canvas.cpp | 2 +- .../blender/freestyle/intern/stroke/Curve.cpp | 2 +- .../freestyle/intern/stroke/Operators.cpp | 2 +- .../blender/freestyle/intern/stroke/Stroke.cpp | 2 +- .../freestyle/intern/stroke/StrokeRep.cpp | 2 +- .../intern/system/PythonInterpreter.h | 2 +- .../view_map/ArbitraryGridDensityProvider.cpp | 2 +- .../AverageAreaGridDensityProvider.cpp | 2 +- .../freestyle/intern/view_map/BoxGrid.cpp | 2 +- .../freestyle/intern/view_map/BoxGrid.h | 2 +- .../intern/view_map/CulledOccluderSource.cpp | 2 +- .../intern/view_map/FEdgeXDetector.cpp | 2 +- .../freestyle/intern/view_map/Functions0D.cpp | 2 +- .../intern/view_map/GridDensityProvider.h | 2 +- .../intern/view_map/OccluderSource.cpp | 2 +- .../view_map/Pow23GridDensityProvider.cpp | 2 +- .../intern/view_map/SilhouetteGeomEngine.cpp | 2 +- .../intern/view_map/SphericalGrid.cpp | 2 +- .../freestyle/intern/view_map/SphericalGrid.h | 2 +- .../intern/view_map/SteerableViewMap.cpp | 2 +- .../intern/view_map/ViewMapBuilder.cpp | 2 +- .../freestyle/intern/winged_edge/WXEdge.cpp | 2 +- source/blender/geometry/intern/randomize.cc | 2 +- source/blender/geometry/intern/uv_pack.cc | 2 +- .../intern/MOD_gpencil_legacy_lineart.cc | 2 +- .../intern/lineart/lineart_cpu.cc | 2 +- .../intern/lineart/lineart_ops.cc | 2 +- .../intern/lineart/lineart_shadow.cc | 2 +- source/blender/gpu/intern/gpu_debug.cc | 2 +- source/blender/gpu/opengl/gl_backend.cc | 2 +- source/blender/gpu/opengl/gl_context.cc | 2 +- source/blender/gpu/opengl/gl_debug.cc | 2 +- source/blender/gpu/opengl/gl_framebuffer.cc | 2 +- source/blender/gpu/opengl/gl_shader.cc | 2 +- source/blender/gpu/opengl/gl_state.cc | 2 +- source/blender/gpu/tests/gpu_testing.hh | 2 +- source/blender/gpu/vulkan/vk_debug.cc | 2 +- source/blender/gpu/vulkan/vk_debug.hh | 2 +- source/blender/gpu/vulkan/vk_shader.cc | 2 +- source/blender/gpu/vulkan/vk_texture.cc | 2 +- source/blender/ikplugin/intern/itasc_plugin.cc | 2 +- source/blender/imbuf/intern/anim_movie.cc | 2 +- .../blender/imbuf/intern/cineon/cineon_dpx.cc | 2 +- source/blender/imbuf/intern/util.cc | 2 +- source/blender/imbuf/intern/util_gpu.cc | 2 +- .../io/alembic/exporter/abc_export_capi.cc | 2 +- .../blender/io/alembic/intern/alembic_capi.cc | 2 +- source/blender/io/collada/ArmatureExporter.cpp | 2 +- .../blender/io/collada/ControllerExporter.cpp | 2 +- source/blender/io/collada/DocumentExporter.cpp | 2 +- source/blender/io/collada/DocumentImporter.cpp | 2 +- source/blender/io/collada/GeometryExporter.cpp | 2 +- source/blender/io/collada/ImageExporter.cpp | 2 +- source/blender/io/collada/MeshImporter.cpp | 2 +- source/blender/io/collada/collada_utils.cpp | 2 +- .../blender/io/usd/intern/usd_capi_export.cc | 2 +- .../blender/io/usd/intern/usd_capi_import.cc | 2 +- source/blender/makesrna/intern/rna_ID.cc | 2 +- source/blender/makesrna/intern/rna_access.cc | 2 +- source/blender/makesrna/intern/rna_armature.cc | 2 +- .../blender/makesrna/intern/rna_collection.cc | 2 +- source/blender/makesrna/intern/rna_image.cc | 2 +- source/blender/makesrna/intern/rna_main.cc | 2 +- source/blender/makesrna/intern/rna_nodetree.cc | 2 +- source/blender/makesrna/intern/rna_object.cc | 2 +- .../blender/makesrna/intern/rna_object_api.cc | 2 +- source/blender/makesrna/intern/rna_pose.cc | 2 +- source/blender/makesrna/intern/rna_scene.cc | 2 +- .../blender/makesrna/intern/rna_scene_api.cc | 2 +- source/blender/makesrna/intern/rna_screen.cc | 2 +- .../blender/makesrna/intern/rna_sequencer.cc | 2 +- source/blender/makesrna/intern/rna_space.cc | 2 +- .../blender/makesrna/intern/rna_space_api.cc | 2 +- .../blender/makesrna/intern/rna_texture_api.cc | 2 +- source/blender/makesrna/intern/rna_userdef.cc | 2 +- source/blender/makesrna/intern/rna_wm.cc | 2 +- source/blender/makesrna/intern/rna_wm_gizmo.cc | 2 +- .../blender/makesrna/intern/rna_workspace.cc | 2 +- source/blender/modifiers/intern/MOD_boolean.cc | 2 +- source/blender/modifiers/intern/MOD_cloth.cc | 2 +- .../blender/modifiers/intern/MOD_collision.cc | 2 +- .../modifiers/intern/MOD_meshsequencecache.cc | 2 +- source/blender/modifiers/intern/MOD_nodes.cc | 2 +- .../nodes/composite/node_composite_tree.cc | 2 +- .../nodes/node_composite_cryptomatte.cc | 2 +- .../composite/nodes/node_composite_image.cc | 2 +- .../composite/nodes/node_composite_split.cc | 2 +- .../composite/nodes/node_composite_viewer.cc | 2 +- source/blender/nodes/intern/node_exec.cc | 2 +- .../blender/nodes/shader/node_shader_tree.cc | 2 +- source/blender/python/bmesh/bmesh_py_types.cc | 2 +- source/blender/python/generic/bgl.cc | 2 +- source/blender/python/gpu/gpu_py_offscreen.cc | 2 +- source/blender/python/intern/bpy.cc | 2 +- source/blender/python/intern/bpy_app.cc | 2 +- source/blender/python/intern/bpy_driver.cc | 2 +- source/blender/python/intern/bpy_interface.cc | 2 +- .../blender/python/intern/bpy_library_write.cc | 2 +- source/blender/python/intern/bpy_rna.cc | 2 +- source/blender/python/intern/bpy_rna_anim.cc | 2 +- source/blender/python/intern/bpy_rna_data.cc | 2 +- .../python/intern/bpy_rna_id_collection.cc | 2 +- source/blender/render/intern/compositor.cc | 2 +- source/blender/render/intern/engine.cc | 2 +- source/blender/render/intern/multires_bake.cc | 2 +- source/blender/render/intern/pipeline.cc | 2 +- source/blender/render/intern/render_result.cc | 2 +- source/blender/sequencer/intern/prefetch.cc | 2 +- source/blender/sequencer/intern/proxy.cc | 2 +- source/blender/sequencer/intern/proxy_job.cc | 2 +- source/blender/sequencer/intern/render.cc | 2 +- .../simulation/intern/implicit_eigen.cc | 2 +- .../windowmanager/gizmo/intern/wm_gizmo.cc | 2 +- .../windowmanager/gizmo/intern/wm_gizmo_map.cc | 2 +- source/blender/windowmanager/intern/wm.cc | 2 +- .../blender/windowmanager/intern/wm_cursors.cc | 2 +- .../windowmanager/intern/wm_dragdrop.cc | 2 +- source/blender/windowmanager/intern/wm_draw.cc | 2 +- .../windowmanager/intern/wm_event_system.cc | 2 +- .../blender/windowmanager/intern/wm_files.cc | 2 +- .../windowmanager/intern/wm_files_link.cc | 2 +- .../windowmanager/intern/wm_init_exit.cc | 2 +- source/blender/windowmanager/intern/wm_jobs.cc | 2 +- .../blender/windowmanager/intern/wm_keymap.cc | 2 +- .../windowmanager/intern/wm_operator_utils.cc | 2 +- .../windowmanager/intern/wm_operators.cc | 2 +- .../intern/wm_platform_support.cc | 2 +- .../blender/windowmanager/intern/wm_stereo.cc | 2 +- .../blender/windowmanager/intern/wm_window.cc | 2 +- .../blender/windowmanager/xr/intern/wm_xr.cc | 2 +- .../windowmanager/xr/intern/wm_xr_operators.cc | 2 +- .../windowmanager/xr/intern/wm_xr_session.cc | 2 +- source/creator/creator.cc | 2 +- source/creator/creator_args.cc | 2 +- source/creator/creator_signals.cc | 2 +- 362 files changed, 366 insertions(+), 374 deletions(-) rename source/blender/blenkernel/{BKE_global.h => BKE_global.hh} (98%) diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.hh similarity index 98% rename from source/blender/blenkernel/BKE_global.h rename to source/blender/blenkernel/BKE_global.hh index 21dfe283244..5356a6e1a26 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.hh @@ -14,13 +14,9 @@ #include "BLI_utildefines.h" #include "DNA_listBase.h" -#ifdef __cplusplus -extern "C" { -#endif - struct Main; -typedef struct Global { +struct Global { /** * Data for the current active blend file. @@ -28,13 +24,13 @@ typedef struct Global { * Note that `CTX_data_main(C)` should be used where possible. * Otherwise access via #G_MAIN. */ - struct Main *main; + Main *main; /** * Preview main is stored to avoid loading the preview file in multiple scenarios. * It is actually shared between shader node previews and asset previews. */ - struct Main *pr_main; + Main *pr_main; /** Last saved location for images. */ char filepath_last_image[/*FILE_MAX*/ 1024]; @@ -45,7 +41,7 @@ typedef struct Global { * Strings of recently opened files to show in the file menu. * A list of #RecentFile read from #BLENDER_HISTORY_FILE. */ - struct ListBase recent_files; + ListBase recent_files; /** * Set when Escape been pressed or `Ctrl-C` pressed in background mode. @@ -162,7 +158,7 @@ typedef struct Global { bool opengl_deprecation_usage_detected; const char *opengl_deprecation_usage_filename; int opengl_deprecation_usage_lineno; -} Global; +}; /* **************** GLOBAL ********************* */ @@ -289,7 +285,3 @@ extern Global G; * helps with cleanup task. */ #define G_MAIN (G).main - -#ifdef __cplusplus -} -#endif diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index b3758964035..bf59c05a828 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -397,7 +397,7 @@ set(SRC BKE_geometry_fields.hh BKE_geometry_set.hh BKE_geometry_set_instances.hh - BKE_global.h + BKE_global.hh BKE_gpencil_curve_legacy.h BKE_gpencil_geom_legacy.h BKE_gpencil_legacy.h diff --git a/source/blender/blenkernel/intern/anim_data.cc b/source/blender/blenkernel/intern/anim_data.cc index 0e7e9badcde..ae6dec9f3c4 100644 --- a/source/blender/blenkernel/intern/anim_data.cc +++ b/source/blender/blenkernel/intern/anim_data.cc @@ -15,7 +15,7 @@ #include "BKE_context.hh" #include "BKE_fcurve.h" #include "BKE_fcurve_driver.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/anim_sys.cc b/source/blender/blenkernel/intern/anim_sys.cc index 701e1f1ef78..577b65e29b6 100644 --- a/source/blender/blenkernel/intern/anim_sys.cc +++ b/source/blender/blenkernel/intern/anim_sys.cc @@ -40,7 +40,7 @@ #include "BKE_animsys.h" #include "BKE_context.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/blender.cc b/source/blender/blenkernel/intern/blender.cc index 4b0e2220f6b..4d4fcb2d530 100644 --- a/source/blender/blenkernel/intern/blender.cc +++ b/source/blender/blenkernel/intern/blender.cc @@ -29,7 +29,7 @@ #include "BKE_brush.hh" #include "BKE_cachefile.hh" #include "BKE_callbacks.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_image.h" #include "BKE_layer.hh" diff --git a/source/blender/blenkernel/intern/blender_copybuffer.cc b/source/blender/blenkernel/intern/blender_copybuffer.cc index d6f6658a14c..0b597c21694 100644 --- a/source/blender/blenkernel/intern/blender_copybuffer.cc +++ b/source/blender/blenkernel/intern/blender_copybuffer.cc @@ -28,7 +28,7 @@ #include "BKE_blendfile.hh" #include "BKE_blendfile_link_append.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/blender_undo.cc b/source/blender/blenkernel/intern/blender_undo.cc index d8f20e3bd4e..59c15140b16 100644 --- a/source/blender/blenkernel/intern/blender_undo.cc +++ b/source/blender/blenkernel/intern/blender_undo.cc @@ -34,7 +34,7 @@ #include "BKE_blender_undo.hh" /* own include */ #include "BKE_blendfile.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "BKE_undo_system.hh" diff --git a/source/blender/blenkernel/intern/blendfile.cc b/source/blender/blenkernel/intern/blendfile.cc index b653b17bab4..7082a7fc565 100644 --- a/source/blender/blenkernel/intern/blendfile.cc +++ b/source/blender/blenkernel/intern/blendfile.cc @@ -37,7 +37,7 @@ #include "BKE_bpath.hh" #include "BKE_colorband.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_ipo.h" #include "BKE_keyconfig.h" diff --git a/source/blender/blenkernel/intern/cloth.cc b/source/blender/blenkernel/intern/cloth.cc index 199e67634d6..6cd79d90ad9 100644 --- a/source/blender/blenkernel/intern/cloth.cc +++ b/source/blender/blenkernel/intern/cloth.cc @@ -29,7 +29,7 @@ #include "BKE_cloth.hh" #include "BKE_customdata.hh" #include "BKE_effect.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_mesh.hh" #include "BKE_mesh_runtime.hh" diff --git a/source/blender/blenkernel/intern/constraint.cc b/source/blender/blenkernel/intern/constraint.cc index e5c4b194a94..40b091fb832 100644 --- a/source/blender/blenkernel/intern/constraint.cc +++ b/source/blender/blenkernel/intern/constraint.cc @@ -57,7 +57,7 @@ #include "BKE_displist.h" #include "BKE_editmesh.hh" #include "BKE_fcurve_driver.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/curves.cc b/source/blender/blenkernel/intern/curves.cc index 77fe3d37495..d9cddba0d56 100644 --- a/source/blender/blenkernel/intern/curves.cc +++ b/source/blender/blenkernel/intern/curves.cc @@ -31,7 +31,7 @@ #include "BKE_customdata.hh" #include "BKE_geometry_fields.hh" #include "BKE_geometry_set.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/effect.cc b/source/blender/blenkernel/intern/effect.cc index 3fbd9355fb0..06f7d0d608b 100644 --- a/source/blender/blenkernel/intern/effect.cc +++ b/source/blender/blenkernel/intern/effect.cc @@ -44,7 +44,7 @@ #include "BKE_displist.h" #include "BKE_effect.h" #include "BKE_fluid.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" diff --git a/source/blender/blenkernel/intern/fcurve.cc b/source/blender/blenkernel/intern/fcurve.cc index f95bc3ed8d3..82d46921877 100644 --- a/source/blender/blenkernel/intern/fcurve.cc +++ b/source/blender/blenkernel/intern/fcurve.cc @@ -34,7 +34,7 @@ #include "BKE_curve.hh" #include "BKE_fcurve.h" #include "BKE_fcurve_driver.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_lib_query.hh" #include "BKE_nla.h" diff --git a/source/blender/blenkernel/intern/fcurve_driver.cc b/source/blender/blenkernel/intern/fcurve_driver.cc index 64c97626f07..0c1fb82c45d 100644 --- a/source/blender/blenkernel/intern/fcurve_driver.cc +++ b/source/blender/blenkernel/intern/fcurve_driver.cc @@ -32,7 +32,7 @@ #include "BKE_armature.hh" #include "BKE_constraint.h" #include "BKE_fcurve_driver.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_object.hh" #include "RNA_access.hh" diff --git a/source/blender/blenkernel/intern/fluid.cc b/source/blender/blenkernel/intern/fluid.cc index 323c1feec2f..f5b8e33e919 100644 --- a/source/blender/blenkernel/intern/fluid.cc +++ b/source/blender/blenkernel/intern/fluid.cc @@ -29,7 +29,7 @@ #include "BKE_attribute.hh" #include "BKE_effect.h" #include "BKE_fluid.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_modifier.hh" diff --git a/source/blender/blenkernel/intern/icons.cc b/source/blender/blenkernel/intern/icons.cc index c8ffeadd3f0..94438af63c7 100644 --- a/source/blender/blenkernel/intern/icons.cc +++ b/source/blender/blenkernel/intern/icons.cc @@ -25,7 +25,7 @@ #include "BLI_threads.h" #include "BLI_utildefines.h" -#include "BKE_global.h" /* only for G.background test */ +#include "BKE_global.hh" /* only for G.background test */ #include "BKE_icons.h" #include "BKE_preview_image.hh" #include "BKE_studiolight.h" diff --git a/source/blender/blenkernel/intern/idprop.cc b/source/blender/blenkernel/intern/idprop.cc index b4316f9e87a..8f7405fc8c7 100644 --- a/source/blender/blenkernel/intern/idprop.cc +++ b/source/blender/blenkernel/intern/idprop.cc @@ -22,7 +22,7 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_lib_id.hh" diff --git a/source/blender/blenkernel/intern/image.cc b/source/blender/blenkernel/intern/image.cc index ce44e7daf5a..089edccf1c7 100644 --- a/source/blender/blenkernel/intern/image.cc +++ b/source/blender/blenkernel/intern/image.cc @@ -64,7 +64,7 @@ #include "BKE_bpath.hh" #include "BKE_colortools.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_icons.h" #include "BKE_idtype.hh" #include "BKE_image.h" diff --git a/source/blender/blenkernel/intern/image_gpu.cc b/source/blender/blenkernel/intern/image_gpu.cc index 666215d049c..dcb477ae1be 100644 --- a/source/blender/blenkernel/intern/image_gpu.cc +++ b/source/blender/blenkernel/intern/image_gpu.cc @@ -22,7 +22,7 @@ #include "IMB_imbuf.hh" #include "IMB_imbuf_types.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_image_partial_update.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/image_partial_update_test.cc b/source/blender/blenkernel/intern/image_partial_update_test.cc index bc2b30a39f2..3f2d513ae1b 100644 --- a/source/blender/blenkernel/intern/image_partial_update_test.cc +++ b/source/blender/blenkernel/intern/image_partial_update_test.cc @@ -6,7 +6,7 @@ #include "CLG_log.h" #include "BKE_appdir.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_image.h" #include "BKE_image_partial_update.hh" diff --git a/source/blender/blenkernel/intern/image_save.cc b/source/blender/blenkernel/intern/image_save.cc index ee31fe08300..06a2f336dcf 100644 --- a/source/blender/blenkernel/intern/image_save.cc +++ b/source/blender/blenkernel/intern/image_save.cc @@ -27,7 +27,7 @@ #include "IMB_openexr.hh" #include "BKE_colortools.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_image_format.h" #include "BKE_image_save.h" diff --git a/source/blender/blenkernel/intern/ipo.cc b/source/blender/blenkernel/intern/ipo.cc index b43723ac81e..283f39a831f 100644 --- a/source/blender/blenkernel/intern/ipo.cc +++ b/source/blender/blenkernel/intern/ipo.cc @@ -47,7 +47,7 @@ #include "BKE_anim_data.h" #include "BKE_fcurve.h" #include "BKE_fcurve_driver.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_ipo.h" #include "BKE_key.hh" diff --git a/source/blender/blenkernel/intern/lib_id.cc b/source/blender/blenkernel/intern/lib_id.cc index 9cb12c3be77..4c9474e0b1b 100644 --- a/source/blender/blenkernel/intern/lib_id.cc +++ b/source/blender/blenkernel/intern/lib_id.cc @@ -45,7 +45,7 @@ #include "BKE_asset.hh" #include "BKE_bpath.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_legacy.h" #include "BKE_idprop.h" #include "BKE_idtype.hh" diff --git a/source/blender/blenkernel/intern/lib_override.cc b/source/blender/blenkernel/intern/lib_override.cc index 08aca9c4e54..a381221d91f 100644 --- a/source/blender/blenkernel/intern/lib_override.cc +++ b/source/blender/blenkernel/intern/lib_override.cc @@ -30,7 +30,7 @@ #include "BKE_blender.hh" #include "BKE_collection.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_key.hh" #include "BKE_layer.hh" diff --git a/source/blender/blenkernel/intern/lib_remap_test.cc b/source/blender/blenkernel/intern/lib_remap_test.cc index a4bb0100094..59424b530b7 100644 --- a/source/blender/blenkernel/intern/lib_remap_test.cc +++ b/source/blender/blenkernel/intern/lib_remap_test.cc @@ -16,7 +16,7 @@ #include "BKE_appdir.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_remap.hh" diff --git a/source/blender/blenkernel/intern/main.cc b/source/blender/blenkernel/intern/main.cc index 5fa454be4a9..8c01e4a9167 100644 --- a/source/blender/blenkernel/intern/main.cc +++ b/source/blender/blenkernel/intern/main.cc @@ -25,7 +25,7 @@ #include "DNA_ID.h" #include "BKE_bpath.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/mball_tessellate.cc b/source/blender/blenkernel/intern/mball_tessellate.cc index 11e2c999c8f..44bddcf91d0 100644 --- a/source/blender/blenkernel/intern/mball_tessellate.cc +++ b/source/blender/blenkernel/intern/mball_tessellate.cc @@ -30,7 +30,7 @@ #include "BLI_utildefines.h" #include "BKE_displist.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_mball_tessellate.hh" /* own include */ #include "BKE_mesh.hh" diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc index 9feaca98c56..9daae8389da 100644 --- a/source/blender/blenkernel/intern/mesh.cc +++ b/source/blender/blenkernel/intern/mesh.cc @@ -49,7 +49,7 @@ #include "BKE_deform.hh" #include "BKE_editmesh.hh" #include "BKE_editmesh_cache.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_key.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/blenkernel/intern/mesh_legacy_convert.cc b/source/blender/blenkernel/intern/mesh_legacy_convert.cc index 466587c8741..3c9116b8099 100644 --- a/source/blender/blenkernel/intern/mesh_legacy_convert.cc +++ b/source/blender/blenkernel/intern/mesh_legacy_convert.cc @@ -33,7 +33,7 @@ #include "BKE_attribute.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.hh" #include "BKE_main.hh" #include "BKE_mesh.hh" diff --git a/source/blender/blenkernel/intern/mesh_normals.cc b/source/blender/blenkernel/intern/mesh_normals.cc index 4519dd72e47..630c3e63575 100644 --- a/source/blender/blenkernel/intern/mesh_normals.cc +++ b/source/blender/blenkernel/intern/mesh_normals.cc @@ -31,7 +31,7 @@ #include "BKE_attribute.hh" #include "BKE_customdata.hh" #include "BKE_editmesh_cache.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_mesh.hh" #include "BKE_mesh_mapping.hh" diff --git a/source/blender/blenkernel/intern/modifier.cc b/source/blender/blenkernel/intern/modifier.cc index 11b9939541f..b1edb87591a 100644 --- a/source/blender/blenkernel/intern/modifier.cc +++ b/source/blender/blenkernel/intern/modifier.cc @@ -51,7 +51,7 @@ #include "BKE_editmesh_cache.hh" #include "BKE_effect.h" #include "BKE_fluid.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_modifier_legacy.h" #include "BKE_idtype.hh" #include "BKE_key.hh" diff --git a/source/blender/blenkernel/intern/movieclip.cc b/source/blender/blenkernel/intern/movieclip.cc index f6f21cce548..10454caa5ef 100644 --- a/source/blender/blenkernel/intern/movieclip.cc +++ b/source/blender/blenkernel/intern/movieclip.cc @@ -47,7 +47,7 @@ #include "BKE_anim_data.h" #include "BKE_bpath.hh" #include "BKE_colortools.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_image.h" /* openanim */ #include "BKE_lib_id.hh" diff --git a/source/blender/blenkernel/intern/nla.cc b/source/blender/blenkernel/intern/nla.cc index 08504de91a7..ba5a251099b 100644 --- a/source/blender/blenkernel/intern/nla.cc +++ b/source/blender/blenkernel/intern/nla.cc @@ -32,7 +32,7 @@ #include "BKE_action.h" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/node.cc b/source/blender/blenkernel/intern/node.cc index 470a3958c3c..2176127b210 100644 --- a/source/blender/blenkernel/intern/node.cc +++ b/source/blender/blenkernel/intern/node.cc @@ -58,7 +58,7 @@ #include "BKE_colortools.hh" #include "BKE_context.hh" #include "BKE_cryptomatte.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_idprop.hh" #include "BKE_idtype.hh" diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index 774e8756117..8f92e6eacd7 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -89,7 +89,7 @@ #include "BKE_fcurve_driver.h" #include "BKE_geometry_set.hh" #include "BKE_geometry_set_instances.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" #include "BKE_gpencil_modifier_legacy.h" diff --git a/source/blender/blenkernel/intern/object_dupli.cc b/source/blender/blenkernel/intern/object_dupli.cc index 946ccb954b0..14199a37335 100644 --- a/source/blender/blenkernel/intern/object_dupli.cc +++ b/source/blender/blenkernel/intern/object_dupli.cc @@ -45,7 +45,7 @@ #include "BKE_editmesh_cache.hh" #include "BKE_geometry_set.hh" #include "BKE_geometry_set_instances.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_instances.hh" #include "BKE_lattice.hh" diff --git a/source/blender/blenkernel/intern/particle_distribute.cc b/source/blender/blenkernel/intern/particle_distribute.cc index 2834d4f5246..343744cd0d7 100644 --- a/source/blender/blenkernel/intern/particle_distribute.cc +++ b/source/blender/blenkernel/intern/particle_distribute.cc @@ -25,7 +25,7 @@ #include "DNA_scene_types.h" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_mesh.hh" #include "BKE_mesh_legacy_convert.hh" diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.cc b/source/blender/blenkernel/intern/pbvh_bmesh.cc index 078e4774d21..6b084299215 100644 --- a/source/blender/blenkernel/intern/pbvh_bmesh.cc +++ b/source/blender/blenkernel/intern/pbvh_bmesh.cc @@ -35,7 +35,7 @@ static CLG_LogRef LOG = {"pbvh.bmesh"}; /* Avoid skinny faces */ #define USE_EDGEQUEUE_EVEN_SUBDIV #ifdef USE_EDGEQUEUE_EVEN_SUBDIV -# include "BKE_global.h" +# include "BKE_global.hh" #endif namespace blender::bke::pbvh { diff --git a/source/blender/blenkernel/intern/pbvh_pixels.cc b/source/blender/blenkernel/intern/pbvh_pixels.cc index 0a4a16f6ed5..70fe201e7ad 100644 --- a/source/blender/blenkernel/intern/pbvh_pixels.cc +++ b/source/blender/blenkernel/intern/pbvh_pixels.cc @@ -18,7 +18,7 @@ #include "BLI_task.h" #include "BLI_time.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image_wrappers.hh" #include "pbvh_intern.hh" diff --git a/source/blender/blenkernel/intern/pointcache.cc b/source/blender/blenkernel/intern/pointcache.cc index cd65f0ce6f5..6a18d693bb6 100644 --- a/source/blender/blenkernel/intern/pointcache.cc +++ b/source/blender/blenkernel/intern/pointcache.cc @@ -50,7 +50,7 @@ #include "BKE_collection.hh" #include "BKE_dynamicpaint.h" #include "BKE_fluid.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_modifier.hh" diff --git a/source/blender/blenkernel/intern/pointcloud.cc b/source/blender/blenkernel/intern/pointcloud.cc index 85c9bd38534..f23b1abcbdf 100644 --- a/source/blender/blenkernel/intern/pointcloud.cc +++ b/source/blender/blenkernel/intern/pointcloud.cc @@ -28,7 +28,7 @@ #include "BKE_bake_data_block_id.hh" #include "BKE_customdata.hh" #include "BKE_geometry_set.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/report.cc b/source/blender/blenkernel/intern/report.cc index 916cd14daf3..bf215baefb0 100644 --- a/source/blender/blenkernel/intern/report.cc +++ b/source/blender/blenkernel/intern/report.cc @@ -22,7 +22,7 @@ #include "BLT_translation.hh" -#include "BKE_global.h" /* G.background only */ +#include "BKE_global.hh" /* G.background only */ #include "BKE_report.h" const char *BKE_report_type_str(eReportType type) diff --git a/source/blender/blenkernel/intern/rigidbody.cc b/source/blender/blenkernel/intern/rigidbody.cc index d9a7a409b85..2bfd4c04b8b 100644 --- a/source/blender/blenkernel/intern/rigidbody.cc +++ b/source/blender/blenkernel/intern/rigidbody.cc @@ -38,7 +38,7 @@ #include "BKE_collection.hh" #include "BKE_effect.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_main.hh" #include "BKE_mesh.hh" diff --git a/source/blender/blenkernel/intern/softbody.cc b/source/blender/blenkernel/intern/softbody.cc index 16d9d6d3f14..b89931e02de 100644 --- a/source/blender/blenkernel/intern/softbody.cc +++ b/source/blender/blenkernel/intern/softbody.cc @@ -56,7 +56,7 @@ #include "BKE_customdata.hh" #include "BKE_deform.hh" #include "BKE_effect.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" diff --git a/source/blender/blenkernel/intern/sound.cc b/source/blender/blenkernel/intern/sound.cc index 583e0e42c87..0de37b3ac63 100644 --- a/source/blender/blenkernel/intern/sound.cc +++ b/source/blender/blenkernel/intern/sound.cc @@ -41,7 +41,7 @@ #endif #include "BKE_bpath.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/subdiv_ccg.cc b/source/blender/blenkernel/intern/subdiv_ccg.cc index 0d3fab20c03..8e9f9ddc534 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg.cc +++ b/source/blender/blenkernel/intern/subdiv_ccg.cc @@ -21,7 +21,7 @@ #include "BKE_DerivedMesh.hh" #include "BKE_ccg.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_mesh.hh" #include "BKE_subdiv.hh" #include "BKE_subdiv_eval.hh" diff --git a/source/blender/blenkernel/intern/tracking_auto.cc b/source/blender/blenkernel/intern/tracking_auto.cc index d8513a9b298..9f44336daec 100644 --- a/source/blender/blenkernel/intern/tracking_auto.cc +++ b/source/blender/blenkernel/intern/tracking_auto.cc @@ -21,7 +21,7 @@ #include "BLI_time.h" #include "BLI_utildefines.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_movieclip.h" #include "BKE_tracking.h" diff --git a/source/blender/blenkernel/intern/undo_system.cc b/source/blender/blenkernel/intern/undo_system.cc index 75695213962..700a75d717b 100644 --- a/source/blender/blenkernel/intern/undo_system.cc +++ b/source/blender/blenkernel/intern/undo_system.cc @@ -24,7 +24,7 @@ #include "DNA_windowmanager_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_override.hh" #include "BKE_main.hh" #include "BKE_undo_system.hh" diff --git a/source/blender/blenkernel/intern/vfont.cc b/source/blender/blenkernel/intern/vfont.cc index 12f6e81a18b..112670f0f3a 100644 --- a/source/blender/blenkernel/intern/vfont.cc +++ b/source/blender/blenkernel/intern/vfont.cc @@ -39,7 +39,7 @@ #include "BKE_anim_path.h" #include "BKE_bpath.hh" #include "BKE_curve.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/blenkernel/intern/volume.cc b/source/blender/blenkernel/intern/volume.cc index d7ba17e96dc..c81f9837cf8 100644 --- a/source/blender/blenkernel/intern/volume.cc +++ b/source/blender/blenkernel/intern/volume.cc @@ -33,7 +33,7 @@ #include "BKE_bake_data_block_id.hh" #include "BKE_bpath.hh" #include "BKE_geometry_set.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/blenkernel/intern/workspace.cc b/source/blender/blenkernel/intern/workspace.cc index 8771cb1ba55..d9bc1edd757 100644 --- a/source/blender/blenkernel/intern/workspace.cc +++ b/source/blender/blenkernel/intern/workspace.cc @@ -18,7 +18,7 @@ #include "BLT_translation.hh" #include "BKE_asset.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/blenkernel/intern/writeffmpeg.cc b/source/blender/blenkernel/intern/writeffmpeg.cc index 6c524182640..24447fb9b81 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.cc +++ b/source/blender/blenkernel/intern/writeffmpeg.cc @@ -29,7 +29,7 @@ # include "BLI_threads.h" # include "BLI_utildefines.h" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_idprop.h" # include "BKE_image.h" # include "BKE_lib_id.hh" diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index a5771637230..aa715ae32b8 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -65,7 +65,7 @@ #include "BKE_asset.hh" #include "BKE_blender_version.h" #include "BKE_collection.hh" -#include "BKE_global.h" /* for G */ +#include "BKE_global.hh" /* for G */ #include "BKE_idprop.h" #include "BKE_idtype.hh" #include "BKE_layer.hh" diff --git a/source/blender/blenloader/intern/versioning_250.cc b/source/blender/blenloader/intern/versioning_250.cc index 53db056eb84..54459c664d6 100644 --- a/source/blender/blenloader/intern/versioning_250.cc +++ b/source/blender/blenloader/intern/versioning_250.cc @@ -56,7 +56,7 @@ #include "BKE_armature.hh" #include "BKE_colortools.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" /* for G */ +#include "BKE_global.hh" /* for G */ #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_mesh.hh" diff --git a/source/blender/blenloader/intern/versioning_280.cc b/source/blender/blenloader/intern/versioning_280.cc index d171ef16459..92ca4da9adc 100644 --- a/source/blender/blenloader/intern/versioning_280.cc +++ b/source/blender/blenloader/intern/versioning_280.cc @@ -73,7 +73,7 @@ #include "BKE_fcurve.h" #include "BKE_fcurve_driver.h" #include "BKE_freestyle.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" #include "BKE_gpencil_modifier_legacy.h" diff --git a/source/blender/blenloader/intern/writefile.cc b/source/blender/blenloader/intern/writefile.cc index 37aa5a148a9..d527989c24f 100644 --- a/source/blender/blenloader/intern/writefile.cc +++ b/source/blender/blenloader/intern/writefile.cc @@ -101,7 +101,7 @@ #include "BKE_blender_version.h" #include "BKE_bpath.hh" -#include "BKE_global.h" /* For #Global `G`. */ +#include "BKE_global.hh" /* For #Global `G`. */ #include "BKE_idprop.h" #include "BKE_idtype.hh" #include "BKE_layer.hh" diff --git a/source/blender/blenloader/tests/blendfile_loading_base_test.cc b/source/blender/blenloader/tests/blendfile_loading_base_test.cc index 6e3c853b5d2..561d05c0fa6 100644 --- a/source/blender/blenloader/tests/blendfile_loading_base_test.cc +++ b/source/blender/blenloader/tests/blendfile_loading_base_test.cc @@ -9,7 +9,7 @@ #include "BKE_blender.hh" #include "BKE_callbacks.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_image.h" #include "BKE_layer.hh" diff --git a/source/blender/bmesh/intern/bmesh_mesh_normals.cc b/source/blender/bmesh/intern/bmesh_mesh_normals.cc index 5acf31e3e62..f2571d0ae3c 100644 --- a/source/blender/bmesh/intern/bmesh_mesh_normals.cc +++ b/source/blender/bmesh/intern/bmesh_mesh_normals.cc @@ -24,7 +24,7 @@ #include "BKE_customdata.hh" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_mesh.hh" #include "intern/bmesh_private.hh" diff --git a/source/blender/bmesh/operators/bmo_mesh_convert.cc b/source/blender/bmesh/operators/bmo_mesh_convert.cc index 9619e5869bb..98cc5efc2ac 100644 --- a/source/blender/bmesh/operators/bmo_mesh_convert.cc +++ b/source/blender/bmesh/operators/bmo_mesh_convert.cc @@ -17,7 +17,7 @@ #include "bmesh.hh" #include "intern/bmesh_operators_private.hh" -#include "BKE_global.h" +#include "BKE_global.hh" void bmo_mesh_to_bmesh_exec(BMesh *bm, BMOperator *op) { diff --git a/source/blender/compositor/intern/COM_WorkScheduler.cc b/source/blender/compositor/intern/COM_WorkScheduler.cc index 484794f1722..7661fe9938a 100644 --- a/source/blender/compositor/intern/COM_WorkScheduler.cc +++ b/source/blender/compositor/intern/COM_WorkScheduler.cc @@ -19,7 +19,7 @@ #include "BLI_threads.h" #include "BLI_vector.hh" -#include "BKE_global.h" +#include "BKE_global.hh" namespace blender::compositor { diff --git a/source/blender/compositor/operations/COM_CompositorOperation.cc b/source/blender/compositor/operations/COM_CompositorOperation.cc index 6ca2f8bac14..78d8c2a64da 100644 --- a/source/blender/compositor/operations/COM_CompositorOperation.cc +++ b/source/blender/compositor/operations/COM_CompositorOperation.cc @@ -6,7 +6,7 @@ #include "BLI_string.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_scene.h" diff --git a/source/blender/compositor/operations/COM_PreviewOperation.h b/source/blender/compositor/operations/COM_PreviewOperation.h index 9f74c893786..bcf60f0ab2e 100644 --- a/source/blender/compositor/operations/COM_PreviewOperation.h +++ b/source/blender/compositor/operations/COM_PreviewOperation.h @@ -4,7 +4,7 @@ #pragma once -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_rect.h" #include "COM_MultiThreadedOperation.h" #include "DNA_color_types.h" diff --git a/source/blender/compositor/operations/COM_ViewerOperation.h b/source/blender/compositor/operations/COM_ViewerOperation.h index 3c7c5e971a2..83f98049997 100644 --- a/source/blender/compositor/operations/COM_ViewerOperation.h +++ b/source/blender/compositor/operations/COM_ViewerOperation.h @@ -4,7 +4,7 @@ #pragma once -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_rect.h" #include "COM_MultiThreadedOperation.h" #include "DNA_image_types.h" diff --git a/source/blender/depsgraph/intern/builder/pipeline.cc b/source/blender/depsgraph/intern/builder/pipeline.cc index dd75f4e216f..8275f5d1031 100644 --- a/source/blender/depsgraph/intern/builder/pipeline.cc +++ b/source/blender/depsgraph/intern/builder/pipeline.cc @@ -6,7 +6,7 @@ #include "BLI_time.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "DNA_scene_types.h" diff --git a/source/blender/depsgraph/intern/debug/deg_debug.cc b/source/blender/depsgraph/intern/debug/deg_debug.cc index 5f5cfc065f8..3383ad17ea5 100644 --- a/source/blender/depsgraph/intern/debug/deg_debug.cc +++ b/source/blender/depsgraph/intern/debug/deg_debug.cc @@ -14,7 +14,7 @@ #include "BLI_time_utildefines.h" #include "BLI_utildefines.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "intern/depsgraph.hh" diff --git a/source/blender/depsgraph/intern/debug/deg_debug.h b/source/blender/depsgraph/intern/debug/deg_debug.h index 3eceb76943d..29ac35dab67 100644 --- a/source/blender/depsgraph/intern/debug/deg_debug.h +++ b/source/blender/depsgraph/intern/debug/deg_debug.h @@ -10,7 +10,7 @@ #include "intern/depsgraph_type.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "DEG_depsgraph_debug.hh" diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc index 88db9136951..cec14e96e31 100644 --- a/source/blender/depsgraph/intern/depsgraph.cc +++ b/source/blender/depsgraph/intern/depsgraph.cc @@ -19,7 +19,7 @@ #include "BLI_hash.h" #include "BLI_utildefines.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_scene.h" diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index 385a53b0bdf..46268a51c50 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -29,7 +29,7 @@ #include "DNA_windowmanager_types.h" #include "BKE_anim_data.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_lib_override.hh" #include "BKE_node.hh" diff --git a/source/blender/depsgraph/intern/eval/deg_eval.cc b/source/blender/depsgraph/intern/eval/deg_eval.cc index 218a6eccacf..aed3a0090ce 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval.cc @@ -17,7 +17,7 @@ #include "BLI_time.h" #include "BLI_utildefines.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "DNA_node_types.h" #include "DNA_object_types.h" diff --git a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc index 43b8f64eb26..16772166673 100644 --- a/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc +++ b/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc @@ -26,7 +26,7 @@ #include "BLI_utildefines.h" #include "BKE_curve.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_legacy.h" #include "BKE_gpencil_update_cache_legacy.h" #include "BKE_idprop.h" diff --git a/source/blender/draw/engines/basic/basic_engine.cc b/source/blender/draw/engines/basic/basic_engine.cc index 0fbf8c3bc9c..d3b1ed4235b 100644 --- a/source/blender/draw/engines/basic/basic_engine.cc +++ b/source/blender/draw/engines/basic/basic_engine.cc @@ -11,7 +11,7 @@ #include "DRW_render.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_object.hh" #include "BKE_object_types.hh" #include "BKE_paint.hh" diff --git a/source/blender/draw/engines/eevee/eevee_effects.cc b/source/blender/draw/engines/eevee/eevee_effects.cc index 3cd4ca94d23..edfea89a4b4 100644 --- a/source/blender/draw/engines/eevee/eevee_effects.cc +++ b/source/blender/draw/engines/eevee/eevee_effects.cc @@ -10,7 +10,7 @@ #include "DRW_render.hh" -#include "BKE_global.h" /* for G.debug_value */ +#include "BKE_global.hh" /* for G.debug_value */ #include "GPU_capabilities.h" #include "GPU_platform.h" diff --git a/source/blender/draw/engines/eevee/eevee_lightcache.cc b/source/blender/draw/engines/eevee/eevee_lightcache.cc index 02d8d20d059..df6e1ce9733 100644 --- a/source/blender/draw/engines/eevee/eevee_lightcache.cc +++ b/source/blender/draw/engines/eevee/eevee_lightcache.cc @@ -10,7 +10,7 @@ #include "DRW_render.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_endian_switch.h" #include "BLI_threads.h" diff --git a/source/blender/draw/engines/eevee/eevee_materials.cc b/source/blender/draw/engines/eevee/eevee_materials.cc index e5404860f36..2ab9765cbe6 100644 --- a/source/blender/draw/engines/eevee/eevee_materials.cc +++ b/source/blender/draw/engines/eevee/eevee_materials.cc @@ -16,7 +16,7 @@ #include "BLI_rand.h" #include "BLI_string_utils.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_paint.hh" #include "BKE_particle.h" diff --git a/source/blender/draw/engines/eevee/eevee_occlusion.cc b/source/blender/draw/engines/eevee/eevee_occlusion.cc index 8e7c832f39a..c8691033b61 100644 --- a/source/blender/draw/engines/eevee/eevee_occlusion.cc +++ b/source/blender/draw/engines/eevee/eevee_occlusion.cc @@ -14,7 +14,7 @@ #include "DEG_depsgraph_query.hh" -#include "BKE_global.h" /* for G.debug_value */ +#include "BKE_global.hh" /* for G.debug_value */ #include "eevee_private.h" diff --git a/source/blender/draw/engines/eevee/eevee_render.cc b/source/blender/draw/engines/eevee/eevee_render.cc index 78fd8554410..d9d6ada0f61 100644 --- a/source/blender/draw/engines/eevee/eevee_render.cc +++ b/source/blender/draw/engines/eevee/eevee_render.cc @@ -16,7 +16,7 @@ #include "DNA_node_types.h" #include "DNA_object_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_object.hh" #include "BLI_rand.h" diff --git a/source/blender/draw/engines/eevee/eevee_renderpasses.cc b/source/blender/draw/engines/eevee/eevee_renderpasses.cc index 649d0092fcb..b249d83f9af 100644 --- a/source/blender/draw/engines/eevee/eevee_renderpasses.cc +++ b/source/blender/draw/engines/eevee/eevee_renderpasses.cc @@ -11,7 +11,7 @@ #include "draw_color_management.h" /* TODO: remove dependency. */ -#include "BKE_global.h" /* for G.debug_value */ +#include "BKE_global.hh" /* for G.debug_value */ #include "BLI_hash.h" #include "BLI_string_utils.hh" diff --git a/source/blender/draw/engines/eevee/eevee_volumes.cc b/source/blender/draw/engines/eevee/eevee_volumes.cc index eb42b810bfd..791ec1f7a6f 100644 --- a/source/blender/draw/engines/eevee/eevee_volumes.cc +++ b/source/blender/draw/engines/eevee/eevee_volumes.cc @@ -20,7 +20,7 @@ #include "DNA_world_types.h" #include "BKE_fluid.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" #include "BKE_volume.hh" diff --git a/source/blender/draw/engines/eevee_next/eevee_engine.cc b/source/blender/draw/engines/eevee_next/eevee_engine.cc index 0967eccc1fb..039f41a1490 100644 --- a/source/blender/draw/engines/eevee_next/eevee_engine.cc +++ b/source/blender/draw/engines/eevee_next/eevee_engine.cc @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_rect.h" #include "GPU_capabilities.h" diff --git a/source/blender/draw/engines/eevee_next/eevee_hizbuffer.cc b/source/blender/draw/engines/eevee_next/eevee_hizbuffer.cc index 24abd1e4db9..303982fda0e 100644 --- a/source/blender/draw/engines/eevee_next/eevee_hizbuffer.cc +++ b/source/blender/draw/engines/eevee_next/eevee_hizbuffer.cc @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "BKE_global.h" +#include "BKE_global.hh" #include "eevee_instance.hh" diff --git a/source/blender/draw/engines/eevee_next/eevee_instance.cc b/source/blender/draw/engines/eevee_next/eevee_instance.cc index f72e196deeb..6a9f1e04292 100644 --- a/source/blender/draw/engines/eevee_next/eevee_instance.cc +++ b/source/blender/draw/engines/eevee_next/eevee_instance.cc @@ -10,7 +10,7 @@ #include -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_object.hh" #include "BLI_rect.h" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/draw/engines/eevee_next/eevee_lightcache.cc b/source/blender/draw/engines/eevee_next/eevee_lightcache.cc index 420d403def0..65348bbf98c 100644 --- a/source/blender/draw/engines/eevee_next/eevee_lightcache.cc +++ b/source/blender/draw/engines/eevee_next/eevee_lightcache.cc @@ -12,7 +12,7 @@ #include "DRW_render.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lightprobe.h" #include "DNA_lightprobe_types.h" diff --git a/source/blender/draw/engines/eevee_next/eevee_raytrace.cc b/source/blender/draw/engines/eevee_next/eevee_raytrace.cc index 19bab67e568..e46e6e254cc 100644 --- a/source/blender/draw/engines/eevee_next/eevee_raytrace.cc +++ b/source/blender/draw/engines/eevee_next/eevee_raytrace.cc @@ -11,7 +11,7 @@ #include #include -#include "BKE_global.h" +#include "BKE_global.hh" #include "eevee_instance.hh" diff --git a/source/blender/draw/engines/eevee_next/eevee_shadow.cc b/source/blender/draw/engines/eevee_next/eevee_shadow.cc index 3117284bf46..0bfa7e7cf50 100644 --- a/source/blender/draw/engines/eevee_next/eevee_shadow.cc +++ b/source/blender/draw/engines/eevee_next/eevee_shadow.cc @@ -8,7 +8,7 @@ * The shadow module manages shadow update tagging & shadow rendering. */ -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_math_rotation.h" #include "BLI_rect.h" diff --git a/source/blender/draw/engines/eevee_next/eevee_view.cc b/source/blender/draw/engines/eevee_next/eevee_view.cc index 154ad085e01..7b64cbe435f 100644 --- a/source/blender/draw/engines/eevee_next/eevee_view.cc +++ b/source/blender/draw/engines/eevee_next/eevee_view.cc @@ -15,7 +15,7 @@ * its type. Passes are shared between views. */ -#include "BKE_global.h" +#include "BKE_global.hh" #include "DRW_render.hh" #include "eevee_instance.hh" diff --git a/source/blender/draw/engines/gpencil/gpencil_engine_c.cc b/source/blender/draw/engines/gpencil/gpencil_engine_c.cc index 37594d3049d..a3a6c8766cd 100644 --- a/source/blender/draw/engines/gpencil/gpencil_engine_c.cc +++ b/source/blender/draw/engines/gpencil/gpencil_engine_c.cc @@ -17,7 +17,7 @@ #include "BKE_shader_fx.h" #include "BKE_camera.h" -#include "BKE_global.h" /* for G.debug */ +#include "BKE_global.hh" /* for G.debug */ #include "BLI_link_utils.h" #include "BLI_listbase.h" diff --git a/source/blender/draw/engines/overlay/overlay_extra.cc b/source/blender/draw/engines/overlay/overlay_extra.cc index 02697587fb0..3a6b4218e54 100644 --- a/source/blender/draw/engines/overlay/overlay_extra.cc +++ b/source/blender/draw/engines/overlay/overlay_extra.cc @@ -18,7 +18,7 @@ #include "BKE_camera.h" #include "BKE_constraint.h" #include "BKE_curve.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" diff --git a/source/blender/draw/engines/overlay/overlay_outline.cc b/source/blender/draw/engines/overlay/overlay_outline.cc index 4e411dc8c76..eba1ec30274 100644 --- a/source/blender/draw/engines/overlay/overlay_outline.cc +++ b/source/blender/draw/engines/overlay/overlay_outline.cc @@ -10,7 +10,7 @@ #include "DRW_render.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_legacy.h" #include "BKE_object.hh" diff --git a/source/blender/draw/engines/overlay/overlay_private.hh b/source/blender/draw/engines/overlay/overlay_private.hh index e528b779211..24d6abe8c66 100644 --- a/source/blender/draw/engines/overlay/overlay_private.hh +++ b/source/blender/draw/engines/overlay/overlay_private.hh @@ -8,7 +8,7 @@ #pragma once -#include "BKE_global.h" +#include "BKE_global.hh" #include "DRW_gpu_wrapper.hh" #include "DRW_render.hh" diff --git a/source/blender/draw/engines/overlay/overlay_wireframe.cc b/source/blender/draw/engines/overlay/overlay_wireframe.cc index 68198091baf..d1422970dbf 100644 --- a/source/blender/draw/engines/overlay/overlay_wireframe.cc +++ b/source/blender/draw/engines/overlay/overlay_wireframe.cc @@ -16,7 +16,7 @@ #include "BKE_displist.h" #include "BKE_duplilist.h" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_object.hh" #include "BKE_paint.hh" #include "BKE_particle.h" diff --git a/source/blender/draw/intern/DRW_gpu_wrapper.hh b/source/blender/draw/intern/DRW_gpu_wrapper.hh index 2947eb60dac..19ea58c259f 100644 --- a/source/blender/draw/intern/DRW_gpu_wrapper.hh +++ b/source/blender/draw/intern/DRW_gpu_wrapper.hh @@ -64,7 +64,7 @@ #include "draw_manager.h" #include "draw_texture_pool.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_math_vector_types.hh" #include "BLI_span.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_volume.cc b/source/blender/draw/intern/draw_cache_impl_volume.cc index 42126cf48b9..b6f937e4756 100644 --- a/source/blender/draw/intern/draw_cache_impl_volume.cc +++ b/source/blender/draw/intern/draw_cache_impl_volume.cc @@ -20,7 +20,7 @@ #include "DNA_object_types.h" #include "DNA_volume_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_volume.hh" #include "BKE_volume_grid_fwd.hh" #include "BKE_volume_render.hh" diff --git a/source/blender/draw/intern/draw_command.hh b/source/blender/draw/intern/draw_command.hh index ea23b5726d9..419929e2704 100644 --- a/source/blender/draw/intern/draw_command.hh +++ b/source/blender/draw/intern/draw_command.hh @@ -13,7 +13,7 @@ * `DrawMultiBuf`. See implementation details at their definition. */ -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_map.hh" #include "DRW_gpu_wrapper.hh" diff --git a/source/blender/draw/intern/draw_common.cc b/source/blender/draw/intern/draw_common.cc index bc58015016d..c0b5374af38 100644 --- a/source/blender/draw/intern/draw_common.cc +++ b/source/blender/draw/intern/draw_common.cc @@ -17,7 +17,7 @@ #include "BLI_math_color.h" #include "BKE_colorband.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_object.hh" #include "draw_common.h" diff --git a/source/blender/draw/intern/draw_manager.cc b/source/blender/draw/intern/draw_manager.cc index 3b9e3d51e1c..4b4250069f7 100644 --- a/source/blender/draw/intern/draw_manager.cc +++ b/source/blender/draw/intern/draw_manager.cc @@ -6,7 +6,7 @@ * \ingroup draw */ -#include "BKE_global.h" +#include "BKE_global.hh" #include "GPU_compute.h" #include "draw_debug.hh" diff --git a/source/blender/draw/intern/draw_manager_c.cc b/source/blender/draw/intern/draw_manager_c.cc index b1de6d1d6e0..3918c834709 100644 --- a/source/blender/draw/intern/draw_manager_c.cc +++ b/source/blender/draw/intern/draw_manager_c.cc @@ -25,7 +25,7 @@ #include "BKE_curves.h" #include "BKE_duplilist.h" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil.h" #include "BKE_lattice.hh" diff --git a/source/blender/draw/intern/draw_manager_data.cc b/source/blender/draw/intern/draw_manager_data.cc index e18af1b917f..1dfba112acd 100644 --- a/source/blender/draw/intern/draw_manager_data.cc +++ b/source/blender/draw/intern/draw_manager_data.cc @@ -15,7 +15,7 @@ #include "BKE_attribute.hh" #include "BKE_curve.hh" #include "BKE_duplilist.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_mesh.hh" #include "BKE_object.hh" diff --git a/source/blender/draw/intern/draw_manager_exec.cc b/source/blender/draw/intern/draw_manager_exec.cc index 491a864a18c..aa8dc9c835d 100644 --- a/source/blender/draw/intern/draw_manager_exec.cc +++ b/source/blender/draw/intern/draw_manager_exec.cc @@ -12,7 +12,7 @@ #include "BLI_math_bits.h" #include "BLI_memblock.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "GPU_compute.h" #include "GPU_platform.h" diff --git a/source/blender/draw/intern/draw_manager_profiling.cc b/source/blender/draw/intern/draw_manager_profiling.cc index c0f7b9600c2..54d560610a4 100644 --- a/source/blender/draw/intern/draw_manager_profiling.cc +++ b/source/blender/draw/intern/draw_manager_profiling.cc @@ -12,7 +12,7 @@ #include "BLI_rect.h" #include "BLI_string.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLF_api.hh" diff --git a/source/blender/draw/intern/draw_manager_shader.cc b/source/blender/draw/intern/draw_manager_shader.cc index 769bb5c5594..05f371fde88 100644 --- a/source/blender/draw/intern/draw_manager_shader.cc +++ b/source/blender/draw/intern/draw_manager_shader.cc @@ -17,7 +17,7 @@ #include "BLI_time.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/draw/intern/draw_manager_text.cc b/source/blender/draw/intern/draw_manager_text.cc index b02dda327a0..153155cfdde 100644 --- a/source/blender/draw/intern/draw_manager_text.cc +++ b/source/blender/draw/intern/draw_manager_text.cc @@ -18,7 +18,7 @@ #include "BKE_editmesh.hh" #include "BKE_editmesh_cache.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_object.hh" diff --git a/source/blender/draw/intern/draw_texture_pool.cc b/source/blender/draw/intern/draw_texture_pool.cc index 7254b15a425..29638a8644f 100644 --- a/source/blender/draw/intern/draw_texture_pool.cc +++ b/source/blender/draw/intern/draw_texture_pool.cc @@ -6,7 +6,7 @@ * \ingroup draw */ -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_string.h" #include "BLI_vector.hh" diff --git a/source/blender/draw/intern/draw_view_c.cc b/source/blender/draw/intern/draw_view_c.cc index 8200dca4e63..a982282c5d4 100644 --- a/source/blender/draw/intern/draw_view_c.cc +++ b/source/blender/draw/intern/draw_view_c.cc @@ -29,7 +29,7 @@ #include "BLI_math_rotation.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_object.hh" #include "BKE_paint.hh" diff --git a/source/blender/draw/intern/draw_volume.cc b/source/blender/draw/intern/draw_volume.cc index e9a18aa4faf..b0c92e05060 100644 --- a/source/blender/draw/intern/draw_volume.cc +++ b/source/blender/draw/intern/draw_volume.cc @@ -15,7 +15,7 @@ #include "DNA_volume_types.h" #include "BKE_fluid.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" #include "BKE_volume.hh" diff --git a/source/blender/editors/animation/anim_channels_edit.cc b/source/blender/editors/animation/anim_channels_edit.cc index 551adc084e6..4dd31b4fb1c 100644 --- a/source/blender/editors/animation/anim_channels_edit.cc +++ b/source/blender/editors/animation/anim_channels_edit.cc @@ -32,7 +32,7 @@ #include "BKE_anim_data.h" #include "BKE_context.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil.hh" #include "BKE_layer.hh" diff --git a/source/blender/editors/animation/anim_draw.cc b/source/blender/editors/animation/anim_draw.cc index 8c6e1ddd608..bcf15f215d5 100644 --- a/source/blender/editors/animation/anim_draw.cc +++ b/source/blender/editors/animation/anim_draw.cc @@ -26,7 +26,7 @@ #include "BKE_context.hh" #include "BKE_curve.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_mask.h" #include "BKE_nla.h" diff --git a/source/blender/editors/animation/anim_filter.cc b/source/blender/editors/animation/anim_filter.cc index 7c02a1193ef..c44eb15650d 100644 --- a/source/blender/editors/animation/anim_filter.cc +++ b/source/blender/editors/animation/anim_filter.cc @@ -73,7 +73,7 @@ #include "BKE_context.hh" #include "BKE_fcurve.h" #include "BKE_fcurve_driver.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_grease_pencil.hh" #include "BKE_key.hh" #include "BKE_layer.hh" diff --git a/source/blender/editors/animation/anim_ops.cc b/source/blender/editors/animation/anim_ops.cc index 6d673e8090a..fc804bf858e 100644 --- a/source/blender/editors/animation/anim_ops.cc +++ b/source/blender/editors/animation/anim_ops.cc @@ -17,7 +17,7 @@ #include "DNA_scene_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/editors/animation/keyframing.cc b/source/blender/editors/animation/keyframing.cc index 486b7cf3e6b..05017e1e7d9 100644 --- a/source/blender/editors/animation/keyframing.cc +++ b/source/blender/editors/animation/keyframing.cc @@ -31,7 +31,7 @@ #include "BKE_armature.hh" #include "BKE_context.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_nla.h" diff --git a/source/blender/editors/armature/armature_edit.cc b/source/blender/editors/armature/armature_edit.cc index c200b9413fe..a14bbd402c1 100644 --- a/source/blender/editors/armature/armature_edit.cc +++ b/source/blender/editors/armature/armature_edit.cc @@ -26,7 +26,7 @@ #include "BKE_armature.hh" #include "BKE_constraint.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_main.hh" #include "BKE_object.hh" diff --git a/source/blender/editors/armature/armature_utils.cc b/source/blender/editors/armature/armature_utils.cc index 9e52097e3e9..bee5179d7a8 100644 --- a/source/blender/editors/armature/armature_utils.cc +++ b/source/blender/editors/armature/armature_utils.cc @@ -19,7 +19,7 @@ #include "BKE_armature.hh" #include "BKE_context.hh" #include "BKE_deform.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/editors/armature/pose_edit.cc b/source/blender/editors/armature/pose_edit.cc index 80051a3b301..0f99cc280e4 100644 --- a/source/blender/editors/armature/pose_edit.cc +++ b/source/blender/editors/armature/pose_edit.cc @@ -24,7 +24,7 @@ #include "BKE_armature.hh" #include "BKE_context.hh" #include "BKE_deform.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/editors/asset/intern/asset_mark_clear.cc b/source/blender/editors/asset/intern/asset_mark_clear.cc index 3ae7b9a8caf..fdedc0997e0 100644 --- a/source/blender/editors/asset/intern/asset_mark_clear.cc +++ b/source/blender/editors/asset/intern/asset_mark_clear.cc @@ -12,7 +12,7 @@ #include "BKE_asset.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/editors/curve/editcurve.cc b/source/blender/editors/curve/editcurve.cc index 451d9d41c27..4f9b7554a98 100644 --- a/source/blender/editors/curve/editcurve.cc +++ b/source/blender/editors/curve/editcurve.cc @@ -29,7 +29,7 @@ #include "BKE_curve.hh" #include "BKE_displist.h" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_key.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/editors/geometry/geometry_randomization.cc b/source/blender/editors/geometry/geometry_randomization.cc index 050ea5c6cc1..a67e5db341f 100644 --- a/source/blender/editors/geometry/geometry_randomization.cc +++ b/source/blender/editors/geometry/geometry_randomization.cc @@ -5,7 +5,7 @@ #include "WM_api.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "DEG_depsgraph.hh" diff --git a/source/blender/editors/gizmo_library/gizmo_library_utils.cc b/source/blender/editors/gizmo_library/gizmo_library_utils.cc index 6cc2f4562ab..aa4b73bb55c 100644 --- a/source/blender/editors/gizmo_library/gizmo_library_utils.cc +++ b/source/blender/editors/gizmo_library/gizmo_library_utils.cc @@ -14,7 +14,7 @@ #include "DNA_view3d_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "BLI_math_geom.h" diff --git a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc index 30b294326cf..7b660a9fc58 100644 --- a/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc +++ b/source/blender/editors/gizmo_library/gizmo_types/snap3d_gizmo.cc @@ -19,7 +19,7 @@ #include "BLI_math_vector.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "ED_gizmo_library.hh" diff --git a/source/blender/editors/gpencil_legacy/annotate_draw.cc b/source/blender/editors/gpencil_legacy/annotate_draw.cc index 8740ddc1566..c060d0f4b3e 100644 --- a/source/blender/editors/gpencil_legacy/annotate_draw.cc +++ b/source/blender/editors/gpencil_legacy/annotate_draw.cc @@ -32,7 +32,7 @@ #include "DNA_view3d_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_legacy.h" #include "WM_api.hh" diff --git a/source/blender/editors/gpencil_legacy/annotate_paint.cc b/source/blender/editors/gpencil_legacy/annotate_paint.cc index b4c54903935..c0be7dd7129 100644 --- a/source/blender/editors/gpencil_legacy/annotate_paint.cc +++ b/source/blender/editors/gpencil_legacy/annotate_paint.cc @@ -22,7 +22,7 @@ #include "BKE_callbacks.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" #include "BKE_layer.hh" diff --git a/source/blender/editors/gpencil_legacy/drawgpencil.cc b/source/blender/editors/gpencil_legacy/drawgpencil.cc index 819c1ca9f07..caaab40bf20 100644 --- a/source/blender/editors/gpencil_legacy/drawgpencil.cc +++ b/source/blender/editors/gpencil_legacy/drawgpencil.cc @@ -36,7 +36,7 @@ #include "BKE_brush.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_legacy.h" #include "BKE_image.h" #include "BKE_material.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_convert.cc b/source/blender/editors/gpencil_legacy/gpencil_convert.cc index ca8a2daab56..ec698782511 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_convert.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_convert.cc @@ -40,7 +40,7 @@ #include "BKE_context.hh" #include "BKE_curve.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" #include "BKE_image.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_edit.cc b/source/blender/editors/gpencil_legacy/gpencil_edit.cc index 59e5cb86781..8e2f6f7b2a5 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_edit.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_edit.cc @@ -38,7 +38,7 @@ #include "BKE_brush.hh" #include "BKE_context.hh" #include "BKE_deform.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_curve_legacy.h" #include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_paint.cc b/source/blender/editors/gpencil_legacy/gpencil_paint.cc index 34567740edd..6203b8213ee 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_paint.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_paint.cc @@ -37,7 +37,7 @@ #include "BKE_colortools.hh" #include "BKE_context.hh" #include "BKE_deform.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_curve_legacy.h" #include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" diff --git a/source/blender/editors/gpencil_legacy/gpencil_primitive.cc b/source/blender/editors/gpencil_legacy/gpencil_primitive.cc index a212149f8ad..59c67d9103e 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_primitive.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_primitive.cc @@ -38,7 +38,7 @@ #include "BKE_colortools.hh" #include "BKE_context.hh" #include "BKE_deform.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" #include "BKE_main.hh" diff --git a/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc b/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc index a8fbe57b1c2..a09c97a2867 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_trace_ops.cc @@ -18,7 +18,7 @@ #include "DNA_screen_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_legacy.h" #include "BKE_image.h" #include "BKE_layer.hh" diff --git a/source/blender/editors/include/ED_undo.hh b/source/blender/editors/include/ED_undo.hh index 26ac9dbed01..ca9bdcee49b 100644 --- a/source/blender/editors/include/ED_undo.hh +++ b/source/blender/editors/include/ED_undo.hh @@ -113,7 +113,7 @@ Base **ED_undo_editmode_bases_from_view_layer(const Scene *scene, * this is needed for modes which handle undo themselves (bypassing #ED_undo_push). * * Using global isn't great, this just avoids doing inline, - * causing 'BKE_global.h' & 'BKE_main.hh' includes. + * causing 'BKE_global.hh' & 'BKE_main.hh' includes. */ UndoStack *ED_undo_stack_get(); diff --git a/source/blender/editors/interface/interface_anim.cc b/source/blender/editors/interface/interface_anim.cc index 1c8eb8b0fb7..8454a3243dd 100644 --- a/source/blender/editors/interface/interface_anim.cc +++ b/source/blender/editors/interface/interface_anim.cc @@ -25,7 +25,7 @@ #include "BKE_context.hh" #include "BKE_fcurve.h" #include "BKE_fcurve_driver.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "BKE_nla.h" diff --git a/source/blender/editors/interface/interface_icons.cc b/source/blender/editors/interface/interface_icons.cc index 7b1fd247e1b..80fc5484850 100644 --- a/source/blender/editors/interface/interface_icons.cc +++ b/source/blender/editors/interface/interface_icons.cc @@ -42,7 +42,7 @@ #include "BKE_appdir.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_icons.h" #include "BKE_paint.hh" #include "BKE_preview_image.hh" diff --git a/source/blender/editors/interface/interface_layout.cc b/source/blender/editors/interface/interface_layout.cc index 2bbc53bf905..05e3c307a56 100644 --- a/source/blender/editors/interface/interface_layout.cc +++ b/source/blender/editors/interface/interface_layout.cc @@ -32,7 +32,7 @@ #include "BKE_anim_data.h" #include "BKE_armature.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_screen.hh" diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc index 6a54f530f5e..0a2ac11ebd6 100644 --- a/source/blender/editors/interface/interface_ops.cc +++ b/source/blender/editors/interface/interface_ops.cc @@ -27,7 +27,7 @@ #include "BLT_translation.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_idtype.hh" #include "BKE_layer.hh" diff --git a/source/blender/editors/interface/interface_style.cc b/source/blender/editors/interface/interface_style.cc index 73fee69430d..87c82cdf805 100644 --- a/source/blender/editors/interface/interface_style.cc +++ b/source/blender/editors/interface/interface_style.cc @@ -21,7 +21,7 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLF_api.hh" diff --git a/source/blender/editors/interface/interface_template_search_menu.cc b/source/blender/editors/interface/interface_template_search_menu.cc index bb68d716428..d7dfe215648 100644 --- a/source/blender/editors/interface/interface_template_search_menu.cc +++ b/source/blender/editors/interface/interface_template_search_menu.cc @@ -37,7 +37,7 @@ #include "BLT_translation.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_screen.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/interface/interface_template_search_operator.cc b/source/blender/editors/interface/interface_template_search_operator.cc index d5bec6cedbb..8997119903a 100644 --- a/source/blender/editors/interface/interface_template_search_operator.cc +++ b/source/blender/editors/interface/interface_template_search_operator.cc @@ -25,7 +25,7 @@ #include "BLT_translation.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "WM_api.hh" #include "WM_types.hh" diff --git a/source/blender/editors/interface/interface_templates.cc b/source/blender/editors/interface/interface_templates.cc index 259633dddbe..5135b1c8f09 100644 --- a/source/blender/editors/interface/interface_templates.cc +++ b/source/blender/editors/interface/interface_templates.cc @@ -55,7 +55,7 @@ #include "BKE_constraint.h" #include "BKE_context.hh" #include "BKE_curveprofile.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_modifier_legacy.h" #include "BKE_idprop.h" #include "BKE_idtype.hh" diff --git a/source/blender/editors/interface/interface_utils.cc b/source/blender/editors/interface/interface_utils.cc index 16f817359f7..8cdfd259fca 100644 --- a/source/blender/editors/interface/interface_utils.cc +++ b/source/blender/editors/interface/interface_utils.cc @@ -23,7 +23,7 @@ #include "BLT_translation.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_lib_id.hh" #include "BKE_report.h" diff --git a/source/blender/editors/interface/view2d.cc b/source/blender/editors/interface/view2d.cc index 569ef81c7d2..06cc84b50bf 100644 --- a/source/blender/editors/interface/view2d.cc +++ b/source/blender/editors/interface/view2d.cc @@ -27,7 +27,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_screen.hh" #include "GPU_immediate.h" diff --git a/source/blender/editors/mesh/editface.cc b/source/blender/editors/mesh/editface.cc index ffcb8e96426..82909a8e45d 100644 --- a/source/blender/editors/mesh/editface.cc +++ b/source/blender/editors/mesh/editface.cc @@ -27,7 +27,7 @@ #include "BKE_attribute.hh" #include "BKE_context.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_mesh.hh" #include "BKE_mesh_mapping.hh" #include "BKE_object.hh" diff --git a/source/blender/editors/mesh/editmesh_bevel.cc b/source/blender/editors/mesh/editmesh_bevel.cc index c2e4072f522..8bcbf51223b 100644 --- a/source/blender/editors/mesh/editmesh_bevel.cc +++ b/source/blender/editors/mesh/editmesh_bevel.cc @@ -20,7 +20,7 @@ #include "BKE_context.hh" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_unit.hh" diff --git a/source/blender/editors/mesh/editmesh_bisect.cc b/source/blender/editors/mesh/editmesh_bisect.cc index c8087e569f0..97ad2c424af 100644 --- a/source/blender/editors/mesh/editmesh_bisect.cc +++ b/source/blender/editors/mesh/editmesh_bisect.cc @@ -14,7 +14,7 @@ #include "BKE_context.hh" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_report.h" diff --git a/source/blender/editors/mesh/editmesh_inset.cc b/source/blender/editors/mesh/editmesh_inset.cc index 421c80e4216..f4419d49502 100644 --- a/source/blender/editors/mesh/editmesh_inset.cc +++ b/source/blender/editors/mesh/editmesh_inset.cc @@ -18,7 +18,7 @@ #include "BKE_context.hh" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_unit.hh" diff --git a/source/blender/editors/mesh/editmesh_utils.cc b/source/blender/editors/mesh/editmesh_utils.cc index 3936caaf293..65f939e8d74 100644 --- a/source/blender/editors/mesh/editmesh_utils.cc +++ b/source/blender/editors/mesh/editmesh_utils.cc @@ -24,7 +24,7 @@ #include "BKE_customdata.hh" #include "BKE_editmesh.hh" #include "BKE_editmesh_bvh.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_main.hh" #include "BKE_mesh.hh" diff --git a/source/blender/editors/object/object_bake.cc b/source/blender/editors/object/object_bake.cc index 6d9616127d8..c435372f34f 100644 --- a/source/blender/editors/object/object_bake.cc +++ b/source/blender/editors/object/object_bake.cc @@ -28,7 +28,7 @@ #include "BKE_cdderivedmesh.h" #include "BKE_context.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_material.h" #include "BKE_mesh.hh" diff --git a/source/blender/editors/object/object_bake_api.cc b/source/blender/editors/object/object_bake_api.cc index d32b171e887..6923523049e 100644 --- a/source/blender/editors/object/object_bake_api.cc +++ b/source/blender/editors/object/object_bake_api.cc @@ -27,7 +27,7 @@ #include "BKE_callbacks.hh" #include "BKE_context.hh" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_image_format.h" #include "BKE_layer.hh" diff --git a/source/blender/editors/object/object_bake_simulation.cc b/source/blender/editors/object/object_bake_simulation.cc index 0adf202c146..46345d3bb55 100644 --- a/source/blender/editors/object/object_bake_simulation.cc +++ b/source/blender/editors/object/object_bake_simulation.cc @@ -32,7 +32,7 @@ #include "BKE_bake_geometry_nodes_modifier.hh" #include "BKE_context.hh" #include "BKE_curves.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_instances.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/editors/object/object_edit.cc b/source/blender/editors/object/object_edit.cc index 7705e47646c..c661f10c7cd 100644 --- a/source/blender/editors/object/object_edit.cc +++ b/source/blender/editors/object/object_edit.cc @@ -48,7 +48,7 @@ #include "BKE_editlattice.h" #include "BKE_editmesh.hh" #include "BKE_effect.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_lattice.hh" #include "BKE_layer.hh" diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc index 69df99d2ce2..48f239cd8ff 100644 --- a/source/blender/editors/object/object_modifier.cc +++ b/source/blender/editors/object/object_modifier.cc @@ -49,7 +49,7 @@ #include "BKE_editmesh.hh" #include "BKE_effect.h" #include "BKE_geometry_set.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_modifier_legacy.h" #include "BKE_idprop.h" #include "BKE_key.hh" diff --git a/source/blender/editors/object/object_remesh.cc b/source/blender/editors/object/object_remesh.cc index 35ac083e795..2029815406e 100644 --- a/source/blender/editors/object/object_remesh.cc +++ b/source/blender/editors/object/object_remesh.cc @@ -27,7 +27,7 @@ #include "BKE_attribute.hh" #include "BKE_context.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_mesh.hh" diff --git a/source/blender/editors/physics/dynamicpaint_ops.cc b/source/blender/editors/physics/dynamicpaint_ops.cc index 7ec59d5c57f..e85ee312972 100644 --- a/source/blender/editors/physics/dynamicpaint_ops.cc +++ b/source/blender/editors/physics/dynamicpaint_ops.cc @@ -28,7 +28,7 @@ #include "BKE_context.hh" #include "BKE_deform.hh" #include "BKE_dynamicpaint.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "BKE_modifier.hh" #include "BKE_object_deform.h" diff --git a/source/blender/editors/physics/particle_edit.cc b/source/blender/editors/physics/particle_edit.cc index 85b44e1aa7e..a6c075afd31 100644 --- a/source/blender/editors/physics/particle_edit.cc +++ b/source/blender/editors/physics/particle_edit.cc @@ -33,7 +33,7 @@ #include "BKE_bvhutils.hh" #include "BKE_context.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_main.hh" #include "BKE_mesh.hh" diff --git a/source/blender/editors/physics/particle_object.cc b/source/blender/editors/physics/particle_object.cc index 96ee99149fc..e8ec25c6aa7 100644 --- a/source/blender/editors/physics/particle_object.cc +++ b/source/blender/editors/physics/particle_object.cc @@ -26,7 +26,7 @@ #include "BKE_bvhutils.hh" #include "BKE_context.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/editors/physics/physics_fluid.cc b/source/blender/editors/physics/physics_fluid.cc index da84c7eb9a4..8e4d398c064 100644 --- a/source/blender/editors/physics/physics_fluid.cc +++ b/source/blender/editors/physics/physics_fluid.cc @@ -26,7 +26,7 @@ #include "BKE_context.hh" #include "BKE_fluid.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "BKE_modifier.hh" #include "BKE_report.h" diff --git a/source/blender/editors/physics/physics_pointcache.cc b/source/blender/editors/physics/physics_pointcache.cc index a3bd9764b61..44a120cc4c5 100644 --- a/source/blender/editors/physics/physics_pointcache.cc +++ b/source/blender/editors/physics/physics_pointcache.cc @@ -17,7 +17,7 @@ #include "DNA_scene_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_pointcache.h" diff --git a/source/blender/editors/render/render_internal.cc b/source/blender/editors/render/render_internal.cc index cdd6d2b45a3..caf98aa1bb7 100644 --- a/source/blender/editors/render/render_internal.cc +++ b/source/blender/editors/render/render_internal.cc @@ -30,7 +30,7 @@ #include "BKE_colortools.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_image_format.h" #include "BKE_layer.hh" diff --git a/source/blender/editors/render/render_opengl.cc b/source/blender/editors/render/render_opengl.cc index 56c8880a0d6..6b1099ea7fd 100644 --- a/source/blender/editors/render/render_opengl.cc +++ b/source/blender/editors/render/render_opengl.cc @@ -33,7 +33,7 @@ #include "BKE_context.hh" #include "BKE_customdata.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_image_format.h" #include "BKE_image_save.h" diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc index 53add52745e..432d4e50675 100644 --- a/source/blender/editors/render/render_preview.cc +++ b/source/blender/editors/render/render_preview.cc @@ -48,7 +48,7 @@ #include "BKE_brush.hh" #include "BKE_colortools.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_icons.h" #include "BKE_idprop.h" #include "BKE_image.h" diff --git a/source/blender/editors/render/render_shading.cc b/source/blender/editors/render/render_shading.cc index a3ca85e1945..eea8febee29 100644 --- a/source/blender/editors/render/render_shading.cc +++ b/source/blender/editors/render/render_shading.cc @@ -40,7 +40,7 @@ #include "BKE_context.hh" #include "BKE_curve.hh" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_layer.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/editors/render/render_view.cc b/source/blender/editors/render/render_view.cc index 0f013143f2e..0155f21f946 100644 --- a/source/blender/editors/render/render_view.cc +++ b/source/blender/editors/render/render_view.cc @@ -16,7 +16,7 @@ #include "DNA_userdef_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_main.hh" #include "BKE_report.h" diff --git a/source/blender/editors/scene/scene_edit.cc b/source/blender/editors/scene/scene_edit.cc index 4d210e1b823..63bdcfb92ee 100644 --- a/source/blender/editors/scene/scene_edit.cc +++ b/source/blender/editors/scene/scene_edit.cc @@ -16,7 +16,7 @@ #include "DNA_sequence_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/editors/screen/area.cc b/source/blender/editors/screen/area.cc index cc78c0c67fd..bd4df9fb7e3 100644 --- a/source/blender/editors/screen/area.cc +++ b/source/blender/editors/screen/area.cc @@ -20,7 +20,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_screen.hh" #include "BKE_workspace.h" diff --git a/source/blender/editors/screen/screen_edit.cc b/source/blender/editors/screen/screen_edit.cc index 5fb23b3386f..e19f9f9b02f 100644 --- a/source/blender/editors/screen/screen_edit.cc +++ b/source/blender/editors/screen/screen_edit.cc @@ -20,7 +20,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_icons.h" #include "BKE_image.h" #include "BKE_layer.hh" diff --git a/source/blender/editors/screen/screen_ops.cc b/source/blender/editors/screen/screen_ops.cc index f42465b63a0..8bf187a8608 100644 --- a/source/blender/editors/screen/screen_ops.cc +++ b/source/blender/editors/screen/screen_ops.cc @@ -36,7 +36,7 @@ #include "BKE_context.hh" #include "BKE_editmesh.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_icons.h" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/editors/screen/screendump.cc b/source/blender/editors/screen/screendump.cc index c1cfe232a47..a06e45632af 100644 --- a/source/blender/editors/screen/screendump.cc +++ b/source/blender/editors/screen/screendump.cc @@ -23,7 +23,7 @@ #include "DNA_space_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_image_format.h" #include "BKE_main.hh" diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc index b9679b1a510..0d2a0198c52 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc @@ -57,7 +57,7 @@ #include "BKE_colortools.hh" #include "BKE_context.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_image.h" #include "BKE_layer.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc index 6929818b9af..c61d1b40751 100644 --- a/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_dyntopo.cc @@ -16,7 +16,7 @@ #include "DNA_modifier_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.cc b/source/blender/editors/sculpt_paint/sculpt_undo.cc index 7ca75c38271..d43bef76939 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.cc +++ b/source/blender/editors/sculpt_paint/sculpt_undo.cc @@ -49,7 +49,7 @@ #include "BKE_ccg.h" #include "BKE_context.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_key.hh" #include "BKE_layer.hh" #include "BKE_main.hh" diff --git a/source/blender/editors/sound/sound_ops.cc b/source/blender/editors/sound/sound_ops.cc index 8d4cba9e658..6ad371a2ff7 100644 --- a/source/blender/editors/sound/sound_ops.cc +++ b/source/blender/editors/sound/sound_ops.cc @@ -24,7 +24,7 @@ #include "BKE_context.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_packedFile.h" diff --git a/source/blender/editors/space_action/action_edit.cc b/source/blender/editors/space_action/action_edit.cc index e66d759c7bb..5630781c47a 100644 --- a/source/blender/editors/space_action/action_edit.cc +++ b/source/blender/editors/space_action/action_edit.cc @@ -34,7 +34,7 @@ #include "BKE_animsys.h" #include "BKE_context.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil.hh" #include "BKE_key.hh" diff --git a/source/blender/editors/space_clip/clip_editor.cc b/source/blender/editors/space_clip/clip_editor.cc index 92c299133e1..b32744e70d8 100644 --- a/source/blender/editors/space_clip/clip_editor.cc +++ b/source/blender/editors/space_clip/clip_editor.cc @@ -30,7 +30,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_mask.h" diff --git a/source/blender/editors/space_clip/clip_ops.cc b/source/blender/editors/space_clip/clip_ops.cc index d21a6da7666..e7ce653862f 100644 --- a/source/blender/editors/space_clip/clip_ops.cc +++ b/source/blender/editors/space_clip/clip_ops.cc @@ -34,7 +34,7 @@ #include "BLT_translation.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_movieclip.h" diff --git a/source/blender/editors/space_clip/tracking_ops_solve.cc b/source/blender/editors/space_clip/tracking_ops_solve.cc index 27dc8a0b853..c3b905ea768 100644 --- a/source/blender/editors/space_clip/tracking_ops_solve.cc +++ b/source/blender/editors/space_clip/tracking_ops_solve.cc @@ -17,7 +17,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_movieclip.h" #include "BKE_report.h" diff --git a/source/blender/editors/space_clip/tracking_ops_track.cc b/source/blender/editors/space_clip/tracking_ops_track.cc index af4c2493a88..ba7cbfae896 100644 --- a/source/blender/editors/space_clip/tracking_ops_track.cc +++ b/source/blender/editors/space_clip/tracking_ops_track.cc @@ -15,7 +15,7 @@ #include "BLT_translation.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "BKE_movieclip.h" #include "BKE_tracking.h" diff --git a/source/blender/editors/space_console/space_console.cc b/source/blender/editors/space_console/space_console.cc index f4485f428ad..8525f290058 100644 --- a/source/blender/editors/space_console/space_console.cc +++ b/source/blender/editors/space_console/space_console.cc @@ -15,7 +15,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_screen.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/space_file/file_ops.cc b/source/blender/editors/space_file/file_ops.cc index 357df12482c..885b83c5e81 100644 --- a/source/blender/editors/space_file/file_ops.cc +++ b/source/blender/editors/space_file/file_ops.cc @@ -14,7 +14,7 @@ #include "BKE_appdir.hh" #include "BKE_blendfile.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "BKE_report.h" #include "BKE_screen.hh" diff --git a/source/blender/editors/space_file/filelist.cc b/source/blender/editors/space_file/filelist.cc index 04fcd9217c6..9e4c58174cf 100644 --- a/source/blender/editors/space_file/filelist.cc +++ b/source/blender/editors/space_file/filelist.cc @@ -51,7 +51,7 @@ #include "BKE_asset.hh" #include "BKE_blendfile.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_icons.h" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/editors/space_file/space_file.cc b/source/blender/editors/space_file/space_file.cc index ba3ddcaa44c..be3a0d53c77 100644 --- a/source/blender/editors/space_file/space_file.cc +++ b/source/blender/editors/space_file/space_file.cc @@ -17,7 +17,7 @@ #include "BKE_appdir.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_query.hh" #include "BKE_lib_remap.hh" #include "BKE_main.hh" diff --git a/source/blender/editors/space_graph/graph_buttons.cc b/source/blender/editors/space_graph/graph_buttons.cc index f36ae62462c..c295d950c10 100644 --- a/source/blender/editors/space_graph/graph_buttons.cc +++ b/source/blender/editors/space_graph/graph_buttons.cc @@ -30,7 +30,7 @@ #include "BKE_curve.hh" #include "BKE_fcurve.h" #include "BKE_fcurve_driver.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "BKE_screen.hh" #include "BKE_unit.hh" diff --git a/source/blender/editors/space_graph/graph_edit.cc b/source/blender/editors/space_graph/graph_edit.cc index 0ca37a935f8..b465329bdee 100644 --- a/source/blender/editors/space_graph/graph_edit.cc +++ b/source/blender/editors/space_graph/graph_edit.cc @@ -37,7 +37,7 @@ #include "BKE_animsys.h" #include "BKE_context.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_nla.h" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/editors/space_graph/graph_ops.cc b/source/blender/editors/space_graph/graph_ops.cc index 0b01c62e01e..fe43a500516 100644 --- a/source/blender/editors/space_graph/graph_ops.cc +++ b/source/blender/editors/space_graph/graph_ops.cc @@ -16,7 +16,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "UI_view2d.hh" diff --git a/source/blender/editors/space_image/image_edit.cc b/source/blender/editors/space_image/image_edit.cc index 7f39bb91ee4..a8baabc3fa6 100644 --- a/source/blender/editors/space_image/image_edit.cc +++ b/source/blender/editors/space_image/image_edit.cc @@ -17,7 +17,7 @@ #include "BKE_colortools.hh" #include "BKE_context.hh" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_layer.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/editors/space_image/image_ops.cc b/source/blender/editors/space_image/image_ops.cc index 677ddd3c136..7219441bd7e 100644 --- a/source/blender/editors/space_image/image_ops.cc +++ b/source/blender/editors/space_image/image_ops.cc @@ -36,7 +36,7 @@ #include "BKE_colortools.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_icons.h" #include "BKE_image.h" #include "BKE_image_format.h" diff --git a/source/blender/editors/space_info/info_ops.cc b/source/blender/editors/space_info/info_ops.cc index 1a60376e796..c0541b53844 100644 --- a/source/blender/editors/space_info/info_ops.cc +++ b/source/blender/editors/space_info/info_ops.cc @@ -22,7 +22,7 @@ #include "BKE_bpath.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/editors/space_nla/nla_tracks.cc b/source/blender/editors/space_nla/nla_tracks.cc index 40aec83d92e..047d8a59cd5 100644 --- a/source/blender/editors/space_nla/nla_tracks.cc +++ b/source/blender/editors/space_nla/nla_tracks.cc @@ -20,7 +20,7 @@ #include "BKE_anim_data.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_nla.h" #include "BKE_report.h" diff --git a/source/blender/editors/space_node/clipboard.cc b/source/blender/editors/space_node/clipboard.cc index fdd76cb06d4..7e076026530 100644 --- a/source/blender/editors/space_node/clipboard.cc +++ b/source/blender/editors/space_node/clipboard.cc @@ -5,7 +5,7 @@ #include "DNA_space_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_node.hh" diff --git a/source/blender/editors/space_node/node_draw.cc b/source/blender/editors/space_node/node_draw.cc index c8d9042770f..3e4ccc353b8 100644 --- a/source/blender/editors/space_node/node_draw.cc +++ b/source/blender/editors/space_node/node_draw.cc @@ -37,7 +37,7 @@ #include "BKE_compute_contexts.hh" #include "BKE_context.hh" #include "BKE_curves.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc index 693a3525e6b..a784c539da2 100644 --- a/source/blender/editors/space_node/node_edit.cc +++ b/source/blender/editors/space_node/node_edit.cc @@ -18,7 +18,7 @@ #include "BKE_callbacks.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_image_format.h" #include "BKE_lib_id.hh" diff --git a/source/blender/editors/space_node/node_shader_preview.cc b/source/blender/editors/space_node/node_shader_preview.cc index 4dad85296c5..0e748261b4b 100644 --- a/source/blender/editors/space_node/node_shader_preview.cc +++ b/source/blender/editors/space_node/node_shader_preview.cc @@ -34,7 +34,7 @@ #include "BKE_colortools.hh" #include "BKE_compute_contexts.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/editors/space_outliner/outliner_tools.cc b/source/blender/editors/space_outliner/outliner_tools.cc index 45076c60486..127396ce348 100644 --- a/source/blender/editors/space_outliner/outliner_tools.cc +++ b/source/blender/editors/space_outliner/outliner_tools.cc @@ -44,7 +44,7 @@ #include "BKE_constraint.h" #include "BKE_context.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_grease_pencil.hh" #include "BKE_idtype.hh" #include "BKE_layer.hh" diff --git a/source/blender/editors/space_sequencer/sequencer_add.cc b/source/blender/editors/space_sequencer/sequencer_add.cc index bd334d8651f..7c74682c755 100644 --- a/source/blender/editors/space_sequencer/sequencer_add.cc +++ b/source/blender/editors/space_sequencer/sequencer_add.cc @@ -25,7 +25,7 @@ #include "DNA_space_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_mask.h" diff --git a/source/blender/editors/space_sequencer/sequencer_buttons.cc b/source/blender/editors/space_sequencer/sequencer_buttons.cc index 15760c785ab..bb691a4f142 100644 --- a/source/blender/editors/space_sequencer/sequencer_buttons.cc +++ b/source/blender/editors/space_sequencer/sequencer_buttons.cc @@ -18,7 +18,7 @@ #include "BLT_translation.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_screen.hh" #include "ED_screen.hh" diff --git a/source/blender/editors/space_sequencer/sequencer_drag_drop.cc b/source/blender/editors/space_sequencer/sequencer_drag_drop.cc index 8db304c39dd..0e27190d25e 100644 --- a/source/blender/editors/space_sequencer/sequencer_drag_drop.cc +++ b/source/blender/editors/space_sequencer/sequencer_drag_drop.cc @@ -15,7 +15,7 @@ #include "BLI_string_utils.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_main.hh" diff --git a/source/blender/editors/space_sequencer/sequencer_edit.cc b/source/blender/editors/space_sequencer/sequencer_edit.cc index 71b75d44be6..a524f0084a7 100644 --- a/source/blender/editors/space_sequencer/sequencer_edit.cc +++ b/source/blender/editors/space_sequencer/sequencer_edit.cc @@ -23,7 +23,7 @@ #include "BKE_context.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "BKE_report.h" #include "BKE_sound.h" diff --git a/source/blender/editors/space_sequencer/sequencer_preview.cc b/source/blender/editors/space_sequencer/sequencer_preview.cc index f51622e7add..9554ca1703f 100644 --- a/source/blender/editors/space_sequencer/sequencer_preview.cc +++ b/source/blender/editors/space_sequencer/sequencer_preview.cc @@ -14,7 +14,7 @@ #include "BLI_threads.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_sound.h" #include "WM_api.hh" diff --git a/source/blender/editors/space_sequencer/sequencer_preview_draw.cc b/source/blender/editors/space_sequencer/sequencer_preview_draw.cc index c175e464c92..339aabafe7e 100644 --- a/source/blender/editors/space_sequencer/sequencer_preview_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_preview_draw.cc @@ -22,7 +22,7 @@ #include "DNA_space_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_scene.h" #include "IMB_colormanagement.hh" diff --git a/source/blender/editors/space_sequencer/sequencer_proxy.cc b/source/blender/editors/space_sequencer/sequencer_proxy.cc index 889cdb765c2..c2f83b4dff9 100644 --- a/source/blender/editors/space_sequencer/sequencer_proxy.cc +++ b/source/blender/editors/space_sequencer/sequencer_proxy.cc @@ -14,7 +14,7 @@ #include "DNA_scene_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "BKE_report.h" diff --git a/source/blender/editors/space_sequencer/sequencer_thumbnails.cc b/source/blender/editors/space_sequencer/sequencer_thumbnails.cc index 1dd782586ae..61ace2b1e4f 100644 --- a/source/blender/editors/space_sequencer/sequencer_thumbnails.cc +++ b/source/blender/editors/space_sequencer/sequencer_thumbnails.cc @@ -10,7 +10,7 @@ #include "BLI_ghash.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_scene.h" #include "IMB_imbuf.hh" diff --git a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc index e6eb8fc080a..04b275e7dd5 100644 --- a/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc +++ b/source/blender/editors/space_sequencer/sequencer_timeline_draw.cc @@ -22,7 +22,7 @@ #include "BKE_context.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_scene.h" #include "BKE_sound.h" diff --git a/source/blender/editors/space_sequencer/space_sequencer.cc b/source/blender/editors/space_sequencer/space_sequencer.cc index 86f2ec92f50..edcf9243e40 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.cc +++ b/source/blender/editors/space_sequencer/space_sequencer.cc @@ -20,7 +20,7 @@ #include "BLI_ghash.h" #include "BLI_math_base.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_query.hh" #include "BKE_lib_remap.hh" #include "BKE_screen.hh" diff --git a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc index e20fdff2df2..9a15bfc02e1 100644 --- a/source/blender/editors/space_spreadsheet/space_spreadsheet.cc +++ b/source/blender/editors/space_spreadsheet/space_spreadsheet.cc @@ -7,7 +7,7 @@ #include "BLI_listbase.h" #include "BLI_string.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_remap.hh" #include "BKE_screen.hh" diff --git a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc index 0d9cd7654be..ea429b64182 100644 --- a/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc +++ b/source/blender/editors/space_spreadsheet/spreadsheet_data_source_geometry.cc @@ -12,7 +12,7 @@ #include "BKE_editmesh.hh" #include "BKE_geometry_fields.hh" #include "BKE_geometry_set.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_grease_pencil.hh" #include "BKE_instances.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/editors/space_text/space_text.cc b/source/blender/editors/space_text/space_text.cc index bec54c4e3f7..2e288a32095 100644 --- a/source/blender/editors/space_text/space_text.cc +++ b/source/blender/editors/space_text/space_text.cc @@ -15,7 +15,7 @@ #include "BLI_blenlib.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_lib_remap.hh" diff --git a/source/blender/editors/space_topbar/space_topbar.cc b/source/blender/editors/space_topbar/space_topbar.cc index 0a59cfaf005..173d9bd0704 100644 --- a/source/blender/editors/space_topbar/space_topbar.cc +++ b/source/blender/editors/space_topbar/space_topbar.cc @@ -18,7 +18,7 @@ #include "BKE_blendfile.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_screen.hh" #include "BKE_undo_system.hh" diff --git a/source/blender/editors/space_view3d/drawobject.cc b/source/blender/editors/space_view3d/drawobject.cc index 0a3bcb42e2a..20018adfb53 100644 --- a/source/blender/editors/space_view3d/drawobject.cc +++ b/source/blender/editors/space_view3d/drawobject.cc @@ -14,7 +14,7 @@ #include "BKE_DerivedMesh.hh" #include "BKE_customdata.hh" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_mesh.hh" #include "BKE_mesh_runtime.hh" #include "BKE_object.hh" diff --git a/source/blender/editors/space_view3d/space_view3d.cc b/source/blender/editors/space_view3d/space_view3d.cc index 9f6fdc59333..b27bbbfd7b5 100644 --- a/source/blender/editors/space_view3d/space_view3d.cc +++ b/source/blender/editors/space_view3d/space_view3d.cc @@ -36,7 +36,7 @@ #include "BKE_asset.hh" #include "BKE_context.hh" #include "BKE_curve.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_legacy.h" #include "BKE_icons.h" #include "BKE_idprop.h" diff --git a/source/blender/editors/space_view3d/view3d_cursor_snap.cc b/source/blender/editors/space_view3d/view3d_cursor_snap.cc index 84ac9e62b29..fc78358ab0e 100644 --- a/source/blender/editors/space_view3d/view3d_cursor_snap.cc +++ b/source/blender/editors/space_view3d/view3d_cursor_snap.cc @@ -18,7 +18,7 @@ #include "MEM_guardedalloc.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_main.hh" #include "BKE_object.hh" diff --git a/source/blender/editors/space_view3d/view3d_draw.cc b/source/blender/editors/space_view3d/view3d_draw.cc index 91097e6b559..ddb0c731cd6 100644 --- a/source/blender/editors/space_view3d/view3d_draw.cc +++ b/source/blender/editors/space_view3d/view3d_draw.cc @@ -23,7 +23,7 @@ #include "BKE_collection.hh" #include "BKE_context.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_key.hh" #include "BKE_layer.hh" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc index 6d677d55a04..23df20521d4 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_preselect_type.cc @@ -19,7 +19,7 @@ #include "BKE_context.hh" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" diff --git a/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.cc b/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.cc index a000564230f..952fee17026 100644 --- a/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.cc +++ b/source/blender/editors/space_view3d/view3d_gizmo_tool_generic.cc @@ -11,7 +11,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "ED_gizmo_library.hh" #include "ED_gizmo_utils.hh" diff --git a/source/blender/editors/space_view3d/view3d_select.cc b/source/blender/editors/space_view3d/view3d_select.cc index d67408171e4..f4999b6ec48 100644 --- a/source/blender/editors/space_view3d/view3d_select.cc +++ b/source/blender/editors/space_view3d/view3d_select.cc @@ -42,7 +42,7 @@ #endif /* vertex box select */ -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "IMB_imbuf.hh" #include "IMB_imbuf_types.hh" diff --git a/source/blender/editors/space_view3d/view3d_view.cc b/source/blender/editors/space_view3d/view3d_view.cc index 8e604b53383..ea27175b074 100644 --- a/source/blender/editors/space_view3d/view3d_view.cc +++ b/source/blender/editors/space_view3d/view3d_view.cc @@ -17,7 +17,7 @@ #include "BKE_action.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_modifier_legacy.h" #include "BKE_idprop.h" #include "BKE_layer.hh" diff --git a/source/blender/editors/transform/transform_convert.cc b/source/blender/editors/transform/transform_convert.cc index 02e98f6769b..70ce0f9c416 100644 --- a/source/blender/editors/transform/transform_convert.cc +++ b/source/blender/editors/transform/transform_convert.cc @@ -23,7 +23,7 @@ #include "BKE_anim_data.h" #include "BKE_context.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_layer.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/editors/transform/transform_gizmo_2d.cc b/source/blender/editors/transform/transform_gizmo_2d.cc index 50937a61779..f952c0810d1 100644 --- a/source/blender/editors/transform/transform_gizmo_2d.cc +++ b/source/blender/editors/transform/transform_gizmo_2d.cc @@ -24,7 +24,7 @@ #include "DNA_view3d_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "RNA_access.hh" diff --git a/source/blender/editors/transform/transform_gizmo_3d.cc b/source/blender/editors/transform/transform_gizmo_3d.cc index 2b2180c1b92..933cdbc634a 100644 --- a/source/blender/editors/transform/transform_gizmo_3d.cc +++ b/source/blender/editors/transform/transform_gizmo_3d.cc @@ -25,7 +25,7 @@ #include "BKE_crazyspace.hh" #include "BKE_curve.hh" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_legacy.h" #include "BKE_grease_pencil.hh" #include "BKE_layer.hh" diff --git a/source/blender/editors/transform/transform_gizmo_3d_cage.cc b/source/blender/editors/transform/transform_gizmo_3d_cage.cc index 2f8a4c2801c..fcf3b7cf9c9 100644 --- a/source/blender/editors/transform/transform_gizmo_3d_cage.cc +++ b/source/blender/editors/transform/transform_gizmo_3d_cage.cc @@ -14,7 +14,7 @@ #include "BLI_math_vector.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_scene.h" #include "ED_gizmo_library.hh" diff --git a/source/blender/editors/transform/transform_gizmo_extrude_3d.cc b/source/blender/editors/transform/transform_gizmo_extrude_3d.cc index 8fe35885d2d..416d378bc1c 100644 --- a/source/blender/editors/transform/transform_gizmo_extrude_3d.cc +++ b/source/blender/editors/transform/transform_gizmo_extrude_3d.cc @@ -13,7 +13,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_scene.h" #include "RNA_access.hh" diff --git a/source/blender/editors/transform/transform_ops.cc b/source/blender/editors/transform/transform_ops.cc index debe9303d82..a75c6f9ffcf 100644 --- a/source/blender/editors/transform/transform_ops.cc +++ b/source/blender/editors/transform/transform_ops.cc @@ -19,7 +19,7 @@ #include "BKE_context.hh" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/editors/transform/transform_snap_object_editmesh.cc b/source/blender/editors/transform/transform_snap_object_editmesh.cc index 9c04253d329..6a3557baf06 100644 --- a/source/blender/editors/transform/transform_snap_object_editmesh.cc +++ b/source/blender/editors/transform/transform_snap_object_editmesh.cc @@ -11,7 +11,7 @@ #include "BKE_bvhutils.hh" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_mesh.hh" #include "BKE_object.hh" diff --git a/source/blender/editors/undo/ed_undo.cc b/source/blender/editors/undo/ed_undo.cc index f8fc2cd377d..cd3295ec76f 100644 --- a/source/blender/editors/undo/ed_undo.cc +++ b/source/blender/editors/undo/ed_undo.cc @@ -23,7 +23,7 @@ #include "BKE_blender_undo.hh" #include "BKE_callbacks.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_main.hh" #include "BKE_paint.hh" diff --git a/source/blender/editors/util/ed_util.cc b/source/blender/editors/util/ed_util.cc index 43972afc8c7..337deb1928f 100644 --- a/source/blender/editors/util/ed_util.cc +++ b/source/blender/editors/util/ed_util.cc @@ -19,7 +19,7 @@ #include "BLT_translation.hh" #include "BKE_collection.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_lib_remap.hh" diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc index 5a3de6e99d2..e1c4db1a8c1 100644 --- a/source/blender/editors/uvedit/uvedit_unwrap_ops.cc +++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.cc @@ -17,7 +17,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_array.hh" #include "BLI_convexhull_2d.h" diff --git a/source/blender/freestyle/intern/application/AppView.cpp b/source/blender/freestyle/intern/application/AppView.cpp index 469be2aa964..4d44b127534 100644 --- a/source/blender/freestyle/intern/application/AppView.cpp +++ b/source/blender/freestyle/intern/application/AppView.cpp @@ -28,7 +28,7 @@ #include "IMB_imbuf_types.hh" #if 1 // FRS_antialiasing -# include "BKE_global.h" +# include "BKE_global.hh" # include "DNA_scene_types.h" #endif diff --git a/source/blender/freestyle/intern/application/Controller.cpp b/source/blender/freestyle/intern/application/Controller.cpp index 2e7fa97db02..a2c33a0a0e0 100644 --- a/source/blender/freestyle/intern/application/Controller.cpp +++ b/source/blender/freestyle/intern/application/Controller.cpp @@ -49,7 +49,7 @@ extern "C" { #include "../blender_interface/BlenderStrokeRenderer.h" #include "../blender_interface/BlenderStyleModule.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_path_util.h" #include "BLI_utildefines.h" diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index 3d784afa4d1..429d010d776 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -17,7 +17,7 @@ #include "BKE_attribute.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_mesh.hh" #include "BKE_object.hh" diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 3c9ae2f06c5..600ca459f02 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -31,7 +31,7 @@ #include "BKE_attribute.hh" #include "BKE_collection.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_layer.hh" #include "BKE_lib_id.hh" /* free_libblock */ diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 1b600d159bf..5e01488c1f4 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -31,7 +31,7 @@ using namespace Freestyle; #include "BKE_callbacks.hh" #include "BKE_context.hh" #include "BKE_freestyle.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_linestyle.h" #include "BKE_scene.h" diff --git a/source/blender/freestyle/intern/geometry/FastGrid.cpp b/source/blender/freestyle/intern/geometry/FastGrid.cpp index 8b783e6b01e..6af6350eb7e 100644 --- a/source/blender/freestyle/intern/geometry/FastGrid.cpp +++ b/source/blender/freestyle/intern/geometry/FastGrid.cpp @@ -11,7 +11,7 @@ #include "FastGrid.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_utildefines.h" namespace Freestyle { diff --git a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp index fc32ebba1b7..5b96eedf2b1 100644 --- a/source/blender/freestyle/intern/geometry/GeomCleaner.cpp +++ b/source/blender/freestyle/intern/geometry/GeomCleaner.cpp @@ -25,7 +25,7 @@ #include "../system/TimeUtils.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_sys_types.h" diff --git a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp index 04d7354d469..5d4925addad 100644 --- a/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp +++ b/source/blender/freestyle/intern/stroke/BasicStrokeShaders.cpp @@ -23,7 +23,7 @@ #include "../view_map/Functions0D.h" #include "../view_map/Functions1D.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_sys_types.h" diff --git a/source/blender/freestyle/intern/stroke/Canvas.cpp b/source/blender/freestyle/intern/stroke/Canvas.cpp index eb4d086d6bd..1b52be3d683 100644 --- a/source/blender/freestyle/intern/stroke/Canvas.cpp +++ b/source/blender/freestyle/intern/stroke/Canvas.cpp @@ -26,7 +26,7 @@ #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" // soc #include // soc #include diff --git a/source/blender/freestyle/intern/stroke/Curve.cpp b/source/blender/freestyle/intern/stroke/Curve.cpp index 1d7c6cc7417..23c4190a9a4 100644 --- a/source/blender/freestyle/intern/stroke/Curve.cpp +++ b/source/blender/freestyle/intern/stroke/Curve.cpp @@ -13,7 +13,7 @@ #include "CurveAdvancedIterators.h" #include "CurveIterators.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_utildefines.h" namespace Freestyle { diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp index 5d6ddc2b19f..05409e5c1fa 100644 --- a/source/blender/freestyle/intern/stroke/Operators.cpp +++ b/source/blender/freestyle/intern/stroke/Operators.cpp @@ -18,7 +18,7 @@ #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" namespace Freestyle { diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp index ca628f5888f..3bc0e2c32c7 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.cpp +++ b/source/blender/freestyle/intern/stroke/Stroke.cpp @@ -12,7 +12,7 @@ #include "StrokeIterators.h" #include "StrokeRenderer.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_node.hh" namespace Freestyle { diff --git a/source/blender/freestyle/intern/stroke/StrokeRep.cpp b/source/blender/freestyle/intern/stroke/StrokeRep.cpp index 613dda1a431..95b53e24cf2 100644 --- a/source/blender/freestyle/intern/stroke/StrokeRep.cpp +++ b/source/blender/freestyle/intern/stroke/StrokeRep.cpp @@ -15,7 +15,7 @@ #include "StrokeRenderer.h" #include "StrokeRep.h" -#include "BKE_global.h" +#include "BKE_global.hh" using namespace std; diff --git a/source/blender/freestyle/intern/system/PythonInterpreter.h b/source/blender/freestyle/intern/system/PythonInterpreter.h index 129e959b084..49d37f2bd30 100644 --- a/source/blender/freestyle/intern/system/PythonInterpreter.h +++ b/source/blender/freestyle/intern/system/PythonInterpreter.h @@ -14,7 +14,7 @@ #include "Interpreter.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_text.h" diff --git a/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp b/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp index f5cad712490..b7e1ae77689 100644 --- a/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp +++ b/source/blender/freestyle/intern/view_map/ArbitraryGridDensityProvider.cpp @@ -11,7 +11,7 @@ #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" namespace Freestyle { diff --git a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp index 362a9fb78f8..01a36e20422 100644 --- a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp +++ b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.cpp @@ -11,7 +11,7 @@ #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" namespace Freestyle { diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.cpp b/source/blender/freestyle/intern/view_map/BoxGrid.cpp index 92e30012d5d..e0c9a8ebd56 100644 --- a/source/blender/freestyle/intern/view_map/BoxGrid.cpp +++ b/source/blender/freestyle/intern/view_map/BoxGrid.cpp @@ -14,7 +14,7 @@ #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" using namespace std; diff --git a/source/blender/freestyle/intern/view_map/BoxGrid.h b/source/blender/freestyle/intern/view_map/BoxGrid.h index 69a57861522..852b740ddaf 100644 --- a/source/blender/freestyle/intern/view_map/BoxGrid.h +++ b/source/blender/freestyle/intern/view_map/BoxGrid.h @@ -29,7 +29,7 @@ #include "../winged_edge/WEdge.h" -#include "BKE_global.h" +#include "BKE_global.hh" #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" diff --git a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp index f9017f662a3..65e1a1a7065 100644 --- a/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp +++ b/source/blender/freestyle/intern/view_map/CulledOccluderSource.cpp @@ -13,7 +13,7 @@ #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" namespace Freestyle { diff --git a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp index 9426815e396..a232a33bd7e 100644 --- a/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp +++ b/source/blender/freestyle/intern/view_map/FEdgeXDetector.cpp @@ -16,7 +16,7 @@ #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" namespace Freestyle { diff --git a/source/blender/freestyle/intern/view_map/Functions0D.cpp b/source/blender/freestyle/intern/view_map/Functions0D.cpp index f89edd0c4a3..ed0a89a0ac5 100644 --- a/source/blender/freestyle/intern/view_map/Functions0D.cpp +++ b/source/blender/freestyle/intern/view_map/Functions0D.cpp @@ -12,7 +12,7 @@ #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" using namespace std; diff --git a/source/blender/freestyle/intern/view_map/GridDensityProvider.h b/source/blender/freestyle/intern/view_map/GridDensityProvider.h index d979f286520..84815906fd5 100644 --- a/source/blender/freestyle/intern/view_map/GridDensityProvider.h +++ b/source/blender/freestyle/intern/view_map/GridDensityProvider.h @@ -18,7 +18,7 @@ #include "../geometry/BBox.h" -#include "BKE_global.h" +#include "BKE_global.hh" #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" diff --git a/source/blender/freestyle/intern/view_map/OccluderSource.cpp b/source/blender/freestyle/intern/view_map/OccluderSource.cpp index 8a9ad783536..a1d7a298322 100644 --- a/source/blender/freestyle/intern/view_map/OccluderSource.cpp +++ b/source/blender/freestyle/intern/view_map/OccluderSource.cpp @@ -13,7 +13,7 @@ #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" namespace Freestyle { diff --git a/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp b/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp index be34056f934..ae2c3ad97c4 100644 --- a/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp +++ b/source/blender/freestyle/intern/view_map/Pow23GridDensityProvider.cpp @@ -11,7 +11,7 @@ #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" namespace Freestyle { diff --git a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp index 8ae5d5be0d1..17218327ff8 100644 --- a/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp +++ b/source/blender/freestyle/intern/view_map/SilhouetteGeomEngine.cpp @@ -18,7 +18,7 @@ #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" using namespace std; diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.cpp b/source/blender/freestyle/intern/view_map/SphericalGrid.cpp index 76c8a3d65c1..13cd96884da 100644 --- a/source/blender/freestyle/intern/view_map/SphericalGrid.cpp +++ b/source/blender/freestyle/intern/view_map/SphericalGrid.cpp @@ -14,7 +14,7 @@ #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" using namespace std; diff --git a/source/blender/freestyle/intern/view_map/SphericalGrid.h b/source/blender/freestyle/intern/view_map/SphericalGrid.h index 5ab4dd85f80..fc265066dfc 100644 --- a/source/blender/freestyle/intern/view_map/SphericalGrid.h +++ b/source/blender/freestyle/intern/view_map/SphericalGrid.h @@ -29,7 +29,7 @@ #include "../winged_edge/WEdge.h" -#include "BKE_global.h" +#include "BKE_global.hh" #ifdef WITH_CXX_GUARDEDALLOC # include "MEM_guardedalloc.h" diff --git a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp index 67bf9f00ee4..a3a71fb74f0 100644 --- a/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp +++ b/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp @@ -21,7 +21,7 @@ #include "BLI_math_base.h" #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "IMB_imbuf.hh" #include "IMB_imbuf_types.hh" diff --git a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp index 1b09fe95a3d..c1c86ee42bb 100644 --- a/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp +++ b/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp @@ -28,7 +28,7 @@ #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" namespace Freestyle { diff --git a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp index df064e5354c..b0cbd6283ce 100644 --- a/source/blender/freestyle/intern/winged_edge/WXEdge.cpp +++ b/source/blender/freestyle/intern/winged_edge/WXEdge.cpp @@ -11,7 +11,7 @@ #include "BLI_sys_types.h" -#include "BKE_global.h" +#include "BKE_global.hh" namespace Freestyle { diff --git a/source/blender/geometry/intern/randomize.cc b/source/blender/geometry/intern/randomize.cc index 77a516b806c..354b6f6d587 100644 --- a/source/blender/geometry/intern/randomize.cc +++ b/source/blender/geometry/intern/randomize.cc @@ -17,7 +17,7 @@ #include "BKE_curves.hh" #include "BKE_customdata.hh" #include "BKE_geometry_set.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_instances.hh" #include "BKE_mesh.hh" diff --git a/source/blender/geometry/intern/uv_pack.cc b/source/blender/geometry/intern/uv_pack.cc index 90db9cccec4..39c6c895e75 100644 --- a/source/blender/geometry/intern/uv_pack.cc +++ b/source/blender/geometry/intern/uv_pack.cc @@ -8,7 +8,7 @@ #include "GEO_uv_pack.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_array.hh" #include "BLI_bounds.hh" 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 b3e59a72675..d69e03ccb88 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 @@ -24,7 +24,7 @@ #include "BKE_collection.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_legacy.h" #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lib_query.hh" diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc index 68a55d42939..9ef9bd36b84 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_cpu.cc @@ -29,7 +29,7 @@ #include "BKE_deform.hh" #include "BKE_duplilist.h" #include "BKE_editmesh.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" #include "BKE_gpencil_modifier_legacy.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc index b421fe3c233..a549cad36c7 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_ops.cc @@ -14,7 +14,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_legacy.h" #include "BKE_gpencil_modifier_legacy.h" #include "BKE_report.h" diff --git a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc index 5f170840f4b..f011cc5a496 100644 --- a/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc +++ b/source/blender/gpencil_modifiers_legacy/intern/lineart/lineart_shadow.cc @@ -11,7 +11,7 @@ #include "lineart_intern.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_modifier_legacy.h" #include "BKE_lib_id.hh" #include "BKE_material.h" diff --git a/source/blender/gpu/intern/gpu_debug.cc b/source/blender/gpu/intern/gpu_debug.cc index af565358bae..5c2d25b292e 100644 --- a/source/blender/gpu/intern/gpu_debug.cc +++ b/source/blender/gpu/intern/gpu_debug.cc @@ -8,7 +8,7 @@ * Debug features of OpenGL. */ -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_string.h" diff --git a/source/blender/gpu/opengl/gl_backend.cc b/source/blender/gpu/opengl/gl_backend.cc index 8cad6fdbe06..bedb1a708cb 100644 --- a/source/blender/gpu/opengl/gl_backend.cc +++ b/source/blender/gpu/opengl/gl_backend.cc @@ -6,7 +6,7 @@ * \ingroup gpu */ -#include "BKE_global.h" +#include "BKE_global.hh" #if defined(WIN32) # include "BLI_winstuff.h" #endif diff --git a/source/blender/gpu/opengl/gl_context.cc b/source/blender/gpu/opengl/gl_context.cc index b1e1ceb6b52..ab4cf35b222 100644 --- a/source/blender/gpu/opengl/gl_context.cc +++ b/source/blender/gpu/opengl/gl_context.cc @@ -9,7 +9,7 @@ #include "BLI_assert.h" #include "BLI_utildefines.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "GPU_framebuffer.h" diff --git a/source/blender/gpu/opengl/gl_debug.cc b/source/blender/gpu/opengl/gl_debug.cc index 687ad1feced..ce5d1a3e63f 100644 --- a/source/blender/gpu/opengl/gl_debug.cc +++ b/source/blender/gpu/opengl/gl_debug.cc @@ -13,7 +13,7 @@ #include "BLI_system.h" #include "BLI_utildefines.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "GPU_debug.h" #include "GPU_platform.h" diff --git a/source/blender/gpu/opengl/gl_framebuffer.cc b/source/blender/gpu/opengl/gl_framebuffer.cc index 6414d9b72ca..e931af16020 100644 --- a/source/blender/gpu/opengl/gl_framebuffer.cc +++ b/source/blender/gpu/opengl/gl_framebuffer.cc @@ -8,7 +8,7 @@ #include "BLI_string.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "gl_backend.hh" #include "gl_debug.hh" diff --git a/source/blender/gpu/opengl/gl_shader.cc b/source/blender/gpu/opengl/gl_shader.cc index 311ba01443e..c1ec7e2b341 100644 --- a/source/blender/gpu/opengl/gl_shader.cc +++ b/source/blender/gpu/opengl/gl_shader.cc @@ -8,7 +8,7 @@ #include -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_string.h" #include "BLI_vector.hh" diff --git a/source/blender/gpu/opengl/gl_state.cc b/source/blender/gpu/opengl/gl_state.cc index c67ee6e38d3..4e1ee86f97c 100644 --- a/source/blender/gpu/opengl/gl_state.cc +++ b/source/blender/gpu/opengl/gl_state.cc @@ -6,7 +6,7 @@ * \ingroup gpu */ -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_math_base.h" #include "BLI_math_bits.h" diff --git a/source/blender/gpu/tests/gpu_testing.hh b/source/blender/gpu/tests/gpu_testing.hh index 0d6104a2344..44ba0dd1398 100644 --- a/source/blender/gpu/tests/gpu_testing.hh +++ b/source/blender/gpu/tests/gpu_testing.hh @@ -4,7 +4,7 @@ #include "testing/testing.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "GHOST_C-api.h" diff --git a/source/blender/gpu/vulkan/vk_debug.cc b/source/blender/gpu/vulkan/vk_debug.cc index 3001aa5a084..4cf4f51b861 100644 --- a/source/blender/gpu/vulkan/vk_debug.cc +++ b/source/blender/gpu/vulkan/vk_debug.cc @@ -8,7 +8,7 @@ #include -#include "BKE_global.h" +#include "BKE_global.hh" #include "CLG_log.h" #include "vk_backend.hh" diff --git a/source/blender/gpu/vulkan/vk_debug.hh b/source/blender/gpu/vulkan/vk_debug.hh index 65e96e399b0..a7e017453b8 100644 --- a/source/blender/gpu/vulkan/vk_debug.hh +++ b/source/blender/gpu/vulkan/vk_debug.hh @@ -7,7 +7,7 @@ */ #pragma once -#include "BKE_global.h" +#include "BKE_global.hh" #include "BLI_compiler_attrs.h" #include "BLI_set.hh" #include "BLI_string.h" diff --git a/source/blender/gpu/vulkan/vk_shader.cc b/source/blender/gpu/vulkan/vk_shader.cc index 87d29dbc528..f357cad99a5 100644 --- a/source/blender/gpu/vulkan/vk_shader.cc +++ b/source/blender/gpu/vulkan/vk_shader.cc @@ -20,7 +20,7 @@ #include "BLI_string_utils.hh" #include "BLI_vector.hh" -#include "BKE_global.h" +#include "BKE_global.hh" using namespace blender::gpu::shader; diff --git a/source/blender/gpu/vulkan/vk_texture.cc b/source/blender/gpu/vulkan/vk_texture.cc index 59d4205e4e9..3104d6e55b3 100644 --- a/source/blender/gpu/vulkan/vk_texture.cc +++ b/source/blender/gpu/vulkan/vk_texture.cc @@ -19,7 +19,7 @@ #include "BLI_math_vector.hh" -#include "BKE_global.h" +#include "BKE_global.hh" namespace blender::gpu { diff --git a/source/blender/ikplugin/intern/itasc_plugin.cc b/source/blender/ikplugin/intern/itasc_plugin.cc index 545ddc379bc..c61408d6586 100644 --- a/source/blender/ikplugin/intern/itasc_plugin.cc +++ b/source/blender/ikplugin/intern/itasc_plugin.cc @@ -36,7 +36,7 @@ #include "BKE_action.h" #include "BKE_armature.hh" #include "BKE_constraint.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "DNA_action_types.h" #include "DNA_armature_types.h" #include "DNA_constraint_types.h" diff --git a/source/blender/imbuf/intern/anim_movie.cc b/source/blender/imbuf/intern/anim_movie.cc index 104076835b8..c01ec48c523 100644 --- a/source/blender/imbuf/intern/anim_movie.cc +++ b/source/blender/imbuf/intern/anim_movie.cc @@ -62,7 +62,7 @@ #include "IMB_metadata.hh" #ifdef WITH_FFMPEG -# include "BKE_global.h" /* ENDIAN_ORDER */ +# include "BKE_global.hh" /* ENDIAN_ORDER */ # include "BKE_writeffmpeg.hh" extern "C" { diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.cc b/source/blender/imbuf/intern/cineon/cineon_dpx.cc index 8c98037a2f5..05c150ac89f 100644 --- a/source/blender/imbuf/intern/cineon/cineon_dpx.cc +++ b/source/blender/imbuf/intern/cineon/cineon_dpx.cc @@ -16,7 +16,7 @@ #include "IMB_imbuf.hh" #include "IMB_imbuf_types.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "MEM_guardedalloc.h" diff --git a/source/blender/imbuf/intern/util.cc b/source/blender/imbuf/intern/util.cc index 824a24fe4e3..907a135652a 100644 --- a/source/blender/imbuf/intern/util.cc +++ b/source/blender/imbuf/intern/util.cc @@ -29,7 +29,7 @@ #ifdef WITH_FFMPEG # include "BLI_string.h" /* BLI_vsnprintf */ -# include "BKE_global.h" /* G.debug */ +# include "BKE_global.hh" /* G.debug */ extern "C" { # include diff --git a/source/blender/imbuf/intern/util_gpu.cc b/source/blender/imbuf/intern/util_gpu.cc index 776ca277741..1e6d5cc3216 100644 --- a/source/blender/imbuf/intern/util_gpu.cc +++ b/source/blender/imbuf/intern/util_gpu.cc @@ -11,7 +11,7 @@ #include "BLI_utildefines.h" #include "MEM_guardedalloc.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "GPU_capabilities.h" #include "GPU_state.h" diff --git a/source/blender/io/alembic/exporter/abc_export_capi.cc b/source/blender/io/alembic/exporter/abc_export_capi.cc index f395cf86ee6..d8918074def 100644 --- a/source/blender/io/alembic/exporter/abc_export_capi.cc +++ b/source/blender/io/alembic/exporter/abc_export_capi.cc @@ -18,7 +18,7 @@ #include "BKE_blender_version.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "BKE_scene.h" diff --git a/source/blender/io/alembic/intern/alembic_capi.cc b/source/blender/io/alembic/intern/alembic_capi.cc index 1ecedc246be..5ffe4a1e802 100644 --- a/source/blender/io/alembic/intern/alembic_capi.cc +++ b/source/blender/io/alembic/intern/alembic_capi.cc @@ -33,7 +33,7 @@ #include "BKE_cachefile.hh" #include "BKE_context.hh" #include "BKE_curve.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_object.hh" diff --git a/source/blender/io/collada/ArmatureExporter.cpp b/source/blender/io/collada/ArmatureExporter.cpp index 815f34bb55b..7c632c3c65a 100644 --- a/source/blender/io/collada/ArmatureExporter.cpp +++ b/source/blender/io/collada/ArmatureExporter.cpp @@ -16,7 +16,7 @@ #include "BKE_action.h" #include "BKE_armature.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_mesh.hh" #include "ED_armature.hh" diff --git a/source/blender/io/collada/ControllerExporter.cpp b/source/blender/io/collada/ControllerExporter.cpp index 757e1958c45..04beb11c2af 100644 --- a/source/blender/io/collada/ControllerExporter.cpp +++ b/source/blender/io/collada/ControllerExporter.cpp @@ -18,7 +18,7 @@ #include "BKE_action.h" #include "BKE_armature.hh" #include "BKE_deform.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_lib_id.hh" #include "BKE_mesh.hh" diff --git a/source/blender/io/collada/DocumentExporter.cpp b/source/blender/io/collada/DocumentExporter.cpp index f2039a3d7aa..d6a0b6e61b5 100644 --- a/source/blender/io/collada/DocumentExporter.cpp +++ b/source/blender/io/collada/DocumentExporter.cpp @@ -72,7 +72,7 @@ #include "BKE_blender_version.h" #include "BKE_customdata.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_main.hh" #include "BKE_material.h" diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp index 4a933fd8b11..03e902f4511 100644 --- a/source/blender/io/collada/DocumentImporter.cpp +++ b/source/blender/io/collada/DocumentImporter.cpp @@ -42,7 +42,7 @@ #include "BKE_camera.h" #include "BKE_collection.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_layer.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/io/collada/GeometryExporter.cpp b/source/blender/io/collada/GeometryExporter.cpp index c92d01e2b81..89c1fdad4e5 100644 --- a/source/blender/io/collada/GeometryExporter.cpp +++ b/source/blender/io/collada/GeometryExporter.cpp @@ -22,7 +22,7 @@ #include "BKE_attribute.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_material.h" #include "BKE_mesh.hh" diff --git a/source/blender/io/collada/ImageExporter.cpp b/source/blender/io/collada/ImageExporter.cpp index 2f5c80ec174..4508f21d73a 100644 --- a/source/blender/io/collada/ImageExporter.cpp +++ b/source/blender/io/collada/ImageExporter.cpp @@ -13,7 +13,7 @@ #include "DNA_texture_types.h" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_image_format.h" #include "BKE_main.hh" diff --git a/source/blender/io/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp index 5d854214688..3991a3825a5 100644 --- a/source/blender/io/collada/MeshImporter.cpp +++ b/source/blender/io/collada/MeshImporter.cpp @@ -21,7 +21,7 @@ #include "BKE_attribute.hh" #include "BKE_customdata.hh" #include "BKE_displist.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_material.h" #include "BKE_mesh.hh" diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp index cf162ca6c7f..25bfc4593a5 100644 --- a/source/blender/io/collada/collada_utils.cpp +++ b/source/blender/io/collada/collada_utils.cpp @@ -37,7 +37,7 @@ #include "BKE_constraint.h" #include "BKE_context.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_key.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/io/usd/intern/usd_capi_export.cc b/source/blender/io/usd/intern/usd_capi_export.cc index b7aa774bebe..5a2b4fd1276 100644 --- a/source/blender/io/usd/intern/usd_capi_export.cc +++ b/source/blender/io/usd/intern/usd_capi_export.cc @@ -31,7 +31,7 @@ #include "BKE_appdir.hh" #include "BKE_blender_version.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_report.h" #include "BKE_scene.h" diff --git a/source/blender/io/usd/intern/usd_capi_import.cc b/source/blender/io/usd/intern/usd_capi_import.cc index 30b56e4adbf..7a476a44ac5 100644 --- a/source/blender/io/usd/intern/usd_capi_import.cc +++ b/source/blender/io/usd/intern/usd_capi_import.cc @@ -15,7 +15,7 @@ #include "BKE_cachefile.hh" #include "BKE_cdderivedmesh.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_library.hh" diff --git a/source/blender/makesrna/intern/rna_ID.cc b/source/blender/makesrna/intern/rna_ID.cc index 092c5f496a7..5b5b3c9e695 100644 --- a/source/blender/makesrna/intern/rna_ID.cc +++ b/source/blender/makesrna/intern/rna_ID.cc @@ -218,7 +218,7 @@ const IDFilterEnumPropertyItem rna_enum_id_type_filter_items[] = { # include "BLO_readfile.hh" # include "BKE_anim_data.h" -# include "BKE_global.h" /* XXX, remove me */ +# include "BKE_global.hh" /* XXX, remove me */ # include "BKE_idprop.h" # include "BKE_idtype.hh" # include "BKE_lib_override.hh" diff --git a/source/blender/makesrna/intern/rna_access.cc b/source/blender/makesrna/intern/rna_access.cc index 8314fdb4af2..dcd571be1e8 100644 --- a/source/blender/makesrna/intern/rna_access.cc +++ b/source/blender/makesrna/intern/rna_access.cc @@ -36,7 +36,7 @@ #include "BKE_collection.hh" #include "BKE_context.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_idtype.hh" #include "BKE_lib_override.hh" diff --git a/source/blender/makesrna/intern/rna_armature.cc b/source/blender/makesrna/intern/rna_armature.cc index 1f4218ab496..745b10d2db5 100644 --- a/source/blender/makesrna/intern/rna_armature.cc +++ b/source/blender/makesrna/intern/rna_armature.cc @@ -65,7 +65,7 @@ constexpr int COLOR_SETS_MAX_THEMED_INDEX = 20; # include "BKE_action.h" # include "BKE_context.hh" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_idprop.h" # include "BKE_main.hh" diff --git a/source/blender/makesrna/intern/rna_collection.cc b/source/blender/makesrna/intern/rna_collection.cc index 43a81aee437..fb38a371fba 100644 --- a/source/blender/makesrna/intern/rna_collection.cc +++ b/source/blender/makesrna/intern/rna_collection.cc @@ -49,7 +49,7 @@ BLI_STATIC_ASSERT(ARRAY_SIZE(rna_enum_collection_color_items) - 2 == COLLECTION_ # include "DEG_depsgraph_query.hh" # include "BKE_collection.hh" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_layer.hh" # include "WM_api.hh" diff --git a/source/blender/makesrna/intern/rna_image.cc b/source/blender/makesrna/intern/rna_image.cc index 80e6471c32e..0fe2304ded1 100644 --- a/source/blender/makesrna/intern/rna_image.cc +++ b/source/blender/makesrna/intern/rna_image.cc @@ -58,7 +58,7 @@ static const EnumPropertyItem image_source_items[] = { # include "BLI_math_base.h" # include "BLI_math_vector.h" -# include "BKE_global.h" +# include "BKE_global.hh" # include "GPU_texture.h" diff --git a/source/blender/makesrna/intern/rna_main.cc b/source/blender/makesrna/intern/rna_main.cc index a5684bc47c3..e02bc64bab1 100644 --- a/source/blender/makesrna/intern/rna_main.cc +++ b/source/blender/makesrna/intern/rna_main.cc @@ -19,7 +19,7 @@ #ifdef RNA_RUNTIME -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_main.hh" # include "BKE_mesh.hh" diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index 11e237f43b5..479529155e7 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -595,7 +595,7 @@ static const EnumPropertyItem node_cryptomatte_layer_name_items[] = { # include "BKE_context.hh" # include "BKE_idprop.h" -# include "BKE_global.h" +# include "BKE_global.hh" # include "ED_node.hh" # include "ED_render.hh" diff --git a/source/blender/makesrna/intern/rna_object.cc b/source/blender/makesrna/intern/rna_object.cc index 93399c703b6..df95b63fdb9 100644 --- a/source/blender/makesrna/intern/rna_object.cc +++ b/source/blender/makesrna/intern/rna_object.cc @@ -332,7 +332,7 @@ const EnumPropertyItem rna_enum_object_axis_items[] = { # include "BKE_curve.hh" # include "BKE_deform.hh" # include "BKE_effect.h" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_gpencil_modifier_legacy.h" # include "BKE_key.hh" # include "BKE_light_linking.h" diff --git a/source/blender/makesrna/intern/rna_object_api.cc b/source/blender/makesrna/intern/rna_object_api.cc index 30b1f342908..71f9427a503 100644 --- a/source/blender/makesrna/intern/rna_object_api.cc +++ b/source/blender/makesrna/intern/rna_object_api.cc @@ -56,7 +56,7 @@ static const EnumPropertyItem space_items[] = { # include "BKE_context.hh" # include "BKE_crazyspace.hh" # include "BKE_customdata.hh" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_layer.hh" # include "BKE_main.hh" # include "BKE_mball.hh" diff --git a/source/blender/makesrna/intern/rna_pose.cc b/source/blender/makesrna/intern/rna_pose.cc index a919259bcf6..42e38349588 100644 --- a/source/blender/makesrna/intern/rna_pose.cc +++ b/source/blender/makesrna/intern/rna_pose.cc @@ -74,7 +74,7 @@ const EnumPropertyItem rna_enum_color_sets_items[] = { # include "BKE_constraint.h" # include "BKE_context.hh" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_idprop.h" # include "DEG_depsgraph.hh" diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc index ae2af24c092..76366c33371 100644 --- a/source/blender/makesrna/intern/rna_scene.cc +++ b/source/blender/makesrna/intern/rna_scene.cc @@ -732,7 +732,7 @@ const EnumPropertyItem rna_enum_grease_pencil_selectmode_items[] = { # include "BKE_collection.hh" # include "BKE_context.hh" # include "BKE_freestyle.h" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_gpencil_legacy.h" # include "BKE_idprop.h" # include "BKE_image.h" diff --git a/source/blender/makesrna/intern/rna_scene_api.cc b/source/blender/makesrna/intern/rna_scene_api.cc index a75475d52a3..005fed9aa8a 100644 --- a/source/blender/makesrna/intern/rna_scene_api.cc +++ b/source/blender/makesrna/intern/rna_scene_api.cc @@ -31,7 +31,7 @@ #ifdef RNA_RUNTIME # include "BKE_editmesh.hh" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_image.h" # include "BKE_scene.h" # include "BKE_writeavi.h" diff --git a/source/blender/makesrna/intern/rna_screen.cc b/source/blender/makesrna/intern/rna_screen.cc index dd5a19202b1..28d63d47550 100644 --- a/source/blender/makesrna/intern/rna_screen.cc +++ b/source/blender/makesrna/intern/rna_screen.cc @@ -56,7 +56,7 @@ static const EnumPropertyItem rna_enum_region_panel_category_items[] = { # include "RNA_access.hh" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_screen.hh" # include "BKE_workspace.h" diff --git a/source/blender/makesrna/intern/rna_sequencer.cc b/source/blender/makesrna/intern/rna_sequencer.cc index 1e5e6411210..4dd8ae6336f 100644 --- a/source/blender/makesrna/intern/rna_sequencer.cc +++ b/source/blender/makesrna/intern/rna_sequencer.cc @@ -115,7 +115,7 @@ const EnumPropertyItem rna_enum_strip_color_items[] = { # include -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_idprop.h" # include "BKE_movieclip.h" # include "BKE_report.h" diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc index fecd7e7a93e..a1f32b70cf4 100644 --- a/source/blender/makesrna/intern/rna_space.cc +++ b/source/blender/makesrna/intern/rna_space.cc @@ -554,7 +554,7 @@ static const EnumPropertyItem rna_enum_curve_display_handle_items[] = { # include "BKE_anim_data.h" # include "BKE_brush.hh" # include "BKE_context.hh" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_icons.h" # include "BKE_idprop.h" # include "BKE_layer.hh" diff --git a/source/blender/makesrna/intern/rna_space_api.cc b/source/blender/makesrna/intern/rna_space_api.cc index 411711d9551..258c31ee511 100644 --- a/source/blender/makesrna/intern/rna_space_api.cc +++ b/source/blender/makesrna/intern/rna_space_api.cc @@ -15,7 +15,7 @@ #ifdef RNA_RUNTIME -# include "BKE_global.h" +# include "BKE_global.hh" # include "ED_fileselect.hh" # include "ED_screen.hh" diff --git a/source/blender/makesrna/intern/rna_texture_api.cc b/source/blender/makesrna/intern/rna_texture_api.cc index 4170dd38170..b2033f3c2bc 100644 --- a/source/blender/makesrna/intern/rna_texture_api.cc +++ b/source/blender/makesrna/intern/rna_texture_api.cc @@ -19,7 +19,7 @@ #ifdef RNA_RUNTIME # include "BKE_context.hh" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BLI_math_vector.h" # include "DNA_scene_types.h" # include "IMB_imbuf.hh" diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc index bea84f6669c..15e2a5ec216 100644 --- a/source/blender/makesrna/intern/rna_userdef.cc +++ b/source/blender/makesrna/intern/rna_userdef.cc @@ -174,7 +174,7 @@ static const EnumPropertyItem rna_enum_preference_gpu_backend_items[] = { # include "DNA_screen_types.h" # include "BKE_blender.hh" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_idprop.h" # include "BKE_image.h" # include "BKE_main.hh" diff --git a/source/blender/makesrna/intern/rna_wm.cc b/source/blender/makesrna/intern/rna_wm.cc index 33fd83e32c4..f892ccf0bb3 100644 --- a/source/blender/makesrna/intern/rna_wm.cc +++ b/source/blender/makesrna/intern/rna_wm.cc @@ -554,7 +554,7 @@ const EnumPropertyItem rna_enum_wm_report_items[] = { # include "UI_interface.hh" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_idprop.h" # include "MEM_guardedalloc.h" diff --git a/source/blender/makesrna/intern/rna_wm_gizmo.cc b/source/blender/makesrna/intern/rna_wm_gizmo.cc index f23875e8893..d2f49f95dd9 100644 --- a/source/blender/makesrna/intern/rna_wm_gizmo.cc +++ b/source/blender/makesrna/intern/rna_wm_gizmo.cc @@ -43,7 +43,7 @@ # include "UI_interface.hh" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_idprop.h" # include "BKE_workspace.h" diff --git a/source/blender/makesrna/intern/rna_workspace.cc b/source/blender/makesrna/intern/rna_workspace.cc index 8c22694941c..09c043ece8a 100644 --- a/source/blender/makesrna/intern/rna_workspace.cc +++ b/source/blender/makesrna/intern/rna_workspace.cc @@ -27,7 +27,7 @@ # include "BLI_listbase.h" -# include "BKE_global.h" +# include "BKE_global.hh" # include "DNA_object_types.h" # include "DNA_screen_types.h" diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc index 51fbb21a7b1..026337008e8 100644 --- a/source/blender/modifiers/intern/MOD_boolean.cc +++ b/source/blender/modifiers/intern/MOD_boolean.cc @@ -29,7 +29,7 @@ #include "BKE_collection.hh" #include "BKE_context.hh" -#include "BKE_global.h" /* only to check G.debug */ +#include "BKE_global.hh" /* only to check G.debug */ #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_material.h" diff --git a/source/blender/modifiers/intern/MOD_cloth.cc b/source/blender/modifiers/intern/MOD_cloth.cc index 4bd9f8c0a9d..861b85a15a4 100644 --- a/source/blender/modifiers/intern/MOD_cloth.cc +++ b/source/blender/modifiers/intern/MOD_cloth.cc @@ -29,7 +29,7 @@ #include "BKE_context.hh" #include "BKE_customdata.hh" #include "BKE_effect.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_key.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/modifiers/intern/MOD_collision.cc b/source/blender/modifiers/intern/MOD_collision.cc index d9bf6c3df22..8c38bfed618 100644 --- a/source/blender/modifiers/intern/MOD_collision.cc +++ b/source/blender/modifiers/intern/MOD_collision.cc @@ -23,7 +23,7 @@ #include "BKE_collision.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_mesh.hh" #include "BKE_mesh_runtime.hh" diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.cc b/source/blender/modifiers/intern/MOD_meshsequencecache.cc index efe9b00fa77..aba58c4602b 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.cc +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.cc @@ -50,7 +50,7 @@ #include "MOD_ui_common.hh" #if defined(WITH_USD) || defined(WITH_ALEMBIC) -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_lib_id.hh" #endif diff --git a/source/blender/modifiers/intern/MOD_nodes.cc b/source/blender/modifiers/intern/MOD_nodes.cc index 87476560a67..c0c0da2f0ea 100644 --- a/source/blender/modifiers/intern/MOD_nodes.cc +++ b/source/blender/modifiers/intern/MOD_nodes.cc @@ -47,7 +47,7 @@ #include "BKE_customdata.hh" #include "BKE_geometry_fields.hh" #include "BKE_geometry_set_instances.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" diff --git a/source/blender/nodes/composite/node_composite_tree.cc b/source/blender/nodes/composite/node_composite_tree.cc index c095039a1ed..b8119144aee 100644 --- a/source/blender/nodes/composite/node_composite_tree.cc +++ b/source/blender/nodes/composite/node_composite_tree.cc @@ -15,7 +15,7 @@ #include "DNA_scene_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_main.hh" #include "BKE_node.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc index baf8926e6a4..21830dd28d3 100644 --- a/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc +++ b/source/blender/nodes/composite/nodes/node_composite_cryptomatte.cc @@ -30,7 +30,7 @@ #include "BKE_context.hh" #include "BKE_cryptomatte.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_lib_id.hh" #include "BKE_library.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_image.cc b/source/blender/nodes/composite/nodes/node_composite_image.cc index 23089bbfc7a..79fc579df81 100644 --- a/source/blender/nodes/composite/nodes/node_composite_image.cc +++ b/source/blender/nodes/composite/nodes/node_composite_image.cc @@ -15,7 +15,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_split.cc b/source/blender/nodes/composite/nodes/node_composite_split.cc index e78959aaf35..3697576894f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_split.cc +++ b/source/blender/nodes/composite/nodes/node_composite_split.cc @@ -6,7 +6,7 @@ * \ingroup cmpnodes */ -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "UI_interface.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_viewer.cc b/source/blender/nodes/composite/nodes/node_composite_viewer.cc index 8edb27b8a85..c240717e955 100644 --- a/source/blender/nodes/composite/nodes/node_composite_viewer.cc +++ b/source/blender/nodes/composite/nodes/node_composite_viewer.cc @@ -8,7 +8,7 @@ #include "BLI_math_vector_types.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "RNA_access.hh" diff --git a/source/blender/nodes/intern/node_exec.cc b/source/blender/nodes/intern/node_exec.cc index 1bf26ced04b..be72dbf36df 100644 --- a/source/blender/nodes/intern/node_exec.cc +++ b/source/blender/nodes/intern/node_exec.cc @@ -11,7 +11,7 @@ #include "BLI_listbase.h" #include "BLI_utildefines.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_node.hh" #include "BKE_node_runtime.hh" #include "BKE_node_tree_update.hh" diff --git a/source/blender/nodes/shader/node_shader_tree.cc b/source/blender/nodes/shader/node_shader_tree.cc index a8b475f6ebb..587cdd3587f 100644 --- a/source/blender/nodes/shader/node_shader_tree.cc +++ b/source/blender/nodes/shader/node_shader_tree.cc @@ -28,7 +28,7 @@ #include "BLI_vector.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_linestyle.h" diff --git a/source/blender/python/bmesh/bmesh_py_types.cc b/source/blender/python/bmesh/bmesh_py_types.cc index 57c3fea6c19..fd9669efc24 100644 --- a/source/blender/python/bmesh/bmesh_py_types.cc +++ b/source/blender/python/bmesh/bmesh_py_types.cc @@ -18,7 +18,7 @@ #include "DNA_object_types.h" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_mesh.hh" #include "BKE_mesh_runtime.hh" diff --git a/source/blender/python/generic/bgl.cc b/source/blender/python/generic/bgl.cc index fb3e214e19b..b3b5be7af8c 100644 --- a/source/blender/python/generic/bgl.cc +++ b/source/blender/python/generic/bgl.cc @@ -24,7 +24,7 @@ #include "py_capi_utils.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "../generic/py_capi_utils.h" diff --git a/source/blender/python/gpu/gpu_py_offscreen.cc b/source/blender/python/gpu/gpu_py_offscreen.cc index fc79873387f..d8adcefcb9f 100644 --- a/source/blender/python/gpu/gpu_py_offscreen.cc +++ b/source/blender/python/gpu/gpu_py_offscreen.cc @@ -17,7 +17,7 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_scene.h" diff --git a/source/blender/python/intern/bpy.cc b/source/blender/python/intern/bpy.cc index 9d138a60fc2..e35ecd58abc 100644 --- a/source/blender/python/intern/bpy.cc +++ b/source/blender/python/intern/bpy.cc @@ -22,7 +22,7 @@ #include "BKE_appdir.hh" #include "BKE_blender_version.h" #include "BKE_bpath.hh" -#include "BKE_global.h" /* XXX, G_MAIN only */ +#include "BKE_global.hh" /* XXX, G_MAIN only */ #include "RNA_access.hh" #include "RNA_enum_types.hh" diff --git a/source/blender/python/intern/bpy_app.cc b/source/blender/python/intern/bpy_app.cc index 14c6178bd48..581062d4a5a 100644 --- a/source/blender/python/intern/bpy_app.cc +++ b/source/blender/python/intern/bpy_app.cc @@ -39,7 +39,7 @@ #include "BKE_appdir.hh" #include "BKE_blender_version.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "DNA_ID.h" diff --git a/source/blender/python/intern/bpy_driver.cc b/source/blender/python/intern/bpy_driver.cc index 55fb2d54c81..45af6e2413b 100644 --- a/source/blender/python/intern/bpy_driver.cc +++ b/source/blender/python/intern/bpy_driver.cc @@ -20,7 +20,7 @@ #include "BKE_animsys.h" #include "BKE_fcurve_driver.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "RNA_access.hh" diff --git a/source/blender/python/intern/bpy_interface.cc b/source/blender/python/intern/bpy_interface.cc index 18bd5013aa0..332d2af737a 100644 --- a/source/blender/python/intern/bpy_interface.cc +++ b/source/blender/python/intern/bpy_interface.cc @@ -47,7 +47,7 @@ #include "BKE_appdir.hh" #include "BKE_context.hh" -#include "BKE_global.h" /* Only for script checking. */ +#include "BKE_global.hh" /* Only for script checking. */ #include "BKE_main.hh" #include "BKE_text.h" diff --git a/source/blender/python/intern/bpy_library_write.cc b/source/blender/python/intern/bpy_library_write.cc index 073bf1d59fb..ceebe52232e 100644 --- a/source/blender/python/intern/bpy_library_write.cc +++ b/source/blender/python/intern/bpy_library_write.cc @@ -19,7 +19,7 @@ #include "BLI_utildefines.h" #include "BKE_blendfile.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "BKE_report.h" diff --git a/source/blender/python/intern/bpy_rna.cc b/source/blender/python/intern/bpy_rna.cc index 4af762aa089..8ef9542c64f 100644 --- a/source/blender/python/intern/bpy_rna.cc +++ b/source/blender/python/intern/bpy_rna.cc @@ -51,7 +51,7 @@ #include "MEM_guardedalloc.h" #include "BKE_context.hh" -#include "BKE_global.h" /* evil G.* */ +#include "BKE_global.hh" /* evil G.* */ #include "BKE_idprop.h" #include "BKE_idtype.hh" #include "BKE_main.hh" diff --git a/source/blender/python/intern/bpy_rna_anim.cc b/source/blender/python/intern/bpy_rna_anim.cc index 9d3e0801b1f..5dd29810360 100644 --- a/source/blender/python/intern/bpy_rna_anim.cc +++ b/source/blender/python/intern/bpy_rna_anim.cc @@ -29,7 +29,7 @@ #include "BKE_animsys.h" #include "BKE_context.hh" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_report.h" diff --git a/source/blender/python/intern/bpy_rna_data.cc b/source/blender/python/intern/bpy_rna_data.cc index a6b54efa1b2..f0b9a68ad32 100644 --- a/source/blender/python/intern/bpy_rna_data.cc +++ b/source/blender/python/intern/bpy_rna_data.cc @@ -22,7 +22,7 @@ #include "BLI_string.h" #include "BLI_utildefines.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "RNA_access.hh" diff --git a/source/blender/python/intern/bpy_rna_id_collection.cc b/source/blender/python/intern/bpy_rna_id_collection.cc index 0de68a2cac3..97891da87e0 100644 --- a/source/blender/python/intern/bpy_rna_id_collection.cc +++ b/source/blender/python/intern/bpy_rna_id_collection.cc @@ -16,7 +16,7 @@ #include "BLI_bitmap.h" #include "BLI_utildefines.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" diff --git a/source/blender/render/intern/compositor.cc b/source/blender/render/intern/compositor.cc index ae1d54872a2..87742e5e1e9 100644 --- a/source/blender/render/intern/compositor.cc +++ b/source/blender/render/intern/compositor.cc @@ -13,7 +13,7 @@ #include "DNA_ID.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_node.hh" #include "BKE_scene.h" diff --git a/source/blender/render/intern/engine.cc b/source/blender/render/intern/engine.cc index 28482597e09..8506640d0c3 100644 --- a/source/blender/render/intern/engine.cc +++ b/source/blender/render/intern/engine.cc @@ -24,7 +24,7 @@ #include "DNA_object_types.h" #include "BKE_camera.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_node.hh" #include "BKE_report.h" diff --git a/source/blender/render/intern/multires_bake.cc b/source/blender/render/intern/multires_bake.cc index 0f8bff2345b..f5017fb46de 100644 --- a/source/blender/render/intern/multires_bake.cc +++ b/source/blender/render/intern/multires_bake.cc @@ -22,7 +22,7 @@ #include "BKE_DerivedMesh.hh" #include "BKE_ccg.h" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_lib_id.hh" #include "BKE_material.h" diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc index 5af5a34648c..b47d05bca63 100644 --- a/source/blender/render/intern/pipeline.cc +++ b/source/blender/render/intern/pipeline.cc @@ -46,7 +46,7 @@ #include "BKE_callbacks.hh" #include "BKE_camera.h" #include "BKE_colortools.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_image_format.h" #include "BKE_image_save.h" diff --git a/source/blender/render/intern/render_result.cc b/source/blender/render/intern/render_result.cc index c9fb2a5ef84..1ae80d97588 100644 --- a/source/blender/render/intern/render_result.cc +++ b/source/blender/render/intern/render_result.cc @@ -26,7 +26,7 @@ #include "BKE_appdir.hh" #include "BKE_camera.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_image_format.h" #include "BKE_image_save.h" diff --git a/source/blender/sequencer/intern/prefetch.cc b/source/blender/sequencer/intern/prefetch.cc index f8ece7006a0..6dcdf57d369 100644 --- a/source/blender/sequencer/intern/prefetch.cc +++ b/source/blender/sequencer/intern/prefetch.cc @@ -27,7 +27,7 @@ #include "BKE_anim_data.h" #include "BKE_animsys.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" diff --git a/source/blender/sequencer/intern/proxy.cc b/source/blender/sequencer/intern/proxy.cc index 3f86dca3310..42181e01362 100644 --- a/source/blender/sequencer/intern/proxy.cc +++ b/source/blender/sequencer/intern/proxy.cc @@ -27,7 +27,7 @@ # include #endif -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_main.hh" #include "BKE_scene.h" diff --git a/source/blender/sequencer/intern/proxy_job.cc b/source/blender/sequencer/intern/proxy_job.cc index a076679d697..8dfb7016740 100644 --- a/source/blender/sequencer/intern/proxy_job.cc +++ b/source/blender/sequencer/intern/proxy_job.cc @@ -18,7 +18,7 @@ #include "DNA_sequence_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "BKE_report.h" diff --git a/source/blender/sequencer/intern/render.cc b/source/blender/sequencer/intern/render.cc index ea8d7c6e933..e94cd65d951 100644 --- a/source/blender/sequencer/intern/render.cc +++ b/source/blender/sequencer/intern/render.cc @@ -30,7 +30,7 @@ #include "BKE_anim_data.h" #include "BKE_animsys.h" #include "BKE_fcurve.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_layer.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/simulation/intern/implicit_eigen.cc b/source/blender/simulation/intern/implicit_eigen.cc index 6bf489d53cd..728bfaac861 100644 --- a/source/blender/simulation/intern/implicit_eigen.cc +++ b/source/blender/simulation/intern/implicit_eigen.cc @@ -59,7 +59,7 @@ extern "C" { # include "BKE_cloth.hh" # include "BKE_collision.h" # include "BKE_effect.h" -# include "BKE_global.h" +# include "BKE_global.hh" # include "SIM_mass_spring.h" } diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc index db95b043a9a..5ed8e8ea622 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.cc @@ -19,7 +19,7 @@ #include "RNA_define.hh" #include "RNA_prototypes.h" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_main.hh" diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc index 67be2f92839..6f20d33f2bf 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.cc @@ -17,7 +17,7 @@ #include "BLI_rect.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "ED_screen.hh" diff --git a/source/blender/windowmanager/intern/wm.cc b/source/blender/windowmanager/intern/wm.cc index 1ca7a9e8d14..7dddbf3bc52 100644 --- a/source/blender/windowmanager/intern/wm.cc +++ b/source/blender/windowmanager/intern/wm.cc @@ -29,7 +29,7 @@ #include "BLT_translation.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/windowmanager/intern/wm_cursors.cc b/source/blender/windowmanager/intern/wm_cursors.cc index 48529de8fef..b18a07ac1ef 100644 --- a/source/blender/windowmanager/intern/wm_cursors.cc +++ b/source/blender/windowmanager/intern/wm_cursors.cc @@ -22,7 +22,7 @@ #include "DNA_workspace_types.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_main.hh" #include "WM_api.hh" diff --git a/source/blender/windowmanager/intern/wm_dragdrop.cc b/source/blender/windowmanager/intern/wm_dragdrop.cc index 3c0892310d8..346f118707d 100644 --- a/source/blender/windowmanager/intern/wm_dragdrop.cc +++ b/source/blender/windowmanager/intern/wm_dragdrop.cc @@ -28,7 +28,7 @@ #include "BIF_glutil.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_idtype.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/windowmanager/intern/wm_draw.cc b/source/blender/windowmanager/intern/wm_draw.cc index a64dd81ef03..e8479c67dbd 100644 --- a/source/blender/windowmanager/intern/wm_draw.cc +++ b/source/blender/windowmanager/intern/wm_draw.cc @@ -27,7 +27,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_image.h" #include "BKE_main.hh" #include "BKE_scene.h" diff --git a/source/blender/windowmanager/intern/wm_event_system.cc b/source/blender/windowmanager/intern/wm_event_system.cc index 59efcd7ead5..d4b4b42cfba 100644 --- a/source/blender/windowmanager/intern/wm_event_system.cc +++ b/source/blender/windowmanager/intern/wm_event_system.cc @@ -36,7 +36,7 @@ #include "BKE_context.hh" #include "BKE_customdata.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_lib_remap.hh" #include "BKE_main.hh" diff --git a/source/blender/windowmanager/intern/wm_files.cc b/source/blender/windowmanager/intern/wm_files.cc index 6575115e24f..5ed82e02536 100644 --- a/source/blender/windowmanager/intern/wm_files.cc +++ b/source/blender/windowmanager/intern/wm_files.cc @@ -69,7 +69,7 @@ #include "BKE_blendfile.hh" #include "BKE_callbacks.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_lib_id.hh" #include "BKE_lib_override.hh" diff --git a/source/blender/windowmanager/intern/wm_files_link.cc b/source/blender/windowmanager/intern/wm_files_link.cc index c3d4c4fa5ad..ce0c0845fc1 100644 --- a/source/blender/windowmanager/intern/wm_files_link.cc +++ b/source/blender/windowmanager/intern/wm_files_link.cc @@ -40,7 +40,7 @@ #include "BKE_blendfile.hh" #include "BKE_blendfile_link_append.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_key.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" diff --git a/source/blender/windowmanager/intern/wm_init_exit.cc b/source/blender/windowmanager/intern/wm_init_exit.cc index 9e43a7fe5e4..9153e501147 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.cc +++ b/source/blender/windowmanager/intern/wm_init_exit.cc @@ -37,7 +37,7 @@ #include "BKE_blendfile.hh" #include "BKE_callbacks.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_icons.h" #include "BKE_image.h" #include "BKE_keyconfig.h" diff --git a/source/blender/windowmanager/intern/wm_jobs.cc b/source/blender/windowmanager/intern/wm_jobs.cc index 9a201383c44..7403c1d885c 100644 --- a/source/blender/windowmanager/intern/wm_jobs.cc +++ b/source/blender/windowmanager/intern/wm_jobs.cc @@ -20,7 +20,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_report.h" #include "SEQ_prefetch.hh" diff --git a/source/blender/windowmanager/intern/wm_keymap.cc b/source/blender/windowmanager/intern/wm_keymap.cc index 856b4c3b83c..200dd8953a0 100644 --- a/source/blender/windowmanager/intern/wm_keymap.cc +++ b/source/blender/windowmanager/intern/wm_keymap.cc @@ -30,7 +30,7 @@ #include "UI_interface.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_main.hh" #include "BKE_screen.hh" diff --git a/source/blender/windowmanager/intern/wm_operator_utils.cc b/source/blender/windowmanager/intern/wm_operator_utils.cc index 7ea11470c43..d73d1135a98 100644 --- a/source/blender/windowmanager/intern/wm_operator_utils.cc +++ b/source/blender/windowmanager/intern/wm_operator_utils.cc @@ -15,7 +15,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_layer.hh" #include "RNA_access.hh" diff --git a/source/blender/windowmanager/intern/wm_operators.cc b/source/blender/windowmanager/intern/wm_operators.cc index b0d92a70954..84aaa447a37 100644 --- a/source/blender/windowmanager/intern/wm_operators.cc +++ b/source/blender/windowmanager/intern/wm_operators.cc @@ -52,7 +52,7 @@ #include "BKE_brush.hh" #include "BKE_colortools.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_image.h" #include "BKE_image_format.h" diff --git a/source/blender/windowmanager/intern/wm_platform_support.cc b/source/blender/windowmanager/intern/wm_platform_support.cc index 13bdfa33790..86899b1bf2e 100644 --- a/source/blender/windowmanager/intern/wm_platform_support.cc +++ b/source/blender/windowmanager/intern/wm_platform_support.cc @@ -20,7 +20,7 @@ #include "BLT_translation.hh" #include "BKE_appdir.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "GPU_platform.h" diff --git a/source/blender/windowmanager/intern/wm_stereo.cc b/source/blender/windowmanager/intern/wm_stereo.cc index d1b295dea19..5f82bde246f 100644 --- a/source/blender/windowmanager/intern/wm_stereo.cc +++ b/source/blender/windowmanager/intern/wm_stereo.cc @@ -19,7 +19,7 @@ #include "BLI_utildefines.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_report.h" #include "GHOST_C-api.h" diff --git a/source/blender/windowmanager/intern/wm_window.cc b/source/blender/windowmanager/intern/wm_window.cc index 551b0c480bf..ba7c9e9c706 100644 --- a/source/blender/windowmanager/intern/wm_window.cc +++ b/source/blender/windowmanager/intern/wm_window.cc @@ -35,7 +35,7 @@ #include "BKE_blender_version.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_icons.h" #include "BKE_layer.hh" #include "BKE_main.hh" diff --git a/source/blender/windowmanager/xr/intern/wm_xr.cc b/source/blender/windowmanager/xr/intern/wm_xr.cc index 62fd0c8cb30..cc069024c1d 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr.cc @@ -10,7 +10,7 @@ * representation of the OpenXR runtime connection within the application. */ -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_main.hh" #include "BKE_report.h" diff --git a/source/blender/windowmanager/xr/intern/wm_xr_operators.cc b/source/blender/windowmanager/xr/intern/wm_xr_operators.cc index a10251a2f6b..3c61b3ae65c 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_operators.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_operators.cc @@ -18,7 +18,7 @@ #include "BLI_time.h" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_main.hh" #include "BKE_screen.hh" diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.cc b/source/blender/windowmanager/xr/intern/wm_xr_session.cc index d1afd92d205..19dc9e621f9 100644 --- a/source/blender/windowmanager/xr/intern/wm_xr_session.cc +++ b/source/blender/windowmanager/xr/intern/wm_xr_session.cc @@ -8,7 +8,7 @@ #include "BKE_callbacks.hh" #include "BKE_context.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_idprop.h" #include "BKE_main.hh" #include "BKE_scene.h" diff --git a/source/creator/creator.cc b/source/creator/creator.cc index 30c0fba2470..b9e2f1a197e 100644 --- a/source/creator/creator.cc +++ b/source/creator/creator.cc @@ -39,7 +39,7 @@ #include "BKE_callbacks.hh" #include "BKE_context.hh" #include "BKE_cpp_types.hh" -#include "BKE_global.h" +#include "BKE_global.hh" #include "BKE_gpencil_modifier_legacy.h" #include "BKE_idtype.hh" #include "BKE_material.h" diff --git a/source/creator/creator_args.cc b/source/creator/creator_args.cc index c6f2903823b..c6a07942191 100644 --- a/source/creator/creator_args.cc +++ b/source/creator/creator_args.cc @@ -37,7 +37,7 @@ # include "BKE_blendfile.hh" # include "BKE_context.hh" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_image_format.h" # include "BKE_lib_id.hh" # include "BKE_main.hh" diff --git a/source/creator/creator_signals.cc b/source/creator/creator_signals.cc index 6dfaea1e5a1..d7a7e8eed68 100644 --- a/source/creator/creator_signals.cc +++ b/source/creator/creator_signals.cc @@ -43,7 +43,7 @@ # include "BKE_appdir.hh" /* BKE_tempdir_base */ # include "BKE_blender_version.h" -# include "BKE_global.h" +# include "BKE_global.hh" # include "BKE_main.hh" # include "BKE_report.h"