From d413b0064fc440c8e1b4cfd96aae2da3aa059c4f Mon Sep 17 00:00:00 2001 From: Falk David Date: Thu, 9 Jan 2025 17:26:40 +0100 Subject: [PATCH] Cleanup: Move `BKE_material.h` to C++ The `BKE_material.h` is only renamed to `.hh` to preserve the history of the file. Changes to the file are done in the following commit. --- source/blender/animrig/intern/animdata.cc | 2 +- source/blender/animrig/intern/keyframing_test.cc | 2 +- source/blender/blenkernel/{BKE_material.h => BKE_material.hh} | 0 source/blender/blenkernel/CMakeLists.txt | 2 +- source/blender/blenkernel/intern/anim_sys.cc | 2 +- source/blender/blenkernel/intern/blendfile_link_append.cc | 2 +- source/blender/blenkernel/intern/brush.cc | 2 +- source/blender/blenkernel/intern/cryptomatte.cc | 2 +- source/blender/blenkernel/intern/curve_to_mesh_convert.cc | 2 +- source/blender/blenkernel/intern/dynamicpaint.cc | 2 +- source/blender/blenkernel/intern/gpencil_geom_legacy.cc | 2 +- source/blender/blenkernel/intern/gpencil_legacy.cc | 2 +- source/blender/blenkernel/intern/gpencil_modifier_legacy.cc | 2 +- source/blender/blenkernel/intern/grease_pencil.cc | 2 +- .../blender/blenkernel/intern/grease_pencil_convert_legacy.cc | 2 +- source/blender/blenkernel/intern/lib_remap.cc | 2 +- source/blender/blenkernel/intern/material.cc | 2 +- source/blender/blenkernel/intern/mesh.cc | 2 +- source/blender/blenkernel/intern/mesh_convert.cc | 2 +- source/blender/blenkernel/intern/mesh_data_update.cc | 2 +- source/blender/blenkernel/intern/object.cc | 2 +- source/blender/blenkernel/intern/paint.cc | 2 +- source/blender/blenkernel/intern/paint_canvas.cc | 2 +- source/blender/blenkernel/intern/particle.cc | 2 +- source/blender/blenkernel/intern/particle_system.cc | 2 +- source/blender/blenloader/intern/readfile.cc | 2 +- source/blender/blenloader/intern/versioning_400.cc | 2 +- source/blender/blenloader/intern/versioning_defaults.cc | 2 +- source/blender/depsgraph/intern/builder/deg_builder_nodes.cc | 2 +- .../blender/depsgraph/intern/builder/deg_builder_relations.cc | 2 +- source/blender/draw/engines/eevee_next/eevee_material.cc | 2 +- source/blender/draw/intern/DRW_render.hh | 2 +- .../draw/intern/draw_cache_extract_mesh_render_data.cc | 2 +- source/blender/draw/intern/draw_cache_impl_pointcloud.cc | 2 +- source/blender/editors/animation/anim_filter.cc | 2 +- source/blender/editors/geometry/node_group_operator.cc | 2 +- source/blender/editors/gpencil_legacy/gpencil_data.cc | 2 +- source/blender/editors/gpencil_legacy/gpencil_edit.cc | 2 +- source/blender/editors/gpencil_legacy/gpencil_utils.cc | 2 +- .../grease_pencil/intern/grease_pencil_bake_animation.cc | 2 +- .../editors/grease_pencil/intern/grease_pencil_edit.cc | 2 +- .../grease_pencil/intern/grease_pencil_image_render.cc | 2 +- .../editors/grease_pencil/intern/grease_pencil_lineart.cc | 2 +- .../editors/grease_pencil/intern/grease_pencil_material.cc | 2 +- .../blender/editors/grease_pencil/intern/grease_pencil_ops.cc | 2 +- .../editors/grease_pencil/intern/grease_pencil_primitive.cc | 2 +- .../editors/grease_pencil/intern/grease_pencil_utils.cc | 2 +- .../blender/editors/interface/eyedroppers/eyedropper_color.cc | 2 +- .../interface/eyedroppers/eyedropper_grease_pencil_color.cc | 2 +- source/blender/editors/interface/interface_ops.cc | 2 +- source/blender/editors/mesh/editmesh_select_similar.cc | 2 +- source/blender/editors/mesh/editmesh_tools.cc | 2 +- source/blender/editors/mesh/meshtools.cc | 2 +- source/blender/editors/object/object_add.cc | 2 +- source/blender/editors/object/object_bake_api.cc | 2 +- source/blender/editors/object/object_edit.cc | 2 +- source/blender/editors/object/object_modifier.cc | 2 +- source/blender/editors/object/object_relations.cc | 2 +- source/blender/editors/object/object_select.cc | 2 +- source/blender/editors/render/render_preview.cc | 2 +- source/blender/editors/render/render_shading.cc | 2 +- source/blender/editors/render/render_update.cc | 2 +- source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc | 2 +- source/blender/editors/sculpt_paint/grease_pencil_fill.cc | 2 +- .../blender/editors/sculpt_paint/grease_pencil_interpolate.cc | 2 +- source/blender/editors/sculpt_paint/grease_pencil_paint.cc | 2 +- source/blender/editors/sculpt_paint/grease_pencil_tint.cc | 2 +- source/blender/editors/sculpt_paint/grease_pencil_trace.cc | 2 +- source/blender/editors/sculpt_paint/paint_canvas.cc | 2 +- source/blender/editors/sculpt_paint/paint_image.cc | 2 +- source/blender/editors/sculpt_paint/paint_image_proj.cc | 2 +- source/blender/editors/sculpt_paint/paint_utils.cc | 2 +- source/blender/editors/space_buttons/buttons_context.cc | 2 +- source/blender/editors/space_node/node_context_path.cc | 2 +- source/blender/editors/space_node/node_edit.cc | 2 +- source/blender/editors/space_node/node_shader_preview.cc | 2 +- source/blender/editors/space_outliner/outliner_dragdrop.cc | 2 +- source/blender/editors/util/ed_util.cc | 2 +- source/blender/editors/uvedit/uvedit_ops.cc | 2 +- source/blender/editors/uvedit/uvedit_select.cc | 2 +- .../freestyle/intern/blender_interface/BlenderFileLoader.h | 2 +- .../intern/blender_interface/BlenderStrokeRenderer.cpp | 2 +- source/blender/freestyle/intern/python/BPy_Freestyle.cpp | 3 +-- source/blender/geometry/intern/realize_instances.cc | 2 +- source/blender/gpu/intern/gpu_codegen.cc | 2 +- source/blender/gpu/intern/gpu_material.cc | 2 +- source/blender/io/alembic/exporter/abc_writer_mesh.cc | 2 +- source/blender/io/alembic/intern/abc_reader_mesh.cc | 2 +- source/blender/io/collada/BCAnimationCurve.h | 2 +- source/blender/io/collada/BCAnimationSampler.cpp | 2 +- source/blender/io/collada/DocumentExporter.cpp | 2 +- source/blender/io/collada/DocumentImporter.cpp | 2 +- source/blender/io/collada/EffectExporter.cpp | 2 +- source/blender/io/collada/GeometryExporter.cpp | 2 +- source/blender/io/collada/InstanceWriter.cpp | 2 +- source/blender/io/collada/MaterialExporter.h | 2 +- source/blender/io/collada/MeshImporter.cpp | 2 +- source/blender/io/collada/collada_utils.cpp | 2 +- source/blender/io/grease_pencil/intern/grease_pencil_io.cc | 2 +- .../io/grease_pencil/intern/grease_pencil_io_export_pdf.cc | 2 +- .../io/grease_pencil/intern/grease_pencil_io_export_svg.cc | 2 +- source/blender/io/usd/hydra/curves.cc | 2 +- source/blender/io/usd/hydra/material.cc | 2 +- source/blender/io/usd/hydra/mesh.cc | 2 +- source/blender/io/usd/hydra/volume.cc | 2 +- source/blender/io/usd/intern/usd_reader_material.cc | 2 +- source/blender/io/usd/intern/usd_reader_mesh.cc | 2 +- source/blender/io/usd/intern/usd_writer_curves.cc | 2 +- source/blender/io/usd/intern/usd_writer_mesh.cc | 2 +- source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc | 2 +- source/blender/io/wavefront_obj/importer/obj_import_mesh.cc | 2 +- source/blender/io/wavefront_obj/tests/obj_importer_tests.cc | 2 +- source/blender/makesrna/intern/rna_ID.cc | 2 +- source/blender/makesrna/intern/rna_brush.cc | 2 +- source/blender/makesrna/intern/rna_main_api.cc | 2 +- source/blender/makesrna/intern/rna_material.cc | 2 +- source/blender/makesrna/intern/rna_modifier.cc | 2 +- source/blender/makesrna/intern/rna_object.cc | 2 +- source/blender/makesrna/intern/rna_particle.cc | 2 +- source/blender/makesrna/intern/rna_sculpt_paint.cc | 2 +- source/blender/modifiers/intern/MOD_boolean.cc | 2 +- source/blender/modifiers/intern/MOD_grease_pencil_armature.cc | 2 +- source/blender/modifiers/intern/MOD_grease_pencil_array.cc | 2 +- source/blender/modifiers/intern/MOD_grease_pencil_color.cc | 2 +- source/blender/modifiers/intern/MOD_grease_pencil_envelope.cc | 2 +- source/blender/modifiers/intern/MOD_grease_pencil_multiply.cc | 2 +- source/blender/modifiers/intern/MOD_grease_pencil_offset.cc | 2 +- source/blender/modifiers/intern/MOD_grease_pencil_outline.cc | 2 +- .../blender/modifiers/intern/MOD_grease_pencil_shrinkwrap.cc | 2 +- source/blender/modifiers/intern/MOD_grease_pencil_tint.cc | 2 +- source/blender/modifiers/intern/MOD_grease_pencil_util.cc | 2 +- source/blender/modifiers/intern/MOD_lineart.cc | 2 +- source/blender/modifiers/intern/lineart/lineart_cpu.cc | 2 +- source/blender/nodes/composite/nodes/node_composite_mixrgb.cc | 2 +- source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc | 2 +- source/blender/nodes/geometry/nodes/node_geo_grid_to_mesh.cc | 2 +- .../nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc | 2 +- .../nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc | 2 +- .../nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc | 2 +- .../nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc | 2 +- .../nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc | 2 +- .../geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc | 2 +- .../nodes/geometry/nodes/node_geo_mesh_primitive_line.cc | 2 +- .../nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc | 2 +- source/blender/nodes/geometry/nodes/node_geo_set_material.cc | 2 +- .../blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc | 2 +- source/blender/nodes/shader/node_shader_tree.cc | 2 +- source/blender/nodes/shader/nodes/node_shader_mix.cc | 2 +- source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc | 2 +- source/blender/nodes/texture/nodes/node_texture_bricks.cc | 2 +- source/blender/nodes/texture/nodes/node_texture_mixRgb.cc | 2 +- source/blender/nodes/texture/nodes/node_texture_proc.cc | 2 +- source/blender/nodes/texture/nodes/node_texture_texture.cc | 2 +- source/blender/windowmanager/intern/wm_files_link.cc | 2 +- source/blender/windowmanager/intern/wm_init_exit.cc | 4 ++-- source/blender/windowmanager/intern/wm_operators.cc | 2 +- source/creator/creator.cc | 2 +- 157 files changed, 157 insertions(+), 158 deletions(-) rename source/blender/blenkernel/{BKE_material.h => BKE_material.hh} (100%) diff --git a/source/blender/animrig/intern/animdata.cc b/source/blender/animrig/intern/animdata.cc index 968b88a8672..02d8e936a70 100644 --- a/source/blender/animrig/intern/animdata.cc +++ b/source/blender/animrig/intern/animdata.cc @@ -14,7 +14,7 @@ #include "BKE_key.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_node.hh" #include "BLT_translation.hh" diff --git a/source/blender/animrig/intern/keyframing_test.cc b/source/blender/animrig/intern/keyframing_test.cc index f507136f187..c9f99318a3a 100644 --- a/source/blender/animrig/intern/keyframing_test.cc +++ b/source/blender/animrig/intern/keyframing_test.cc @@ -13,7 +13,7 @@ #include "BKE_idtype.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_nla.hh" #include "BKE_object.hh" diff --git a/source/blender/blenkernel/BKE_material.h b/source/blender/blenkernel/BKE_material.hh similarity index 100% rename from source/blender/blenkernel/BKE_material.h rename to source/blender/blenkernel/BKE_material.hh diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 9a96fdae9a0..f7d6da160bf 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -434,7 +434,7 @@ set(SRC BKE_main_idmap.hh BKE_main_namemap.hh BKE_mask.h - BKE_material.h + BKE_material.hh BKE_mball.hh BKE_mball_tessellate.hh BKE_mesh.h diff --git a/source/blender/blenkernel/intern/anim_sys.cc b/source/blender/blenkernel/intern/anim_sys.cc index 0637277c61a..c1be76c4aa0 100644 --- a/source/blender/blenkernel/intern/anim_sys.cc +++ b/source/blender/blenkernel/intern/anim_sys.cc @@ -47,7 +47,7 @@ #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_nla.hh" #include "BKE_node.hh" #include "BKE_report.hh" diff --git a/source/blender/blenkernel/intern/blendfile_link_append.cc b/source/blender/blenkernel/intern/blendfile_link_append.cc index 2fabe1818d3..0c401697b48 100644 --- a/source/blender/blenkernel/intern/blendfile_link_append.cc +++ b/source/blender/blenkernel/intern/blendfile_link_append.cc @@ -51,7 +51,7 @@ #include "BKE_library.hh" #include "BKE_main.hh" #include "BKE_main_namemap.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh_legacy_convert.hh" #include "BKE_object.hh" #include "BKE_report.hh" diff --git a/source/blender/blenkernel/intern/brush.cc b/source/blender/blenkernel/intern/brush.cc index 87feb1bcf19..be72e0d8072 100644 --- a/source/blender/blenkernel/intern/brush.cc +++ b/source/blender/blenkernel/intern/brush.cc @@ -35,7 +35,7 @@ #include "BKE_lib_query.hh" #include "BKE_lib_remap.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "BKE_preview_image.hh" #include "BKE_texture.h" diff --git a/source/blender/blenkernel/intern/cryptomatte.cc b/source/blender/blenkernel/intern/cryptomatte.cc index 461ac3a4297..a808e8a356f 100644 --- a/source/blender/blenkernel/intern/cryptomatte.cc +++ b/source/blender/blenkernel/intern/cryptomatte.cc @@ -11,7 +11,7 @@ #include "BKE_image.hh" #include "BKE_layer.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "DNA_layer_types.h" #include "DNA_material_types.h" diff --git a/source/blender/blenkernel/intern/curve_to_mesh_convert.cc b/source/blender/blenkernel/intern/curve_to_mesh_convert.cc index eecbdd6b1e5..cab8e207a3b 100644 --- a/source/blender/blenkernel/intern/curve_to_mesh_convert.cc +++ b/source/blender/blenkernel/intern/curve_to_mesh_convert.cc @@ -13,7 +13,7 @@ #include "BKE_curves.hh" #include "BKE_customdata.hh" #include "BKE_geometry_set.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_curve_to_mesh.hh" diff --git a/source/blender/blenkernel/intern/dynamicpaint.cc b/source/blender/blenkernel/intern/dynamicpaint.cc index 078c4b4f5ab..61d2024f871 100644 --- a/source/blender/blenkernel/intern/dynamicpaint.cc +++ b/source/blender/blenkernel/intern/dynamicpaint.cc @@ -52,7 +52,7 @@ #include "BKE_image_format.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_mapping.hh" #include "BKE_mesh_runtime.hh" diff --git a/source/blender/blenkernel/intern/gpencil_geom_legacy.cc b/source/blender/blenkernel/intern/gpencil_geom_legacy.cc index 61964845b9f..322b8d157e9 100644 --- a/source/blender/blenkernel/intern/gpencil_geom_legacy.cc +++ b/source/blender/blenkernel/intern/gpencil_geom_legacy.cc @@ -41,7 +41,7 @@ #include "BKE_deform.hh" #include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_object.hh" #include "BKE_object_types.hh" diff --git a/source/blender/blenkernel/intern/gpencil_legacy.cc b/source/blender/blenkernel/intern/gpencil_legacy.cc index c40a6ad7641..ffc790d3928 100644 --- a/source/blender/blenkernel/intern/gpencil_legacy.cc +++ b/source/blender/blenkernel/intern/gpencil_legacy.cc @@ -49,7 +49,7 @@ #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "BLI_math_color.h" diff --git a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc index 52ef8ede6d5..4cb1aa1c9be 100644 --- a/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc +++ b/source/blender/blenkernel/intern/gpencil_modifier_legacy.cc @@ -22,7 +22,7 @@ #include "BKE_lattice.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "BKE_object.hh" #include "BKE_screen.hh" diff --git a/source/blender/blenkernel/intern/grease_pencil.cc b/source/blender/blenkernel/intern/grease_pencil.cc index 0210e4dba95..a19074ff59b 100644 --- a/source/blender/blenkernel/intern/grease_pencil.cc +++ b/source/blender/blenkernel/intern/grease_pencil.cc @@ -23,7 +23,7 @@ #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "BKE_object.hh" #include "BKE_object_types.hh" diff --git a/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc b/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc index 2e4036b8d5c..a90b77d3def 100644 --- a/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc +++ b/source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc @@ -26,7 +26,7 @@ #include "BKE_lib_id.hh" #include "BKE_lib_remap.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "BKE_node.hh" #include "BKE_node_tree_update.hh" diff --git a/source/blender/blenkernel/intern/lib_remap.cc b/source/blender/blenkernel/intern/lib_remap.cc index 51c53ff2c32..869c943f306 100644 --- a/source/blender/blenkernel/intern/lib_remap.cc +++ b/source/blender/blenkernel/intern/lib_remap.cc @@ -25,7 +25,7 @@ #include "BKE_lib_query.hh" #include "BKE_lib_remap.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mball.hh" #include "BKE_modifier.hh" #include "BKE_multires.hh" diff --git a/source/blender/blenkernel/intern/material.cc b/source/blender/blenkernel/intern/material.cc index 1a8da5ad4a6..8686e36f249 100644 --- a/source/blender/blenkernel/intern/material.cc +++ b/source/blender/blenkernel/intern/material.cc @@ -59,7 +59,7 @@ #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_node.hh" #include "BKE_node_runtime.hh" diff --git a/source/blender/blenkernel/intern/mesh.cc b/source/blender/blenkernel/intern/mesh.cc index 251532315d5..d3930eb90b4 100644 --- a/source/blender/blenkernel/intern/mesh.cc +++ b/source/blender/blenkernel/intern/mesh.cc @@ -59,7 +59,7 @@ #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_legacy_convert.hh" #include "BKE_mesh_runtime.hh" diff --git a/source/blender/blenkernel/intern/mesh_convert.cc b/source/blender/blenkernel/intern/mesh_convert.cc index 022507acf6f..05cdea1bca0 100644 --- a/source/blender/blenkernel/intern/mesh_convert.cc +++ b/source/blender/blenkernel/intern/mesh_convert.cc @@ -36,7 +36,7 @@ #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_mesh_runtime.hh" diff --git a/source/blender/blenkernel/intern/mesh_data_update.cc b/source/blender/blenkernel/intern/mesh_data_update.cc index 4eca674fbe4..5a03114a6cd 100644 --- a/source/blender/blenkernel/intern/mesh_data_update.cc +++ b/source/blender/blenkernel/intern/mesh_data_update.cc @@ -41,7 +41,7 @@ #include "BKE_key.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_iterators.hh" #include "BKE_mesh_mapping.hh" diff --git a/source/blender/blenkernel/intern/object.cc b/source/blender/blenkernel/intern/object.cc index 6a486dc0e5f..7f5961fd3b4 100644 --- a/source/blender/blenkernel/intern/object.cc +++ b/source/blender/blenkernel/intern/object.cc @@ -107,7 +107,7 @@ #include "BKE_lightprobe.h" #include "BKE_linestyle.h" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_mesh_legacy_derived_mesh.hh" diff --git a/source/blender/blenkernel/intern/paint.cc b/source/blender/blenkernel/intern/paint.cc index 9f4aaf48875..5dd916c1279 100644 --- a/source/blender/blenkernel/intern/paint.cc +++ b/source/blender/blenkernel/intern/paint.cc @@ -57,7 +57,7 @@ #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_mapping.hh" #include "BKE_mesh_runtime.hh" diff --git a/source/blender/blenkernel/intern/paint_canvas.cc b/source/blender/blenkernel/intern/paint_canvas.cc index a569ce8ea12..1778e5c4e99 100644 --- a/source/blender/blenkernel/intern/paint_canvas.cc +++ b/source/blender/blenkernel/intern/paint_canvas.cc @@ -11,7 +11,7 @@ #include "BKE_customdata.hh" #include "BKE_image.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "IMB_imbuf_types.hh" diff --git a/source/blender/blenkernel/intern/particle.cc b/source/blender/blenkernel/intern/particle.cc index b880fdeacb8..9b008144834 100644 --- a/source/blender/blenkernel/intern/particle.cc +++ b/source/blender/blenkernel/intern/particle.cc @@ -63,7 +63,7 @@ #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_legacy_convert.hh" #include "BKE_modifier.hh" diff --git a/source/blender/blenkernel/intern/particle_system.cc b/source/blender/blenkernel/intern/particle_system.cc index 9b9d6b7f079..bff23454774 100644 --- a/source/blender/blenkernel/intern/particle_system.cc +++ b/source/blender/blenkernel/intern/particle_system.cc @@ -53,7 +53,7 @@ #include "BKE_particle.h" #include "BKE_cloth.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" #include "BKE_object.hh" diff --git a/source/blender/blenloader/intern/readfile.cc b/source/blender/blenloader/intern/readfile.cc index 2f95ce28125..b94f6306f4a 100644 --- a/source/blender/blenloader/intern/readfile.cc +++ b/source/blender/blenloader/intern/readfile.cc @@ -79,7 +79,7 @@ #include "BKE_main.hh" /* for Main */ #include "BKE_main_idmap.hh" #include "BKE_main_namemap.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" #include "BKE_node.hh" /* for tree type defines */ diff --git a/source/blender/blenloader/intern/versioning_400.cc b/source/blender/blenloader/intern/versioning_400.cc index 692828f875e..626053a6ccc 100644 --- a/source/blender/blenloader/intern/versioning_400.cc +++ b/source/blender/blenloader/intern/versioning_400.cc @@ -76,7 +76,7 @@ #include "BKE_image_format.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh_legacy_convert.hh" #include "BKE_nla.hh" #include "BKE_node_runtime.hh" diff --git a/source/blender/blenloader/intern/versioning_defaults.cc b/source/blender/blenloader/intern/versioning_defaults.cc index 609f5f746cf..99463ac2c72 100644 --- a/source/blender/blenloader/intern/versioning_defaults.cc +++ b/source/blender/blenloader/intern/versioning_defaults.cc @@ -55,7 +55,7 @@ #include "BKE_lib_id.hh" #include "BKE_main.hh" #include "BKE_main_namemap.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_node_runtime.hh" #include "BKE_node_tree_update.hh" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc index 92af0e202e6..cb0025abf62 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_nodes.cc @@ -76,7 +76,7 @@ #include "BKE_lib_query.hh" #include "BKE_light.h" #include "BKE_mask.h" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc index 34c1f565f22..3413050639b 100644 --- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc +++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc @@ -73,7 +73,7 @@ #include "BKE_key.hh" #include "BKE_layer.hh" #include "BKE_lib_query.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mball.hh" #include "BKE_modifier.hh" #include "BKE_node.hh" diff --git a/source/blender/draw/engines/eevee_next/eevee_material.cc b/source/blender/draw/engines/eevee_next/eevee_material.cc index de21fb07fb4..b64fa204fb6 100644 --- a/source/blender/draw/engines/eevee_next/eevee_material.cc +++ b/source/blender/draw/engines/eevee_next/eevee_material.cc @@ -9,7 +9,7 @@ #include "DNA_material_types.h" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_node.hh" #include "NOD_shader.h" diff --git a/source/blender/draw/intern/DRW_render.hh b/source/blender/draw/intern/DRW_render.hh index d2e244fd0f5..8c019733472 100644 --- a/source/blender/draw/intern/DRW_render.hh +++ b/source/blender/draw/intern/DRW_render.hh @@ -16,7 +16,7 @@ #include "BKE_context.hh" #include "BKE_layer.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_scene.hh" #include "BLT_translation.hh" diff --git a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc index 8ed8f597550..42512da8186 100644 --- a/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc +++ b/source/blender/draw/intern/draw_cache_extract_mesh_render_data.cc @@ -21,7 +21,7 @@ #include "BKE_attribute.hh" #include "BKE_editmesh.hh" #include "BKE_editmesh_cache.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_runtime.hh" #include "BKE_object.hh" diff --git a/source/blender/draw/intern/draw_cache_impl_pointcloud.cc b/source/blender/draw/intern/draw_cache_impl_pointcloud.cc index 487fb50710c..7c939bca113 100644 --- a/source/blender/draw/intern/draw_cache_impl_pointcloud.cc +++ b/source/blender/draw/intern/draw_cache_impl_pointcloud.cc @@ -23,7 +23,7 @@ #include "DNA_pointcloud_types.h" #include "BKE_attribute.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_pointcloud.hh" #include "GPU_batch.hh" diff --git a/source/blender/editors/animation/anim_filter.cc b/source/blender/editors/animation/anim_filter.cc index b5ebdef3384..7a0e04195e8 100644 --- a/source/blender/editors/animation/anim_filter.cc +++ b/source/blender/editors/animation/anim_filter.cc @@ -78,7 +78,7 @@ #include "BKE_layer.hh" #include "BKE_main.hh" #include "BKE_mask.h" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "BKE_node.hh" diff --git a/source/blender/editors/geometry/node_group_operator.cc b/source/blender/editors/geometry/node_group_operator.cc index d462030cc7f..1b04b981629 100644 --- a/source/blender/editors/geometry/node_group_operator.cc +++ b/source/blender/editors/geometry/node_group_operator.cc @@ -30,7 +30,7 @@ #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_node_runtime.hh" diff --git a/source/blender/editors/gpencil_legacy/gpencil_data.cc b/source/blender/editors/gpencil_legacy/gpencil_data.cc index 3310b1847ea..633eaef9a6f 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_data.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_data.cc @@ -46,7 +46,7 @@ #include "BKE_gpencil_legacy.h" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "BKE_report.hh" diff --git a/source/blender/editors/gpencil_legacy/gpencil_edit.cc b/source/blender/editors/gpencil_legacy/gpencil_edit.cc index 73c84b60e09..ee6132a1073 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_edit.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_edit.cc @@ -43,7 +43,7 @@ #include "BKE_gpencil_legacy.h" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "BKE_report.hh" #include "BKE_scene.hh" diff --git a/source/blender/editors/gpencil_legacy/gpencil_utils.cc b/source/blender/editors/gpencil_legacy/gpencil_utils.cc index ec339707122..018a8f15a02 100644 --- a/source/blender/editors/gpencil_legacy/gpencil_utils.cc +++ b/source/blender/editors/gpencil_legacy/gpencil_utils.cc @@ -46,7 +46,7 @@ #include "BKE_gpencil_geom_legacy.h" #include "BKE_gpencil_legacy.h" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_object.hh" #include "BKE_paint.hh" #include "BKE_preview_image.hh" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_bake_animation.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_bake_animation.cc index 58f009f4808..ff5e201c9ea 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_bake_animation.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_bake_animation.cc @@ -14,7 +14,7 @@ #include "BKE_context.hh" #include "BKE_curves.hh" #include "BKE_duplilist.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_scene.hh" #include "BLI_math_matrix.h" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc index a58c542572c..8802269fa81 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_edit.cc @@ -44,7 +44,7 @@ #include "BKE_instances.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_preview_image.hh" #include "BKE_report.hh" #include "BKE_scene.hh" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_image_render.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_image_render.cc index 2ee5bd5714c..2f34428db34 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_image_render.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_image_render.cc @@ -10,7 +10,7 @@ #include "BKE_camera.h" #include "BKE_curves.hh" #include "BKE_image.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BLI_math_vector.hh" #include "DNA_gpencil_legacy_types.h" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_lineart.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_lineart.cc index 5782c2021f0..bb62bd6b488 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_lineart.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_lineart.cc @@ -23,7 +23,7 @@ #include "BKE_curves.hh" #include "BKE_global.hh" #include "BKE_grease_pencil.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "BKE_report.hh" #include "BKE_scene.hh" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_material.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_material.cc index 5c08f7bc154..fcbd6025acb 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_material.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_material.cc @@ -12,7 +12,7 @@ #include "BKE_context.hh" #include "BKE_curves_utils.hh" #include "BKE_grease_pencil.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BLI_vector.hh" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc index 2214015a548..4ea203d3e68 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_ops.cc @@ -9,7 +9,7 @@ #include "DNA_brush_types.h" #include "BKE_context.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "DNA_brush_enums.h" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_primitive.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_primitive.cc index 6d022075cfd..bb83c404734 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_primitive.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_primitive.cc @@ -17,7 +17,7 @@ #include "BKE_context.hh" #include "BKE_curves.hh" #include "BKE_grease_pencil.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "BKE_screen.hh" diff --git a/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc b/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc index 0a665d5c435..9fdc61c9ffe 100644 --- a/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc +++ b/source/blender/editors/grease_pencil/intern/grease_pencil_utils.cc @@ -11,7 +11,7 @@ #include "BKE_colortools.hh" #include "BKE_context.hh" #include "BKE_grease_pencil.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "BKE_report.hh" #include "BKE_scene.hh" diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_color.cc b/source/blender/editors/interface/eyedroppers/eyedropper_color.cc index e06a32d1fad..1f3dbfdd272 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_color.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_color.cc @@ -26,7 +26,7 @@ #include "BKE_context.hh" #include "BKE_cryptomatte.h" #include "BKE_image.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_report.hh" #include "BKE_screen.hh" diff --git a/source/blender/editors/interface/eyedroppers/eyedropper_grease_pencil_color.cc b/source/blender/editors/interface/eyedroppers/eyedropper_grease_pencil_color.cc index 3a038ba6a17..1f982fdb4cc 100644 --- a/source/blender/editors/interface/eyedroppers/eyedropper_grease_pencil_color.cc +++ b/source/blender/editors/interface/eyedroppers/eyedropper_grease_pencil_color.cc @@ -27,7 +27,7 @@ #include "BKE_context.hh" #include "BKE_grease_pencil.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "UI_interface.hh" diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc index ed1cf1594b7..1c2efe8c0d8 100644 --- a/source/blender/editors/interface/interface_ops.cc +++ b/source/blender/editors/interface/interface_ops.cc @@ -33,7 +33,7 @@ #include "BKE_lib_id.hh" #include "BKE_lib_override.hh" #include "BKE_lib_remap.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_node.hh" #include "BKE_report.hh" #include "BKE_screen.hh" diff --git a/source/blender/editors/mesh/editmesh_select_similar.cc b/source/blender/editors/mesh/editmesh_select_similar.cc index e0f4183f53b..3dfef658114 100644 --- a/source/blender/editors/mesh/editmesh_select_similar.cc +++ b/source/blender/editors/mesh/editmesh_select_similar.cc @@ -23,7 +23,7 @@ #include "BKE_deform.hh" #include "BKE_editmesh.hh" #include "BKE_layer.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_object_types.hh" #include "BKE_report.hh" diff --git a/source/blender/editors/mesh/editmesh_tools.cc b/source/blender/editors/mesh/editmesh_tools.cc index 29f255ed813..390e627a883 100644 --- a/source/blender/editors/mesh/editmesh_tools.cc +++ b/source/blender/editors/mesh/editmesh_tools.cc @@ -40,7 +40,7 @@ #include "BKE_key.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_types.hh" #include "BKE_object.hh" diff --git a/source/blender/editors/mesh/meshtools.cc b/source/blender/editors/mesh/meshtools.cc index eec2950bca0..a5b87651340 100644 --- a/source/blender/editors/mesh/meshtools.cc +++ b/source/blender/editors/mesh/meshtools.cc @@ -34,7 +34,7 @@ #include "BKE_editmesh.hh" #include "BKE_key.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_iterators.hh" #include "BKE_mesh_runtime.hh" diff --git a/source/blender/editors/object/object_add.cc b/source/blender/editors/object/object_add.cc index efa695da2b1..d3245b9ca52 100644 --- a/source/blender/editors/object/object_add.cc +++ b/source/blender/editors/object/object_add.cc @@ -80,7 +80,7 @@ #include "BKE_light.h" #include "BKE_lightprobe.h" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_mesh_runtime.hh" diff --git a/source/blender/editors/object/object_bake_api.cc b/source/blender/editors/object/object_bake_api.cc index ec550c2fc2b..c5683fd6243 100644 --- a/source/blender/editors/object/object_bake_api.cc +++ b/source/blender/editors/object/object_bake_api.cc @@ -35,7 +35,7 @@ #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" #include "BKE_node.hh" diff --git a/source/blender/editors/object/object_edit.cc b/source/blender/editors/object/object_edit.cc index 39a65aa528f..efe5d20adc1 100644 --- a/source/blender/editors/object/object_edit.cc +++ b/source/blender/editors/object/object_edit.cc @@ -56,7 +56,7 @@ #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_modifier.hh" diff --git a/source/blender/editors/object/object_modifier.cc b/source/blender/editors/object/object_modifier.cc index 855acd88338..bb0e8ee58fb 100644 --- a/source/blender/editors/object/object_modifier.cc +++ b/source/blender/editors/object/object_modifier.cc @@ -58,7 +58,7 @@ #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mball.hh" #include "BKE_mesh.hh" #include "BKE_mesh_mapping.hh" diff --git a/source/blender/editors/object/object_relations.cc b/source/blender/editors/object/object_relations.cc index 1ef8eb16b0f..95c7721269a 100644 --- a/source/blender/editors/object/object_relations.cc +++ b/source/blender/editors/object/object_relations.cc @@ -55,7 +55,7 @@ #include "BKE_lib_query.hh" #include "BKE_lib_remap.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh_types.hh" #include "BKE_modifier.hh" #include "BKE_node.hh" diff --git a/source/blender/editors/object/object_select.cc b/source/blender/editors/object/object_select.cc index 7cc62793332..eddbe665dcb 100644 --- a/source/blender/editors/object/object_select.cc +++ b/source/blender/editors/object/object_select.cc @@ -35,7 +35,7 @@ #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_particle.h" #include "BKE_report.hh" #include "BKE_scene.hh" diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc index 68b06c7e3fd..9091a61a115 100644 --- a/source/blender/editors/render/render_preview.cc +++ b/source/blender/editors/render/render_preview.cc @@ -58,7 +58,7 @@ #include "BKE_lib_id.hh" #include "BKE_light.h" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_node.hh" #include "BKE_object.hh" #include "BKE_pose_backup.h" diff --git a/source/blender/editors/render/render_shading.cc b/source/blender/editors/render/render_shading.cc index a72daa93d61..542aeb5f8f4 100644 --- a/source/blender/editors/render/render_shading.cc +++ b/source/blender/editors/render/render_shading.cc @@ -50,7 +50,7 @@ #include "BKE_lightprobe.h" #include "BKE_linestyle.h" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_node.hh" #include "BKE_node_runtime.hh" #include "BKE_node_tree_update.hh" diff --git a/source/blender/editors/render/render_update.cc b/source/blender/editors/render/render_update.cc index a2a1d464239..95edd8e8676 100644 --- a/source/blender/editors/render/render_update.cc +++ b/source/blender/editors/render/render_update.cc @@ -31,7 +31,7 @@ #include "BKE_context.hh" #include "BKE_icons.h" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "BKE_scene.hh" diff --git a/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc b/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc index 1c10a095cba..3003e655b7b 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_draw_ops.cc @@ -12,7 +12,7 @@ #include "BKE_deform.hh" #include "BKE_geometry_set.hh" #include "BKE_grease_pencil.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_object_deform.h" #include "BKE_paint.hh" #include "BKE_report.hh" diff --git a/source/blender/editors/sculpt_paint/grease_pencil_fill.cc b/source/blender/editors/sculpt_paint/grease_pencil_fill.cc index 492ca7982f9..933502c193a 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_fill.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_fill.cc @@ -20,7 +20,7 @@ #include "BKE_grease_pencil.hh" #include "BKE_image.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "DNA_brush_types.h" diff --git a/source/blender/editors/sculpt_paint/grease_pencil_interpolate.cc b/source/blender/editors/sculpt_paint/grease_pencil_interpolate.cc index 79e143d74dd..690c25a0beb 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_interpolate.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_interpolate.cc @@ -7,7 +7,7 @@ #include "BKE_curves.hh" #include "BKE_deform.hh" #include "BKE_grease_pencil.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "BLI_array_utils.hh" diff --git a/source/blender/editors/sculpt_paint/grease_pencil_paint.cc b/source/blender/editors/sculpt_paint/grease_pencil_paint.cc index 6488c473478..7c646ece37c 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_paint.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_paint.cc @@ -12,7 +12,7 @@ #include "BKE_geometry_set.hh" #include "BKE_grease_pencil.hh" #include "BKE_grease_pencil_vertex_groups.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "BKE_scene.hh" diff --git a/source/blender/editors/sculpt_paint/grease_pencil_tint.cc b/source/blender/editors/sculpt_paint/grease_pencil_tint.cc index faf910859cf..61e1b549cda 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_tint.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_tint.cc @@ -8,7 +8,7 @@ #include "BKE_context.hh" #include "BKE_curves.hh" #include "BKE_grease_pencil.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "BLI_bounds.hh" diff --git a/source/blender/editors/sculpt_paint/grease_pencil_trace.cc b/source/blender/editors/sculpt_paint/grease_pencil_trace.cc index 85cda0f1c39..b09847f90d3 100644 --- a/source/blender/editors/sculpt_paint/grease_pencil_trace.cc +++ b/source/blender/editors/sculpt_paint/grease_pencil_trace.cc @@ -10,7 +10,7 @@ #include "BKE_image.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_object.hh" #include "BKE_report.hh" diff --git a/source/blender/editors/sculpt_paint/paint_canvas.cc b/source/blender/editors/sculpt_paint/paint_canvas.cc index 05d35eef251..69a0664f88b 100644 --- a/source/blender/editors/sculpt_paint/paint_canvas.cc +++ b/source/blender/editors/sculpt_paint/paint_canvas.cc @@ -11,7 +11,7 @@ #include "DNA_workspace_types.h" #include "BKE_context.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "WM_toolsystem.hh" diff --git a/source/blender/editors/sculpt_paint/paint_image.cc b/source/blender/editors/sculpt_paint/paint_image.cc index 58f4b02b855..267823db625 100644 --- a/source/blender/editors/sculpt_paint/paint_image.cc +++ b/source/blender/editors/sculpt_paint/paint_image.cc @@ -37,7 +37,7 @@ #include "BKE_grease_pencil.hh" #include "BKE_image.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_node_runtime.hh" #include "BKE_object.hh" diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.cc b/source/blender/editors/sculpt_paint/paint_image_proj.cc index b8fab29a2fe..9716cf835f5 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.cc +++ b/source/blender/editors/sculpt_paint/paint_image_proj.cc @@ -63,7 +63,7 @@ #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_mapping.hh" #include "BKE_mesh_runtime.hh" diff --git a/source/blender/editors/sculpt_paint/paint_utils.cc b/source/blender/editors/sculpt_paint/paint_utils.cc index 4d489fc6738..a4e977ad438 100644 --- a/source/blender/editors/sculpt_paint/paint_utils.cc +++ b/source/blender/editors/sculpt_paint/paint_utils.cc @@ -34,7 +34,7 @@ #include "BKE_customdata.hh" #include "BKE_image.hh" #include "BKE_layer.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_sample.hh" #include "BKE_object.hh" diff --git a/source/blender/editors/space_buttons/buttons_context.cc b/source/blender/editors/space_buttons/buttons_context.cc index fddf8134c68..78e14ad063d 100644 --- a/source/blender/editors/space_buttons/buttons_context.cc +++ b/source/blender/editors/space_buttons/buttons_context.cc @@ -30,7 +30,7 @@ #include "BKE_context.hh" #include "BKE_layer.hh" #include "BKE_linestyle.h" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "BKE_object.hh" #include "BKE_paint.hh" diff --git a/source/blender/editors/space_node/node_context_path.cc b/source/blender/editors/space_node/node_context_path.cc index 98283f902b8..4cf0c6f04f3 100644 --- a/source/blender/editors/space_node/node_context_path.cc +++ b/source/blender/editors/space_node/node_context_path.cc @@ -12,7 +12,7 @@ #include "DNA_node_types.h" #include "BKE_context.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_object.hh" #include "RNA_prototypes.hh" diff --git a/source/blender/editors/space_node/node_edit.cc b/source/blender/editors/space_node/node_edit.cc index ab7e380486a..b35f4f954d6 100644 --- a/source/blender/editors/space_node/node_edit.cc +++ b/source/blender/editors/space_node/node_edit.cc @@ -22,7 +22,7 @@ #include "BKE_image.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_node.hh" #include "BKE_node_runtime.hh" #include "BKE_node_tree_update.hh" diff --git a/source/blender/editors/space_node/node_shader_preview.cc b/source/blender/editors/space_node/node_shader_preview.cc index 27eabc1030a..6a7ba56a15e 100644 --- a/source/blender/editors/space_node/node_shader_preview.cc +++ b/source/blender/editors/space_node/node_shader_preview.cc @@ -38,7 +38,7 @@ #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_node.hh" #include "BKE_node_runtime.hh" #include "BKE_node_tree_update.hh" diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.cc b/source/blender/editors/space_outliner/outliner_dragdrop.cc index 34fcd092673..62239e0f962 100644 --- a/source/blender/editors/space_outliner/outliner_dragdrop.cc +++ b/source/blender/editors/space_outliner/outliner_dragdrop.cc @@ -25,7 +25,7 @@ #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_object.hh" #include "BKE_report.hh" diff --git a/source/blender/editors/util/ed_util.cc b/source/blender/editors/util/ed_util.cc index acfcb2fc415..b9f47425240 100644 --- a/source/blender/editors/util/ed_util.cc +++ b/source/blender/editors/util/ed_util.cc @@ -24,7 +24,7 @@ #include "BKE_lib_id.hh" #include "BKE_lib_remap.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_multires.hh" #include "BKE_object.hh" #include "BKE_packedFile.hh" diff --git a/source/blender/editors/uvedit/uvedit_ops.cc b/source/blender/editors/uvedit/uvedit_ops.cc index e6193ef49d3..fcaa80837f6 100644 --- a/source/blender/editors/uvedit/uvedit_ops.cc +++ b/source/blender/editors/uvedit/uvedit_ops.cc @@ -33,7 +33,7 @@ #include "BKE_customdata.hh" #include "BKE_editmesh.hh" #include "BKE_layer.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh_mapping.hh" #include "BKE_mesh_types.hh" #include "BKE_node.hh" diff --git a/source/blender/editors/uvedit/uvedit_select.cc b/source/blender/editors/uvedit/uvedit_select.cc index ff4ddd70a26..1d1b24041f8 100644 --- a/source/blender/editors/uvedit/uvedit_select.cc +++ b/source/blender/editors/uvedit/uvedit_select.cc @@ -40,7 +40,7 @@ #include "BKE_customdata.hh" #include "BKE_editmesh.hh" #include "BKE_layer.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_mapping.hh" #include "BKE_report.hh" diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h index 08421247262..7a99cf9d237 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h @@ -33,7 +33,7 @@ #include "render_types.h" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.h" #include "BKE_scene.hh" diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index 8010ffe3943..7b4aa962ac5 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -36,7 +36,7 @@ #include "BKE_layer.hh" #include "BKE_lib_id.hh" /* free_libblock */ #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_node.hh" #include "BKE_node_tree_update.hh" diff --git a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp index 246fdfc267b..8dbf360f709 100644 --- a/source/blender/freestyle/intern/python/BPy_Freestyle.cpp +++ b/source/blender/freestyle/intern/python/BPy_Freestyle.cpp @@ -44,6 +44,7 @@ #include "BKE_colorband.hh" /* BKE_colorband_evaluate() */ #include "BKE_colortools.hh" /* BKE_curvemapping_evaluateF() */ +#include "BKE_material.hh" /* ramp_blend() */ #ifdef __cplusplus extern "C" { @@ -138,8 +139,6 @@ static int ramp_blend_type(const char *type) return -1; } -#include "BKE_material.h" /* ramp_blend() */ - PyDoc_STRVAR( /* Wrap. */ Freestyle_blendRamp___doc__, diff --git a/source/blender/geometry/intern/realize_instances.cc b/source/blender/geometry/intern/realize_instances.cc index 49a50bd6cb5..60f975b1b15 100644 --- a/source/blender/geometry/intern/realize_instances.cc +++ b/source/blender/geometry/intern/realize_instances.cc @@ -17,7 +17,7 @@ #include "BKE_geometry_set_instances.hh" #include "BKE_grease_pencil.hh" #include "BKE_instances.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_pointcloud.hh" #include "BKE_type_conversions.hh" diff --git a/source/blender/gpu/intern/gpu_codegen.cc b/source/blender/gpu/intern/gpu_codegen.cc index 7e22f35b32d..5cccf067f0e 100644 --- a/source/blender/gpu/intern/gpu_codegen.cc +++ b/source/blender/gpu/intern/gpu_codegen.cc @@ -24,7 +24,7 @@ #include "BLI_utildefines.h" #include "BKE_cryptomatte.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "GPU_capabilities.hh" #include "GPU_context.hh" diff --git a/source/blender/gpu/intern/gpu_material.cc b/source/blender/gpu/intern/gpu_material.cc index 3cce4284a27..3cf27046521 100644 --- a/source/blender/gpu/intern/gpu_material.cc +++ b/source/blender/gpu/intern/gpu_material.cc @@ -25,7 +25,7 @@ #include "BLI_utildefines.h" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_node.hh" #include "NOD_shader.h" diff --git a/source/blender/io/alembic/exporter/abc_writer_mesh.cc b/source/blender/io/alembic/exporter/abc_writer_mesh.cc index 244a7964e54..a72506ee917 100644 --- a/source/blender/io/alembic/exporter/abc_writer_mesh.cc +++ b/source/blender/io/alembic/exporter/abc_writer_mesh.cc @@ -14,7 +14,7 @@ #include "BKE_attribute.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_object.hh" diff --git a/source/blender/io/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc index 29941d73295..311cbbbd6bc 100644 --- a/source/blender/io/alembic/intern/abc_reader_mesh.cc +++ b/source/blender/io/alembic/intern/abc_reader_mesh.cc @@ -29,7 +29,7 @@ #include "BKE_geometry_set.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_object.hh" diff --git a/source/blender/io/collada/BCAnimationCurve.h b/source/blender/io/collada/BCAnimationCurve.h index 5dd008ec7af..e4f7907ebdd 100644 --- a/source/blender/io/collada/BCAnimationCurve.h +++ b/source/blender/io/collada/BCAnimationCurve.h @@ -11,7 +11,7 @@ #include "BKE_armature.hh" #include "BKE_fcurve.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "ED_anim_api.hh" #include "ED_keyframes_edit.hh" diff --git a/source/blender/io/collada/BCAnimationSampler.cpp b/source/blender/io/collada/BCAnimationSampler.cpp index b3ace37eb01..8394f6a5905 100644 --- a/source/blender/io/collada/BCAnimationSampler.cpp +++ b/source/blender/io/collada/BCAnimationSampler.cpp @@ -17,7 +17,7 @@ #include "BKE_key.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BLI_listbase.h" diff --git a/source/blender/io/collada/DocumentExporter.cpp b/source/blender/io/collada/DocumentExporter.cpp index 82b24ea821e..bb6ee8c389c 100644 --- a/source/blender/io/collada/DocumentExporter.cpp +++ b/source/blender/io/collada/DocumentExporter.cpp @@ -76,7 +76,7 @@ #include "BKE_global.hh" #include "BKE_image.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_object.hh" #include "BKE_scene.hh" diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp index fb8e4fe6c47..0928e92eb41 100644 --- a/source/blender/io/collada/DocumentImporter.cpp +++ b/source/blender/io/collada/DocumentImporter.cpp @@ -47,7 +47,7 @@ #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_light.h" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_scene.hh" #include "BLI_path_utils.hh" diff --git a/source/blender/io/collada/EffectExporter.cpp b/source/blender/io/collada/EffectExporter.cpp index 356f77be6df..5cbd35dc026 100644 --- a/source/blender/io/collada/EffectExporter.cpp +++ b/source/blender/io/collada/EffectExporter.cpp @@ -24,7 +24,7 @@ #include "BKE_collection.hh" #include "BKE_customdata.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" static std::string getActiveUVLayerName(Object *ob) diff --git a/source/blender/io/collada/GeometryExporter.cpp b/source/blender/io/collada/GeometryExporter.cpp index 89c1fdad4e5..f05a83da68d 100644 --- a/source/blender/io/collada/GeometryExporter.cpp +++ b/source/blender/io/collada/GeometryExporter.cpp @@ -24,7 +24,7 @@ #include "BKE_customdata.hh" #include "BKE_global.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "collada_internal.h" diff --git a/source/blender/io/collada/InstanceWriter.cpp b/source/blender/io/collada/InstanceWriter.cpp index 9f66a19fb8d..da0b6d4e5f6 100644 --- a/source/blender/io/collada/InstanceWriter.cpp +++ b/source/blender/io/collada/InstanceWriter.cpp @@ -12,7 +12,7 @@ #include "COLLADASWInstanceMaterial.h" #include "BKE_customdata.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "DNA_mesh_types.h" diff --git a/source/blender/io/collada/MaterialExporter.h b/source/blender/io/collada/MaterialExporter.h index b917c0fd787..ee107345695 100644 --- a/source/blender/io/collada/MaterialExporter.h +++ b/source/blender/io/collada/MaterialExporter.h @@ -14,7 +14,7 @@ #include "COLLADASWLibraryMaterials.h" #include "COLLADASWStreamWriter.h" -#include "BKE_material.h" +#include "BKE_material.hh" #include "DNA_material_types.h" #include "DNA_object_types.h" diff --git a/source/blender/io/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp index 1b4732c8ee1..f4d5e388b72 100644 --- a/source/blender/io/collada/MeshImporter.cpp +++ b/source/blender/io/collada/MeshImporter.cpp @@ -23,7 +23,7 @@ #include "BKE_displist.h" #include "BKE_global.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_runtime.hh" #include "BKE_object.hh" diff --git a/source/blender/io/collada/collada_utils.cpp b/source/blender/io/collada/collada_utils.cpp index ecb94b12ab1..21efd16e733 100644 --- a/source/blender/io/collada/collada_utils.cpp +++ b/source/blender/io/collada/collada_utils.cpp @@ -41,7 +41,7 @@ #include "BKE_key.hh" #include "BKE_layer.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_legacy_convert.hh" #include "BKE_mesh_runtime.hh" diff --git a/source/blender/io/grease_pencil/intern/grease_pencil_io.cc b/source/blender/io/grease_pencil/intern/grease_pencil_io.cc index bb35737dbfa..850891fdeda 100644 --- a/source/blender/io/grease_pencil/intern/grease_pencil_io.cc +++ b/source/blender/io/grease_pencil/intern/grease_pencil_io.cc @@ -14,7 +14,7 @@ #include "BKE_curves.hh" #include "BKE_grease_pencil.hh" #include "BKE_layer.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_scene.hh" #include "DNA_grease_pencil_types.h" diff --git a/source/blender/io/grease_pencil/intern/grease_pencil_io_export_pdf.cc b/source/blender/io/grease_pencil/intern/grease_pencil_io_export_pdf.cc index eee0588f6eb..7ba716f5749 100644 --- a/source/blender/io/grease_pencil/intern/grease_pencil_io_export_pdf.cc +++ b/source/blender/io/grease_pencil/intern/grease_pencil_io_export_pdf.cc @@ -5,7 +5,7 @@ #include "BKE_attribute.hh" #include "BKE_curves.hh" #include "BKE_grease_pencil.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_scene.hh" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/io/grease_pencil/intern/grease_pencil_io_export_svg.cc b/source/blender/io/grease_pencil/intern/grease_pencil_io_export_svg.cc index f6ca3ca88e1..ce012740c2f 100644 --- a/source/blender/io/grease_pencil/intern/grease_pencil_io_export_svg.cc +++ b/source/blender/io/grease_pencil/intern/grease_pencil_io_export_svg.cc @@ -4,7 +4,7 @@ #include "BKE_attribute.hh" #include "BKE_curves.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BLI_color.hh" #include "BLI_math_matrix.hh" #include "BLI_offset_indices.hh" diff --git a/source/blender/io/usd/hydra/curves.cc b/source/blender/io/usd/hydra/curves.cc index 5e10dcc3f8b..62770c5989a 100644 --- a/source/blender/io/usd/hydra/curves.cc +++ b/source/blender/io/usd/hydra/curves.cc @@ -10,7 +10,7 @@ #include "BKE_attribute.hh" #include "BKE_curves.hh" #include "BKE_customdata.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_particle.h" #include "DEG_depsgraph_query.hh" diff --git a/source/blender/io/usd/hydra/material.cc b/source/blender/io/usd/hydra/material.cc index 137b0592d8b..aaaf3b8b55f 100644 --- a/source/blender/io/usd/hydra/material.cc +++ b/source/blender/io/usd/hydra/material.cc @@ -22,7 +22,7 @@ #include "MEM_guardedalloc.h" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "RNA_access.hh" #include "RNA_prototypes.hh" diff --git a/source/blender/io/usd/hydra/mesh.cc b/source/blender/io/usd/hydra/mesh.cc index 62b79269061..863c17b3cb2 100644 --- a/source/blender/io/usd/hydra/mesh.cc +++ b/source/blender/io/usd/hydra/mesh.cc @@ -12,7 +12,7 @@ #include "BKE_attribute.hh" #include "BKE_customdata.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_runtime.hh" diff --git a/source/blender/io/usd/hydra/volume.cc b/source/blender/io/usd/hydra/volume.cc index 06c372a9368..141aba5b771 100644 --- a/source/blender/io/usd/hydra/volume.cc +++ b/source/blender/io/usd/hydra/volume.cc @@ -9,7 +9,7 @@ #include #include -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_volume.hh" #include "BLI_index_range.hh" #include "DNA_volume_types.h" diff --git a/source/blender/io/usd/intern/usd_reader_material.cc b/source/blender/io/usd/intern/usd_reader_material.cc index d7fb580d72a..c077fe4e5e5 100644 --- a/source/blender/io/usd/intern/usd_reader_material.cc +++ b/source/blender/io/usd/intern/usd_reader_material.cc @@ -11,7 +11,7 @@ #include "BKE_image.hh" #include "BKE_lib_id.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_node.hh" #include "BKE_node_tree_update.hh" #include "BKE_report.hh" diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc index d7d140d406c..70bd0392ffe 100644 --- a/source/blender/io/usd/intern/usd_reader_mesh.cc +++ b/source/blender/io/usd/intern/usd_reader_mesh.cc @@ -18,7 +18,7 @@ #include "BKE_customdata.hh" #include "BKE_geometry_set.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_object.hh" #include "BKE_report.hh" diff --git a/source/blender/io/usd/intern/usd_writer_curves.cc b/source/blender/io/usd/intern/usd_writer_curves.cc index 442d6bb56e9..c1f9ee3756d 100644 --- a/source/blender/io/usd/intern/usd_writer_curves.cc +++ b/source/blender/io/usd/intern/usd_writer_curves.cc @@ -28,7 +28,7 @@ #include "BKE_curve_legacy_convert.hh" #include "BKE_curves.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_report.hh" #include "BLT_translation.hh" diff --git a/source/blender/io/usd/intern/usd_writer_mesh.cc b/source/blender/io/usd/intern/usd_writer_mesh.cc index 27053352281..5e1d423c8b0 100644 --- a/source/blender/io/usd/intern/usd_writer_mesh.cc +++ b/source/blender/io/usd/intern/usd_writer_mesh.cc @@ -22,7 +22,7 @@ #include "BKE_attribute.hh" #include "BKE_customdata.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_object.hh" diff --git a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc index daa6ef7001a..e84ff17fc20 100644 --- a/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc +++ b/source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc @@ -10,7 +10,7 @@ #include "BKE_customdata.hh" #include "BKE_deform.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_mapping.hh" #include "BKE_object.hh" diff --git a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc index 40e9bebf22c..d49f39c4af4 100644 --- a/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc +++ b/source/blender/io/wavefront_obj/importer/obj_import_mesh.cc @@ -13,7 +13,7 @@ #include "BKE_attribute.hh" #include "BKE_deform.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_node_tree_update.hh" #include "BKE_object.hh" diff --git a/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc b/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc index 21b51953584..5d62d1cda0c 100644 --- a/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc +++ b/source/blender/io/wavefront_obj/tests/obj_importer_tests.cc @@ -10,7 +10,7 @@ #include "BKE_curve.hh" #include "BKE_customdata.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_object.hh" #include "BKE_scene.hh" diff --git a/source/blender/makesrna/intern/rna_ID.cc b/source/blender/makesrna/intern/rna_ID.cc index c20428c1c05..ae7b944c60e 100644 --- a/source/blender/makesrna/intern/rna_ID.cc +++ b/source/blender/makesrna/intern/rna_ID.cc @@ -217,7 +217,7 @@ const IDFilterEnumPropertyItem rna_enum_id_type_filter_items[] = { # include "BKE_lib_query.hh" # include "BKE_lib_remap.hh" # include "BKE_library.hh" -# include "BKE_material.h" +# include "BKE_material.hh" # include "BKE_preview_image.hh" # include "BKE_vfont.hh" diff --git a/source/blender/makesrna/intern/rna_brush.cc b/source/blender/makesrna/intern/rna_brush.cc index 6b640e34aa8..4596e7ff067 100644 --- a/source/blender/makesrna/intern/rna_brush.cc +++ b/source/blender/makesrna/intern/rna_brush.cc @@ -391,7 +391,7 @@ static EnumPropertyItem rna_enum_gpencil_brush_modes_items[] = { # include "BKE_colorband.hh" # include "BKE_gpencil_legacy.h" # include "BKE_icons.h" -# include "BKE_material.h" +# include "BKE_material.hh" # include "BKE_paint.hh" # include "BKE_preview_image.hh" diff --git a/source/blender/makesrna/intern/rna_main_api.cc b/source/blender/makesrna/intern/rna_main_api.cc index b58f7211c8c..21bb6df6fb6 100644 --- a/source/blender/makesrna/intern/rna_main_api.cc +++ b/source/blender/makesrna/intern/rna_main_api.cc @@ -44,7 +44,7 @@ # include "BKE_lightprobe.h" # include "BKE_linestyle.h" # include "BKE_mask.h" -# include "BKE_material.h" +# include "BKE_material.hh" # include "BKE_mball.hh" # include "BKE_mesh.hh" # include "BKE_movieclip.h" diff --git a/source/blender/makesrna/intern/rna_material.cc b/source/blender/makesrna/intern/rna_material.cc index 8e746cc0231..bf22394a724 100644 --- a/source/blender/makesrna/intern/rna_material.cc +++ b/source/blender/makesrna/intern/rna_material.cc @@ -71,7 +71,7 @@ const EnumPropertyItem rna_enum_ramp_blend_items[] = { # include "BKE_gpencil_legacy.h" # include "BKE_grease_pencil.hh" # include "BKE_main.hh" -# include "BKE_material.h" +# include "BKE_material.hh" # include "BKE_node.hh" # include "BKE_paint.hh" # include "BKE_scene.hh" diff --git a/source/blender/makesrna/intern/rna_modifier.cc b/source/blender/makesrna/intern/rna_modifier.cc index 555f07af208..0037e484c26 100644 --- a/source/blender/makesrna/intern/rna_modifier.cc +++ b/source/blender/makesrna/intern/rna_modifier.cc @@ -865,7 +865,7 @@ static const EnumPropertyItem grease_pencil_build_time_mode_items[] = { # include "BKE_cachefile.hh" # include "BKE_context.hh" # include "BKE_deform.hh" -# include "BKE_material.h" +# include "BKE_material.hh" # include "BKE_mesh_runtime.hh" # include "BKE_modifier.hh" # include "BKE_object.hh" diff --git a/source/blender/makesrna/intern/rna_object.cc b/source/blender/makesrna/intern/rna_object.cc index 8013d346dc1..5097d3dd0c4 100644 --- a/source/blender/makesrna/intern/rna_object.cc +++ b/source/blender/makesrna/intern/rna_object.cc @@ -331,7 +331,7 @@ const EnumPropertyItem rna_enum_object_axis_items[] = { # include "BKE_global.hh" # include "BKE_key.hh" # include "BKE_light_linking.h" -# include "BKE_material.h" +# include "BKE_material.hh" # include "BKE_mesh.hh" # include "BKE_mesh_wrapper.hh" # include "BKE_modifier.hh" diff --git a/source/blender/makesrna/intern/rna_particle.cc b/source/blender/makesrna/intern/rna_particle.cc index 17274b33ff8..c138658798c 100644 --- a/source/blender/makesrna/intern/rna_particle.cc +++ b/source/blender/makesrna/intern/rna_particle.cc @@ -146,7 +146,7 @@ static const EnumPropertyItem part_fluid_type_items[] = { # include "BKE_customdata.hh" # include "BKE_deform.hh" # include "BKE_effect.h" -# include "BKE_material.h" +# include "BKE_material.hh" # include "BKE_modifier.hh" # include "BKE_particle.h" # include "BKE_pointcache.h" diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.cc b/source/blender/makesrna/intern/rna_sculpt_paint.cc index 46b7b113cd0..ae0c39d1f5d 100644 --- a/source/blender/makesrna/intern/rna_sculpt_paint.cc +++ b/source/blender/makesrna/intern/rna_sculpt_paint.cc @@ -25,7 +25,7 @@ #include "BKE_brush.hh" #include "BKE_layer.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_paint.hh" #include "ED_image.hh" diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc index d97db6d262e..eedac12937e 100644 --- a/source/blender/modifiers/intern/MOD_boolean.cc +++ b/source/blender/modifiers/intern/MOD_boolean.cc @@ -29,7 +29,7 @@ #include "BKE_global.hh" /* only to check G.debug */ #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_mesh_wrapper.hh" #include "BKE_modifier.hh" diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_armature.cc b/source/blender/modifiers/intern/MOD_grease_pencil_armature.cc index e35c1ecdc05..3b1f29bacf8 100644 --- a/source/blender/modifiers/intern/MOD_grease_pencil_armature.cc +++ b/source/blender/modifiers/intern/MOD_grease_pencil_armature.cc @@ -23,7 +23,7 @@ #include "BKE_geometry_set.hh" #include "BKE_grease_pencil.hh" #include "BKE_lib_query.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "BKE_screen.hh" diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_array.cc b/source/blender/modifiers/intern/MOD_grease_pencil_array.cc index f265ed155a4..b6a5fd15e2f 100644 --- a/source/blender/modifiers/intern/MOD_grease_pencil_array.cc +++ b/source/blender/modifiers/intern/MOD_grease_pencil_array.cc @@ -14,7 +14,7 @@ #include "BKE_grease_pencil.hh" #include "BKE_instances.hh" #include "BKE_lib_query.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "BKE_screen.hh" diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_color.cc b/source/blender/modifiers/intern/MOD_grease_pencil_color.cc index a6b133716f5..0e0f569db20 100644 --- a/source/blender/modifiers/intern/MOD_grease_pencil_color.cc +++ b/source/blender/modifiers/intern/MOD_grease_pencil_color.cc @@ -19,7 +19,7 @@ #include "BKE_curves.hh" #include "BKE_geometry_set.hh" #include "BKE_grease_pencil.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "BKE_screen.hh" diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_envelope.cc b/source/blender/modifiers/intern/MOD_grease_pencil_envelope.cc index 0e1e2615915..1e952a43728 100644 --- a/source/blender/modifiers/intern/MOD_grease_pencil_envelope.cc +++ b/source/blender/modifiers/intern/MOD_grease_pencil_envelope.cc @@ -17,7 +17,7 @@ #include "BKE_grease_pencil.hh" #include "BKE_instances.hh" #include "BKE_lib_query.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "BKE_screen.hh" diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_multiply.cc b/source/blender/modifiers/intern/MOD_grease_pencil_multiply.cc index 2d972449cb9..2d94a34c04d 100644 --- a/source/blender/modifiers/intern/MOD_grease_pencil_multiply.cc +++ b/source/blender/modifiers/intern/MOD_grease_pencil_multiply.cc @@ -21,7 +21,7 @@ #include "BKE_grease_pencil.hh" #include "BKE_instances.hh" #include "BKE_lib_query.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "BKE_screen.hh" diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_offset.cc b/source/blender/modifiers/intern/MOD_grease_pencil_offset.cc index 082344d8510..1175bfdf1d3 100644 --- a/source/blender/modifiers/intern/MOD_grease_pencil_offset.cc +++ b/source/blender/modifiers/intern/MOD_grease_pencil_offset.cc @@ -16,7 +16,7 @@ #include "BKE_curves.hh" #include "BKE_geometry_set.hh" #include "BKE_grease_pencil.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "BKE_screen.hh" diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_outline.cc b/source/blender/modifiers/intern/MOD_grease_pencil_outline.cc index 00f81516374..a804ba11aa2 100644 --- a/source/blender/modifiers/intern/MOD_grease_pencil_outline.cc +++ b/source/blender/modifiers/intern/MOD_grease_pencil_outline.cc @@ -7,7 +7,7 @@ */ #include "BKE_attribute.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BLI_array_utils.hh" #include "BLI_enumerable_thread_specific.hh" #include "BLI_index_range.hh" diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_shrinkwrap.cc b/source/blender/modifiers/intern/MOD_grease_pencil_shrinkwrap.cc index 5f7205b0e25..2027c5be26b 100644 --- a/source/blender/modifiers/intern/MOD_grease_pencil_shrinkwrap.cc +++ b/source/blender/modifiers/intern/MOD_grease_pencil_shrinkwrap.cc @@ -7,7 +7,7 @@ */ #include "BKE_attribute.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "DNA_defaults.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_tint.cc b/source/blender/modifiers/intern/MOD_grease_pencil_tint.cc index 0c662e60f69..3113ce8b7a6 100644 --- a/source/blender/modifiers/intern/MOD_grease_pencil_tint.cc +++ b/source/blender/modifiers/intern/MOD_grease_pencil_tint.cc @@ -20,7 +20,7 @@ #include "BKE_geometry_set.hh" #include "BKE_grease_pencil.hh" #include "BKE_lib_query.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "BKE_screen.hh" diff --git a/source/blender/modifiers/intern/MOD_grease_pencil_util.cc b/source/blender/modifiers/intern/MOD_grease_pencil_util.cc index 49535ef6dc3..ce7c880c6a5 100644 --- a/source/blender/modifiers/intern/MOD_grease_pencil_util.cc +++ b/source/blender/modifiers/intern/MOD_grease_pencil_util.cc @@ -20,7 +20,7 @@ #include "BKE_curves.hh" #include "BKE_grease_pencil.hh" #include "BKE_lib_query.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BLT_translation.hh" diff --git a/source/blender/modifiers/intern/MOD_lineart.cc b/source/blender/modifiers/intern/MOD_lineart.cc index a32e962b4cd..c36dcf229ff 100644 --- a/source/blender/modifiers/intern/MOD_lineart.cc +++ b/source/blender/modifiers/intern/MOD_lineart.cc @@ -20,7 +20,7 @@ #include "BKE_global.hh" #include "BKE_grease_pencil.hh" #include "BKE_lib_query.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "UI_interface.hh" diff --git a/source/blender/modifiers/intern/lineart/lineart_cpu.cc b/source/blender/modifiers/intern/lineart/lineart_cpu.cc index 42d612575f3..081385398d8 100644 --- a/source/blender/modifiers/intern/lineart/lineart_cpu.cc +++ b/source/blender/modifiers/intern/lineart/lineart_cpu.cc @@ -37,7 +37,7 @@ #include "BKE_grease_pencil.hh" #include "BKE_grease_pencil_legacy_convert.hh" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_object.hh" #include "BKE_scene.hh" diff --git a/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc b/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc index e64b31c73cb..aa07955f55f 100644 --- a/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc +++ b/source/blender/nodes/composite/nodes/node_composite_mixrgb.cc @@ -14,7 +14,7 @@ #include "DNA_material_types.h" -#include "BKE_material.h" +#include "BKE_material.hh" #include "GPU_material.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc index 1093590e797..2ed84629ddc 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_convex_hull.cc @@ -7,7 +7,7 @@ #include "BKE_curves.hh" #include "BKE_grease_pencil.hh" #include "BKE_instances.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "GEO_randomize.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_grid_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_grid_to_mesh.cc index a30a2e02522..9f4a414a319 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_grid_to_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_grid_to_mesh.cc @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.h" #include "BKE_volume_grid.hh" #include "BKE_volume_to_mesh.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc index 38958480d37..8e5f7b3c92f 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_circle.cc @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "NOD_rna_define.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc index 95340f5d8d6..6ab7c601e2a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cone.cc @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "NOD_rna_define.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc index 0eb272f4a43..7e6d4f7a508 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cube.cc @@ -4,7 +4,7 @@ #include "BLI_math_euler.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "GEO_mesh_primitive_cuboid.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc index a6fb9154f43..15f18f57a9b 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_cylinder.cc @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "BKE_material.h" +#include "BKE_material.hh" #include "NOD_rna_define.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc index 296c7574635..a2804a48bd8 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_grid.cc @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "BKE_material.h" +#include "BKE_material.hh" #include "GEO_mesh_primitive_grid.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc index 98f1f1e0473..7da5a0241b7 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_ico_sphere.cc @@ -5,7 +5,7 @@ #include "DNA_mesh_types.h" #include "BKE_lib_id.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "GEO_randomize.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc index 559404d147a..7a0524bbd7a 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_line.cc @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "BKE_material.h" +#include "BKE_material.hh" #include "NOD_rna_define.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc index bceafa1381f..c45508ce0c2 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_mesh_primitive_uv_sphere.cc @@ -2,7 +2,7 @@ * * SPDX-License-Identifier: GPL-2.0-or-later */ -#include "BKE_material.h" +#include "BKE_material.hh" #include "GEO_mesh_primitive_uv_sphere.hh" diff --git a/source/blender/nodes/geometry/nodes/node_geo_set_material.cc b/source/blender/nodes/geometry/nodes/node_geo_set_material.cc index e4c3936fbf4..bed7a20e6ff 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_set_material.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_set_material.cc @@ -12,7 +12,7 @@ #include "BKE_curves.hh" #include "BKE_grease_pencil.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" namespace blender::nodes::node_geo_set_material_cc { diff --git a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc index 21410479ba8..14be9bc0f8e 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_volume_to_mesh.cc @@ -9,7 +9,7 @@ #include "node_geometry_util.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_mesh.hh" #include "BKE_volume.hh" #include "BKE_volume_grid.hh" diff --git a/source/blender/nodes/shader/node_shader_tree.cc b/source/blender/nodes/shader/node_shader_tree.cc index 66478957cd9..c0a769004ee 100644 --- a/source/blender/nodes/shader/node_shader_tree.cc +++ b/source/blender/nodes/shader/node_shader_tree.cc @@ -31,7 +31,7 @@ #include "BKE_layer.hh" #include "BKE_lib_id.hh" #include "BKE_linestyle.h" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_node.hh" #include "BKE_node_runtime.hh" #include "BKE_node_tree_update.hh" diff --git a/source/blender/nodes/shader/nodes/node_shader_mix.cc b/source/blender/nodes/shader/nodes/node_shader_mix.cc index e6b46ed7de5..bb5d57a0709 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mix.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mix.cc @@ -8,7 +8,7 @@ #include -#include "BKE_material.h" +#include "BKE_material.hh" #include "BLI_math_quaternion.hh" #include "BLI_math_vector.h" diff --git a/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc b/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc index 5f916ab697f..1417b5bdf27 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc +++ b/source/blender/nodes/shader/nodes/node_shader_mix_rgb.cc @@ -9,7 +9,7 @@ #include "node_shader_util.hh" #include "node_util.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BLI_math_vector.h" diff --git a/source/blender/nodes/texture/nodes/node_texture_bricks.cc b/source/blender/nodes/texture/nodes/node_texture_bricks.cc index 82b5a553f71..c925b597024 100644 --- a/source/blender/nodes/texture/nodes/node_texture_bricks.cc +++ b/source/blender/nodes/texture/nodes/node_texture_bricks.cc @@ -6,7 +6,7 @@ * \ingroup texnodes */ -#include "BKE_material.h" +#include "BKE_material.hh" #include "BLI_math_vector.h" #include "DNA_material_types.h" #include "node_texture_util.hh" diff --git a/source/blender/nodes/texture/nodes/node_texture_mixRgb.cc b/source/blender/nodes/texture/nodes/node_texture_mixRgb.cc index 86d8bd366f0..50ae3a82757 100644 --- a/source/blender/nodes/texture/nodes/node_texture_mixRgb.cc +++ b/source/blender/nodes/texture/nodes/node_texture_mixRgb.cc @@ -9,7 +9,7 @@ #include "node_texture_util.hh" #include "node_util.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BLI_math_vector.h" diff --git a/source/blender/nodes/texture/nodes/node_texture_proc.cc b/source/blender/nodes/texture/nodes/node_texture_proc.cc index 98efa0edd9f..30593984335 100644 --- a/source/blender/nodes/texture/nodes/node_texture_proc.cc +++ b/source/blender/nodes/texture/nodes/node_texture_proc.cc @@ -6,7 +6,7 @@ * \ingroup texnodes */ -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_texture.h" #include "BLI_math_vector.h" #include "DNA_material_types.h" diff --git a/source/blender/nodes/texture/nodes/node_texture_texture.cc b/source/blender/nodes/texture/nodes/node_texture_texture.cc index d377339fe6a..cc0e2946656 100644 --- a/source/blender/nodes/texture/nodes/node_texture_texture.cc +++ b/source/blender/nodes/texture/nodes/node_texture_texture.cc @@ -8,7 +8,7 @@ #include "node_texture_util.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_node_runtime.hh" #include "BLI_math_vector.h" diff --git a/source/blender/windowmanager/intern/wm_files_link.cc b/source/blender/windowmanager/intern/wm_files_link.cc index 1678f854d13..d870587a963 100644 --- a/source/blender/windowmanager/intern/wm_files_link.cc +++ b/source/blender/windowmanager/intern/wm_files_link.cc @@ -38,7 +38,7 @@ #include "BKE_lib_query.hh" #include "BKE_lib_remap.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_object.hh" #include "BKE_report.hh" #include "BKE_rigidbody.h" diff --git a/source/blender/windowmanager/intern/wm_init_exit.cc b/source/blender/windowmanager/intern/wm_init_exit.cc index 2de8dc457e2..771caa21ba5 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.cc +++ b/source/blender/windowmanager/intern/wm_init_exit.cc @@ -52,8 +52,8 @@ #include "BKE_addon.h" #include "BKE_appdir.hh" #include "BKE_blender_cli_command.hh" -#include "BKE_mask.h" /* Free mask clipboard. */ -#include "BKE_material.h" /* #BKE_material_copybuf_clear. */ +#include "BKE_mask.h" /* Free mask clipboard. */ +#include "BKE_material.hh" /* #BKE_material_copybuf_clear. */ #include "BKE_studiolight.h" #include "BKE_subdiv.hh" #include "BKE_tracking.h" /* Free tracking clipboard. */ diff --git a/source/blender/windowmanager/intern/wm_operators.cc b/source/blender/windowmanager/intern/wm_operators.cc index 05115467270..c910ff90493 100644 --- a/source/blender/windowmanager/intern/wm_operators.cc +++ b/source/blender/windowmanager/intern/wm_operators.cc @@ -57,7 +57,7 @@ #include "BKE_lib_id.hh" #include "BKE_lib_query.hh" #include "BKE_main.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_preview_image.hh" #include "BKE_report.hh" #include "BKE_scene.hh" diff --git a/source/creator/creator.cc b/source/creator/creator.cc index ce46aeaa83b..8466247fff6 100644 --- a/source/creator/creator.cc +++ b/source/creator/creator.cc @@ -44,7 +44,7 @@ #include "BKE_cpp_types.hh" #include "BKE_global.hh" #include "BKE_idtype.hh" -#include "BKE_material.h" +#include "BKE_material.hh" #include "BKE_modifier.hh" #include "BKE_node.hh" #include "BKE_particle.h"