diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt index f6b4fd5e5c2..8cbf8a52836 100644 --- a/source/blender/draw/CMakeLists.txt +++ b/source/blender/draw/CMakeLists.txt @@ -144,10 +144,10 @@ set(SRC engines/select/select_engine.cc engines/select/select_instance.cc engines/overlay/overlay_armature.cc - engines/overlay/overlay_next_engine.cc - engines/overlay/overlay_next_instance.cc - engines/overlay/overlay_next_shader.cc - engines/overlay/overlay_next_shape.cc + engines/overlay/overlay_engine.cc + engines/overlay/overlay_instance.cc + engines/overlay/overlay_shader.cc + engines/overlay/overlay_shape.cc DRW_engine.hh DRW_pbvh.hh @@ -239,48 +239,47 @@ set(SRC engines/image/image_texture_info.hh engines/image/image_usage.hh engines/overlay/overlay_engine.h - engines/overlay/overlay_next_antialiasing.hh - engines/overlay/overlay_next_armature.hh - engines/overlay/overlay_next_attribute_text.hh - engines/overlay/overlay_next_attribute_viewer.hh - engines/overlay/overlay_next_axes.hh - engines/overlay/overlay_next_background.hh - engines/overlay/overlay_next_base.hh - engines/overlay/overlay_next_bounds.hh - engines/overlay/overlay_next_camera.hh - engines/overlay/overlay_next_cursor.hh - engines/overlay/overlay_next_curve.hh - engines/overlay/overlay_next_edit_text.hh - engines/overlay/overlay_next_empty.hh - engines/overlay/overlay_next_facing.hh - engines/overlay/overlay_next_fade.hh - engines/overlay/overlay_next_fluid.hh - engines/overlay/overlay_next_force_field.hh - engines/overlay/overlay_next_grease_pencil.hh - engines/overlay/overlay_next_grid.hh - engines/overlay/overlay_next_image.hh - engines/overlay/overlay_next_instance.hh - engines/overlay/overlay_next_lattice.hh - engines/overlay/overlay_next_light.hh - engines/overlay/overlay_next_lightprobe.hh - engines/overlay/overlay_next_mesh.hh - engines/overlay/overlay_next_metaball.hh - engines/overlay/overlay_next_mode_transfer.hh - engines/overlay/overlay_next_motion_path.hh - engines/overlay/overlay_next_name.hh - engines/overlay/overlay_next_origin.hh - engines/overlay/overlay_next_outline.hh - engines/overlay/overlay_next_paint.hh - engines/overlay/overlay_next_particle.hh - engines/overlay/overlay_next_pointcloud.hh - engines/overlay/overlay_next_prepass.hh - engines/overlay/overlay_next_private.hh - engines/overlay/overlay_next_relation.hh - engines/overlay/overlay_next_sculpt.hh - engines/overlay/overlay_next_speaker.hh - engines/overlay/overlay_next_wireframe.hh - engines/overlay/overlay_next_xray_fade.hh + engines/overlay/overlay_antialiasing.hh + engines/overlay/overlay_armature.hh + engines/overlay/overlay_attribute_text.hh + engines/overlay/overlay_attribute_viewer.hh + engines/overlay/overlay_axes.hh + engines/overlay/overlay_background.hh + engines/overlay/overlay_base.hh + engines/overlay/overlay_bounds.hh + engines/overlay/overlay_camera.hh + engines/overlay/overlay_cursor.hh + engines/overlay/overlay_curve.hh + engines/overlay/overlay_edit_text.hh + engines/overlay/overlay_empty.hh + engines/overlay/overlay_facing.hh + engines/overlay/overlay_fade.hh + engines/overlay/overlay_fluid.hh + engines/overlay/overlay_force_field.hh + engines/overlay/overlay_grease_pencil.hh + engines/overlay/overlay_grid.hh + engines/overlay/overlay_image.hh + engines/overlay/overlay_instance.hh + engines/overlay/overlay_lattice.hh + engines/overlay/overlay_light.hh + engines/overlay/overlay_lightprobe.hh + engines/overlay/overlay_mesh.hh + engines/overlay/overlay_metaball.hh + engines/overlay/overlay_mode_transfer.hh + engines/overlay/overlay_motion_path.hh + engines/overlay/overlay_name.hh + engines/overlay/overlay_origin.hh + engines/overlay/overlay_outline.hh + engines/overlay/overlay_paint.hh + engines/overlay/overlay_particle.hh + engines/overlay/overlay_pointcloud.hh + engines/overlay/overlay_prepass.hh engines/overlay/overlay_private.hh + engines/overlay/overlay_relation.hh + engines/overlay/overlay_sculpt.hh + engines/overlay/overlay_speaker.hh + engines/overlay/overlay_wireframe.hh + engines/overlay/overlay_xray_fade.hh engines/select/select_defines.hh engines/select/select_engine.hh engines/select/select_instance.hh diff --git a/source/blender/draw/engines/overlay/overlay_next_antialiasing.hh b/source/blender/draw/engines/overlay/overlay_antialiasing.hh similarity index 98% rename from source/blender/draw/engines/overlay/overlay_next_antialiasing.hh rename to source/blender/draw/engines/overlay/overlay_antialiasing.hh index 94d0c3a9486..33d6dabdd1e 100644 --- a/source/blender/draw/engines/overlay/overlay_next_antialiasing.hh +++ b/source/blender/draw/engines/overlay/overlay_antialiasing.hh @@ -42,7 +42,7 @@ #pragma once -#include "overlay_next_base.hh" +#include "overlay_base.hh" #include "DNA_userdef_types.h" diff --git a/source/blender/draw/engines/overlay/overlay_armature.cc b/source/blender/draw/engines/overlay/overlay_armature.cc index 1483b77205d..adb5ec5445e 100644 --- a/source/blender/draw/engines/overlay/overlay_armature.cc +++ b/source/blender/draw/engines/overlay/overlay_armature.cc @@ -45,7 +45,7 @@ #include "draw_context_private.hh" #include "draw_manager_text.hh" -#include "overlay_next_armature.hh" +#include "overlay_armature.hh" #include "draw_cache_impl.hh" diff --git a/source/blender/draw/engines/overlay/overlay_next_armature.hh b/source/blender/draw/engines/overlay/overlay_armature.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_armature.hh rename to source/blender/draw/engines/overlay/overlay_armature.hh index ea2545b2887..bb796a06c4a 100644 --- a/source/blender/draw/engines/overlay/overlay_next_armature.hh +++ b/source/blender/draw/engines/overlay/overlay_armature.hh @@ -14,7 +14,7 @@ #include "DRW_render.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" #include "overlay_shader_shared.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_attribute_text.hh b/source/blender/draw/engines/overlay/overlay_attribute_text.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_attribute_text.hh rename to source/blender/draw/engines/overlay/overlay_attribute_text.hh index 3ebb92f6ffc..5360b39018e 100644 --- a/source/blender/draw/engines/overlay/overlay_next_attribute_text.hh +++ b/source/blender/draw/engines/overlay/overlay_attribute_text.hh @@ -26,7 +26,7 @@ #include "draw_manager_text.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_attribute_viewer.hh b/source/blender/draw/engines/overlay/overlay_attribute_viewer.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_attribute_viewer.hh rename to source/blender/draw/engines/overlay/overlay_attribute_viewer.hh index 0e019d9111e..cd42e69754a 100644 --- a/source/blender/draw/engines/overlay/overlay_next_attribute_viewer.hh +++ b/source/blender/draw/engines/overlay/overlay_attribute_viewer.hh @@ -16,7 +16,7 @@ #include "draw_cache.hh" #include "draw_cache_impl.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_axes.hh b/source/blender/draw/engines/overlay/overlay_axes.hh similarity index 98% rename from source/blender/draw/engines/overlay/overlay_next_axes.hh rename to source/blender/draw/engines/overlay/overlay_axes.hh index d7de3148bf3..eb9139f227e 100644 --- a/source/blender/draw/engines/overlay/overlay_next_axes.hh +++ b/source/blender/draw/engines/overlay/overlay_axes.hh @@ -10,7 +10,7 @@ #pragma once -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_background.hh b/source/blender/draw/engines/overlay/overlay_background.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_background.hh rename to source/blender/draw/engines/overlay/overlay_background.hh index f229313e571..f45dedbef9d 100644 --- a/source/blender/draw/engines/overlay/overlay_next_background.hh +++ b/source/blender/draw/engines/overlay/overlay_background.hh @@ -12,7 +12,7 @@ #include "draw_cache.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_base.hh b/source/blender/draw/engines/overlay/overlay_base.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_base.hh rename to source/blender/draw/engines/overlay/overlay_base.hh index 8ab1f744e4c..ae0609a4453 100644 --- a/source/blender/draw/engines/overlay/overlay_next_base.hh +++ b/source/blender/draw/engines/overlay/overlay_base.hh @@ -8,7 +8,7 @@ #pragma once -#include "overlay_next_private.hh" +#include "overlay_private.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_bounds.hh b/source/blender/draw/engines/overlay/overlay_bounds.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_bounds.hh rename to source/blender/draw/engines/overlay/overlay_bounds.hh index 4724b88983a..175d523b8fe 100644 --- a/source/blender/draw/engines/overlay/overlay_next_bounds.hh +++ b/source/blender/draw/engines/overlay/overlay_bounds.hh @@ -15,7 +15,7 @@ #include "DNA_rigidbody_types.h" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_camera.hh b/source/blender/draw/engines/overlay/overlay_camera.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_camera.hh rename to source/blender/draw/engines/overlay/overlay_camera.hh index 23a4a6209b2..b8558a6daad 100644 --- a/source/blender/draw/engines/overlay/overlay_next_camera.hh +++ b/source/blender/draw/engines/overlay/overlay_camera.hh @@ -17,8 +17,8 @@ #include "ED_view3d.hh" #include "draw_manager_text.hh" -#include "overlay_next_base.hh" -#include "overlay_next_empty.hh" +#include "overlay_base.hh" +#include "overlay_empty.hh" namespace blender::draw::overlay { struct CameraInstanceData : public ExtraInstanceData { diff --git a/source/blender/draw/engines/overlay/overlay_next_cursor.hh b/source/blender/draw/engines/overlay/overlay_cursor.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_cursor.hh rename to source/blender/draw/engines/overlay/overlay_cursor.hh index 5cf5217a55f..1940e1dfdc4 100644 --- a/source/blender/draw/engines/overlay/overlay_next_cursor.hh +++ b/source/blender/draw/engines/overlay/overlay_cursor.hh @@ -16,7 +16,7 @@ #include "ED_view3d.hh" #include "UI_view2d.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_curve.hh b/source/blender/draw/engines/overlay/overlay_curve.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_curve.hh rename to source/blender/draw/engines/overlay/overlay_curve.hh index 9944489ae23..7da517e2004 100644 --- a/source/blender/draw/engines/overlay/overlay_next_curve.hh +++ b/source/blender/draw/engines/overlay/overlay_curve.hh @@ -17,7 +17,7 @@ #include "draw_cache.hh" #include "draw_cache_impl.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_edit_text.hh b/source/blender/draw/engines/overlay/overlay_edit_text.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_edit_text.hh rename to source/blender/draw/engines/overlay/overlay_edit_text.hh index da7b6c150f0..b75088ef94e 100644 --- a/source/blender/draw/engines/overlay/overlay_next_edit_text.hh +++ b/source/blender/draw/engines/overlay/overlay_edit_text.hh @@ -11,7 +11,7 @@ #include "BKE_vfont.hh" #include "BLI_math_matrix.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_empty.hh b/source/blender/draw/engines/overlay/overlay_empty.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_empty.hh rename to source/blender/draw/engines/overlay/overlay_empty.hh index 7052ad87281..ba07dc037a7 100644 --- a/source/blender/draw/engines/overlay/overlay_next_empty.hh +++ b/source/blender/draw/engines/overlay/overlay_empty.hh @@ -9,8 +9,8 @@ #pragma once #include "DRW_render.hh" -#include "overlay_next_base.hh" -#include "overlay_next_image.hh" +#include "overlay_base.hh" +#include "overlay_image.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_engine.cc b/source/blender/draw/engines/overlay/overlay_engine.cc similarity index 92% rename from source/blender/draw/engines/overlay/overlay_next_engine.cc rename to source/blender/draw/engines/overlay/overlay_engine.cc index 32d57bee35a..95203ac1c2a 100644 --- a/source/blender/draw/engines/overlay/overlay_next_engine.cc +++ b/source/blender/draw/engines/overlay/overlay_engine.cc @@ -8,7 +8,7 @@ * Engine for drawing a selection map where the pixels indicate the selection indices. */ -#include "overlay_next_instance.hh" +#include "overlay_instance.hh" #include "overlay_engine.h" diff --git a/source/blender/draw/engines/overlay/overlay_next_facing.hh b/source/blender/draw/engines/overlay/overlay_facing.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_facing.hh rename to source/blender/draw/engines/overlay/overlay_facing.hh index d6d0e7d99fa..61f5e75dae7 100644 --- a/source/blender/draw/engines/overlay/overlay_next_facing.hh +++ b/source/blender/draw/engines/overlay/overlay_facing.hh @@ -12,7 +12,7 @@ #include "draw_sculpt.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_fade.hh b/source/blender/draw/engines/overlay/overlay_fade.hh similarity index 98% rename from source/blender/draw/engines/overlay/overlay_next_fade.hh rename to source/blender/draw/engines/overlay/overlay_fade.hh index 911b2c595a1..f5b901fecba 100644 --- a/source/blender/draw/engines/overlay/overlay_next_fade.hh +++ b/source/blender/draw/engines/overlay/overlay_fade.hh @@ -11,8 +11,8 @@ #include "BKE_modifier.hh" #include "BKE_paint.hh" -#include "overlay_next_armature.hh" -#include "overlay_next_base.hh" +#include "overlay_armature.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_fluid.hh b/source/blender/draw/engines/overlay/overlay_fluid.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_fluid.hh rename to source/blender/draw/engines/overlay/overlay_fluid.hh index 6fb7d984669..dbf7f80172f 100644 --- a/source/blender/draw/engines/overlay/overlay_next_fluid.hh +++ b/source/blender/draw/engines/overlay/overlay_fluid.hh @@ -13,7 +13,7 @@ #include "BKE_modifier.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_force_field.hh b/source/blender/draw/engines/overlay/overlay_force_field.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_force_field.hh rename to source/blender/draw/engines/overlay/overlay_force_field.hh index 819a822f0b5..c97146f7d85 100644 --- a/source/blender/draw/engines/overlay/overlay_next_force_field.hh +++ b/source/blender/draw/engines/overlay/overlay_force_field.hh @@ -14,7 +14,7 @@ #include "DNA_object_force_types.h" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_grease_pencil.hh b/source/blender/draw/engines/overlay/overlay_grease_pencil.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_grease_pencil.hh rename to source/blender/draw/engines/overlay/overlay_grease_pencil.hh index 53f9c3166f9..6e59a10d8c7 100644 --- a/source/blender/draw/engines/overlay/overlay_next_grease_pencil.hh +++ b/source/blender/draw/engines/overlay/overlay_grease_pencil.hh @@ -24,7 +24,7 @@ #include "draw_cache.hh" #include "draw_manager_text.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_grid.hh b/source/blender/draw/engines/overlay/overlay_grid.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_grid.hh rename to source/blender/draw/engines/overlay/overlay_grid.hh index 67a5c176b69..80930034401 100644 --- a/source/blender/draw/engines/overlay/overlay_next_grid.hh +++ b/source/blender/draw/engines/overlay/overlay_grid.hh @@ -19,7 +19,7 @@ #include "GPU_texture.hh" #include "draw_shader_shared.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_image.hh b/source/blender/draw/engines/overlay/overlay_image.hh similarity index 100% rename from source/blender/draw/engines/overlay/overlay_next_image.hh rename to source/blender/draw/engines/overlay/overlay_image.hh diff --git a/source/blender/draw/engines/overlay/overlay_next_instance.cc b/source/blender/draw/engines/overlay/overlay_instance.cc similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_instance.cc rename to source/blender/draw/engines/overlay/overlay_instance.cc index cb31cd71738..f9dc9012271 100644 --- a/source/blender/draw/engines/overlay/overlay_next_instance.cc +++ b/source/blender/draw/engines/overlay/overlay_instance.cc @@ -14,7 +14,7 @@ #include "BKE_paint.hh" #include "draw_debug.hh" -#include "overlay_next_instance.hh" +#include "overlay_instance.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_instance.hh b/source/blender/draw/engines/overlay/overlay_instance.hh similarity index 72% rename from source/blender/draw/engines/overlay/overlay_next_instance.hh rename to source/blender/draw/engines/overlay/overlay_instance.hh index f8ebc1cd2d6..e5c0dfd5899 100644 --- a/source/blender/draw/engines/overlay/overlay_next_instance.hh +++ b/source/blender/draw/engines/overlay/overlay_instance.hh @@ -8,45 +8,45 @@ #pragma once -#include "overlay_next_private.hh" +#include "overlay_private.hh" -#include "overlay_next_antialiasing.hh" -#include "overlay_next_armature.hh" -#include "overlay_next_attribute_text.hh" -#include "overlay_next_attribute_viewer.hh" -#include "overlay_next_axes.hh" -#include "overlay_next_background.hh" -#include "overlay_next_bounds.hh" -#include "overlay_next_camera.hh" -#include "overlay_next_cursor.hh" -#include "overlay_next_curve.hh" -#include "overlay_next_edit_text.hh" -#include "overlay_next_empty.hh" -#include "overlay_next_facing.hh" -#include "overlay_next_fade.hh" -#include "overlay_next_fluid.hh" -#include "overlay_next_force_field.hh" -#include "overlay_next_grease_pencil.hh" -#include "overlay_next_grid.hh" -#include "overlay_next_lattice.hh" -#include "overlay_next_light.hh" -#include "overlay_next_lightprobe.hh" -#include "overlay_next_mesh.hh" -#include "overlay_next_metaball.hh" -#include "overlay_next_mode_transfer.hh" -#include "overlay_next_motion_path.hh" -#include "overlay_next_name.hh" -#include "overlay_next_origin.hh" -#include "overlay_next_outline.hh" -#include "overlay_next_paint.hh" -#include "overlay_next_particle.hh" -#include "overlay_next_pointcloud.hh" -#include "overlay_next_prepass.hh" -#include "overlay_next_relation.hh" -#include "overlay_next_sculpt.hh" -#include "overlay_next_speaker.hh" -#include "overlay_next_wireframe.hh" -#include "overlay_next_xray_fade.hh" +#include "overlay_antialiasing.hh" +#include "overlay_armature.hh" +#include "overlay_attribute_text.hh" +#include "overlay_attribute_viewer.hh" +#include "overlay_axes.hh" +#include "overlay_background.hh" +#include "overlay_bounds.hh" +#include "overlay_camera.hh" +#include "overlay_cursor.hh" +#include "overlay_curve.hh" +#include "overlay_edit_text.hh" +#include "overlay_empty.hh" +#include "overlay_facing.hh" +#include "overlay_fade.hh" +#include "overlay_fluid.hh" +#include "overlay_force_field.hh" +#include "overlay_grease_pencil.hh" +#include "overlay_grid.hh" +#include "overlay_lattice.hh" +#include "overlay_light.hh" +#include "overlay_lightprobe.hh" +#include "overlay_mesh.hh" +#include "overlay_metaball.hh" +#include "overlay_mode_transfer.hh" +#include "overlay_motion_path.hh" +#include "overlay_name.hh" +#include "overlay_origin.hh" +#include "overlay_outline.hh" +#include "overlay_paint.hh" +#include "overlay_particle.hh" +#include "overlay_pointcloud.hh" +#include "overlay_prepass.hh" +#include "overlay_relation.hh" +#include "overlay_sculpt.hh" +#include "overlay_speaker.hh" +#include "overlay_wireframe.hh" +#include "overlay_xray_fade.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_lattice.hh b/source/blender/draw/engines/overlay/overlay_lattice.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_lattice.hh rename to source/blender/draw/engines/overlay/overlay_lattice.hh index 5c225c3274c..48f622411c7 100644 --- a/source/blender/draw/engines/overlay/overlay_next_lattice.hh +++ b/source/blender/draw/engines/overlay/overlay_lattice.hh @@ -11,7 +11,7 @@ #include "draw_cache.hh" #include "draw_cache_impl.hh" #include "draw_common_c.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_light.hh b/source/blender/draw/engines/overlay/overlay_light.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_light.hh rename to source/blender/draw/engines/overlay/overlay_light.hh index f8eed94a342..5841963b812 100644 --- a/source/blender/draw/engines/overlay/overlay_next_light.hh +++ b/source/blender/draw/engines/overlay/overlay_light.hh @@ -12,7 +12,7 @@ #include "BLI_math_matrix.h" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_lightprobe.hh b/source/blender/draw/engines/overlay/overlay_lightprobe.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_lightprobe.hh rename to source/blender/draw/engines/overlay/overlay_lightprobe.hh index 32ca505507b..952c8b40700 100644 --- a/source/blender/draw/engines/overlay/overlay_next_lightprobe.hh +++ b/source/blender/draw/engines/overlay/overlay_lightprobe.hh @@ -10,7 +10,7 @@ #include "DNA_lightprobe_types.h" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_mesh.hh b/source/blender/draw/engines/overlay/overlay_mesh.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_mesh.hh rename to source/blender/draw/engines/overlay/overlay_mesh.hh index 890538488c8..3581436d0fa 100644 --- a/source/blender/draw/engines/overlay/overlay_next_mesh.hh +++ b/source/blender/draw/engines/overlay/overlay_mesh.hh @@ -31,7 +31,7 @@ #include "draw_cache.hh" #include "draw_cache_impl.hh" #include "draw_manager_text.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_metaball.hh b/source/blender/draw/engines/overlay/overlay_metaball.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_metaball.hh rename to source/blender/draw/engines/overlay/overlay_metaball.hh index 53cf38c0d07..6c9cb7e2a4d 100644 --- a/source/blender/draw/engines/overlay/overlay_next_metaball.hh +++ b/source/blender/draw/engines/overlay/overlay_metaball.hh @@ -10,7 +10,7 @@ #include "ED_mball.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_mode_transfer.hh b/source/blender/draw/engines/overlay/overlay_mode_transfer.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_mode_transfer.hh rename to source/blender/draw/engines/overlay/overlay_mode_transfer.hh index c17fbf670c2..30e75bc344f 100644 --- a/source/blender/draw/engines/overlay/overlay_next_mode_transfer.hh +++ b/source/blender/draw/engines/overlay/overlay_mode_transfer.hh @@ -15,7 +15,7 @@ #include "draw_cache.hh" #include "draw_sculpt.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_motion_path.hh b/source/blender/draw/engines/overlay/overlay_motion_path.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_motion_path.hh rename to source/blender/draw/engines/overlay/overlay_motion_path.hh index f7a58f44d31..3ebbb953864 100644 --- a/source/blender/draw/engines/overlay/overlay_next_motion_path.hh +++ b/source/blender/draw/engines/overlay/overlay_motion_path.hh @@ -14,8 +14,8 @@ #include "draw_manager_text.hh" -#include "overlay_next_armature.hh" -#include "overlay_next_base.hh" +#include "overlay_armature.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_name.hh b/source/blender/draw/engines/overlay/overlay_name.hh similarity index 97% rename from source/blender/draw/engines/overlay/overlay_next_name.hh rename to source/blender/draw/engines/overlay/overlay_name.hh index c60cf6cbc11..6455b1f00f4 100644 --- a/source/blender/draw/engines/overlay/overlay_next_name.hh +++ b/source/blender/draw/engines/overlay/overlay_name.hh @@ -10,7 +10,7 @@ #include "draw_manager_text.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_origin.hh b/source/blender/draw/engines/overlay/overlay_origin.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_origin.hh rename to source/blender/draw/engines/overlay/overlay_origin.hh index dc1830f7957..f52712bf378 100644 --- a/source/blender/draw/engines/overlay/overlay_next_origin.hh +++ b/source/blender/draw/engines/overlay/overlay_origin.hh @@ -10,7 +10,7 @@ #include "BKE_layer.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_outline.hh b/source/blender/draw/engines/overlay/overlay_outline.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_outline.hh rename to source/blender/draw/engines/overlay/overlay_outline.hh index 5d3d9926ad7..d01ccb46488 100644 --- a/source/blender/draw/engines/overlay/overlay_next_outline.hh +++ b/source/blender/draw/engines/overlay/overlay_outline.hh @@ -8,8 +8,8 @@ #pragma once -#include "overlay_next_base.hh" -#include "overlay_next_grease_pencil.hh" +#include "overlay_base.hh" +#include "overlay_grease_pencil.hh" #include "draw_common.hh" diff --git a/source/blender/draw/engines/overlay/overlay_next_paint.hh b/source/blender/draw/engines/overlay/overlay_paint.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_paint.hh rename to source/blender/draw/engines/overlay/overlay_paint.hh index df9c7938402..3a56ea5b2a2 100644 --- a/source/blender/draw/engines/overlay/overlay_next_paint.hh +++ b/source/blender/draw/engines/overlay/overlay_paint.hh @@ -17,7 +17,7 @@ #include "draw_cache.hh" #include "draw_cache_impl.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_particle.hh b/source/blender/draw/engines/overlay/overlay_particle.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_particle.hh rename to source/blender/draw/engines/overlay/overlay_particle.hh index 179a801663d..0c044d26bbd 100644 --- a/source/blender/draw/engines/overlay/overlay_next_particle.hh +++ b/source/blender/draw/engines/overlay/overlay_particle.hh @@ -17,7 +17,7 @@ #include "ED_particle.hh" #include "draw_cache.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_pointcloud.hh b/source/blender/draw/engines/overlay/overlay_pointcloud.hh similarity index 98% rename from source/blender/draw/engines/overlay/overlay_next_pointcloud.hh rename to source/blender/draw/engines/overlay/overlay_pointcloud.hh index e57e2497612..2f6f465b2ca 100644 --- a/source/blender/draw/engines/overlay/overlay_next_pointcloud.hh +++ b/source/blender/draw/engines/overlay/overlay_pointcloud.hh @@ -11,7 +11,7 @@ #include "draw_cache.hh" #include "draw_cache_impl.hh" #include "draw_common_c.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_prepass.hh b/source/blender/draw/engines/overlay/overlay_prepass.hh similarity index 98% rename from source/blender/draw/engines/overlay/overlay_next_prepass.hh rename to source/blender/draw/engines/overlay/overlay_prepass.hh index 180d7fb9b3b..971b4a4b469 100644 --- a/source/blender/draw/engines/overlay/overlay_next_prepass.hh +++ b/source/blender/draw/engines/overlay/overlay_prepass.hh @@ -14,9 +14,9 @@ #include "draw_sculpt.hh" -#include "overlay_next_base.hh" -#include "overlay_next_grease_pencil.hh" -#include "overlay_next_particle.hh" +#include "overlay_base.hh" +#include "overlay_grease_pencil.hh" +#include "overlay_particle.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_private.hh b/source/blender/draw/engines/overlay/overlay_private.hh similarity index 100% rename from source/blender/draw/engines/overlay/overlay_next_private.hh rename to source/blender/draw/engines/overlay/overlay_private.hh diff --git a/source/blender/draw/engines/overlay/overlay_next_relation.hh b/source/blender/draw/engines/overlay/overlay_relation.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_relation.hh rename to source/blender/draw/engines/overlay/overlay_relation.hh index 473c1f2c63b..66d26746b9f 100644 --- a/source/blender/draw/engines/overlay/overlay_next_relation.hh +++ b/source/blender/draw/engines/overlay/overlay_relation.hh @@ -15,7 +15,7 @@ #include "DNA_modifier_types.h" #include "DNA_rigidbody_types.h" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_sculpt.hh b/source/blender/draw/engines/overlay/overlay_sculpt.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_sculpt.hh rename to source/blender/draw/engines/overlay/overlay_sculpt.hh index 988609cdb39..406984d37a5 100644 --- a/source/blender/draw/engines/overlay/overlay_next_sculpt.hh +++ b/source/blender/draw/engines/overlay/overlay_sculpt.hh @@ -22,7 +22,7 @@ #include "draw_cache_impl.hh" #include "draw_sculpt.hh" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_shader.cc b/source/blender/draw/engines/overlay/overlay_shader.cc similarity index 97% rename from source/blender/draw/engines/overlay/overlay_next_shader.cc rename to source/blender/draw/engines/overlay/overlay_shader.cc index b8295a06cec..aa60a49372e 100644 --- a/source/blender/draw/engines/overlay/overlay_next_shader.cc +++ b/source/blender/draw/engines/overlay/overlay_shader.cc @@ -6,7 +6,7 @@ * \ingroup overlay */ -#include "overlay_next_private.hh" +#include "overlay_private.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_shape.cc b/source/blender/draw/engines/overlay/overlay_shape.cc similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_shape.cc rename to source/blender/draw/engines/overlay/overlay_shape.cc index da2f994dcaa..13a547e0480 100644 --- a/source/blender/draw/engines/overlay/overlay_next_shape.cc +++ b/source/blender/draw/engines/overlay/overlay_shape.cc @@ -9,7 +9,7 @@ #include "GPU_batch_utils.hh" #include "draw_cache.hh" -#include "overlay_next_private.hh" +#include "overlay_private.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_speaker.hh b/source/blender/draw/engines/overlay/overlay_speaker.hh similarity index 98% rename from source/blender/draw/engines/overlay/overlay_next_speaker.hh rename to source/blender/draw/engines/overlay/overlay_speaker.hh index e0b72ff7fe0..43d4e07e2fd 100644 --- a/source/blender/draw/engines/overlay/overlay_next_speaker.hh +++ b/source/blender/draw/engines/overlay/overlay_speaker.hh @@ -10,7 +10,7 @@ #include "DNA_speaker_types.h" -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_wireframe.hh b/source/blender/draw/engines/overlay/overlay_wireframe.hh similarity index 99% rename from source/blender/draw/engines/overlay/overlay_next_wireframe.hh rename to source/blender/draw/engines/overlay/overlay_wireframe.hh index 1a3d794d5ae..865b8e8d763 100644 --- a/source/blender/draw/engines/overlay/overlay_next_wireframe.hh +++ b/source/blender/draw/engines/overlay/overlay_wireframe.hh @@ -15,8 +15,8 @@ #include "draw_common.hh" #include "draw_sculpt.hh" -#include "overlay_next_base.hh" -#include "overlay_next_mesh.hh" +#include "overlay_base.hh" +#include "overlay_mesh.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/overlay/overlay_next_xray_fade.hh b/source/blender/draw/engines/overlay/overlay_xray_fade.hh similarity index 98% rename from source/blender/draw/engines/overlay/overlay_next_xray_fade.hh rename to source/blender/draw/engines/overlay/overlay_xray_fade.hh index 202c93c78e3..3528ae89c4a 100644 --- a/source/blender/draw/engines/overlay/overlay_next_xray_fade.hh +++ b/source/blender/draw/engines/overlay/overlay_xray_fade.hh @@ -8,7 +8,7 @@ #pragma once -#include "overlay_next_base.hh" +#include "overlay_base.hh" namespace blender::draw::overlay { diff --git a/source/blender/draw/engines/select/select_engine.cc b/source/blender/draw/engines/select/select_engine.cc index d137713df85..0c5da85fa4c 100644 --- a/source/blender/draw/engines/select/select_engine.cc +++ b/source/blender/draw/engines/select/select_engine.cc @@ -30,7 +30,7 @@ #include "draw_pass.hh" #include "draw_view_data.hh" -#include "../overlay/overlay_next_private.hh" +#include "../overlay/overlay_private.hh" #include "select_engine.hh" diff --git a/source/blender/draw/engines/select/select_instance.cc b/source/blender/draw/engines/select/select_instance.cc index 86ddbb4e417..f28b9cc1e72 100644 --- a/source/blender/draw/engines/select/select_instance.cc +++ b/source/blender/draw/engines/select/select_instance.cc @@ -10,7 +10,7 @@ #include "select_engine.hh" -#include "../overlay/overlay_next_instance.hh" +#include "../overlay/overlay_instance.hh" #include "select_instance.hh" namespace blender::draw::select {