From 4fe75da973ec74ab4073d3f4d0293428a50ecb55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Foucault?= Date: Fri, 13 Jun 2025 12:36:14 +0200 Subject: [PATCH] EEVEE: Remove all remaining reference of EEVEE next This changes the engine identifier back to `BLENDER_EEVEE`. We keep the `BLENDER_EEVEE_NEXT` identifier around for versioning reasons (have to detect when it is the active engine of a older file). This also rename a bunch of pannels that were using `next` in their name. This is a breaking change for Addons compatibility. Pull Request: https://projects.blender.org/blender/blender/pulls/140282 --- scripts/addons_core/hydra_storm/ui.py | 4 +- .../startup/bl_operators/image_as_planes.py | 2 +- scripts/startup/bl_operators/presets.py | 2 +- scripts/startup/bl_ui/node_add_menu_shader.py | 2 +- .../startup/bl_ui/properties_data_camera.py | 32 ++-- .../startup/bl_ui/properties_data_curves.py | 10 +- .../startup/bl_ui/properties_data_light.py | 18 +- .../bl_ui/properties_data_lightprobe.py | 30 ++-- scripts/startup/bl_ui/properties_data_mesh.py | 22 +-- .../bl_ui/properties_data_pointcloud.py | 6 +- .../startup/bl_ui/properties_data_speaker.py | 12 +- .../startup/bl_ui/properties_data_volume.py | 16 +- scripts/startup/bl_ui/properties_freestyle.py | 24 +-- scripts/startup/bl_ui/properties_material.py | 47 ++--- scripts/startup/bl_ui/properties_object.py | 12 +- scripts/startup/bl_ui/properties_output.py | 30 ++-- scripts/startup/bl_ui/properties_particle.py | 104 +++++------ .../startup/bl_ui/properties_physics_cloth.py | 26 +-- .../bl_ui/properties_physics_common.py | 2 +- .../bl_ui/properties_physics_dynamicpaint.py | 42 ++--- .../startup/bl_ui/properties_physics_field.py | 20 +-- .../startup/bl_ui/properties_physics_fluid.py | 44 ++--- .../bl_ui/properties_physics_rigidbody.py | 16 +- ...properties_physics_rigidbody_constraint.py | 26 +-- .../bl_ui/properties_physics_softbody.py | 30 ++-- scripts/startup/bl_ui/properties_render.py | 170 +++++++++--------- scripts/startup/bl_ui/properties_scene.py | 6 +- scripts/startup/bl_ui/properties_texture.py | 50 +++--- .../startup/bl_ui/properties_view_layer.py | 22 +-- scripts/startup/bl_ui/properties_world.py | 20 +-- scripts/startup/bl_ui/space_node.py | 12 +- scripts/startup/bl_ui/space_view3d.py | 4 +- source/blender/blenkernel/intern/scene.cc | 5 +- .../blenloader/intern/versioning_500.cc | 8 + .../blenloader/intern/versioning_defaults.cc | 2 +- .../draw/engines/eevee/eevee_engine.cc | 2 +- .../draw/engines/overlay/overlay_instance.cc | 2 +- .../blender/editors/render/render_preview.cc | 4 +- .../editors/space_view3d/view3d_draw.cc | 4 +- source/blender/makesdna/DNA_scene_types.h | 3 +- source/blender/makesrna/intern/rna_scene.cc | 2 +- source/blender/makesrna/intern/rna_space.cc | 2 +- .../blender/nodes/shader/node_shader_util.cc | 2 +- source/blender/render/intern/engine.cc | 2 +- source/blender/render/intern/pipeline.cc | 2 +- source/creator/creator_args.cc | 15 +- .../attribute_default_color.png | 0 .../attribute_uniform.png | 0 .../attribute_view_layer.png | 0 .../attributes_long_property_path.png | 0 .../diffuse.png | 0 .../ggx_low_roughness.png | 0 .../glass_beckmann.png | 0 .../glass_ggx.png | 0 .../glass_multiggx_tinted.png | 0 .../glass_sharp.png | 0 .../glossy_ashikhmin.png | 0 .../glossy_beckmann.png | 0 .../glossy_ggx.png | 0 .../glossy_multiscatter_ggx.png | 0 .../glossy_roughness_texture.png | 0 .../glossy_sharp.png | 0 .../metallic_beckmann_physical.png | 0 .../metallic_ggx_physical.png | 0 .../metallic_multiggx_f82.png | 0 .../metallic_multiggx_physical.png | 0 .../ray_portal.png | 0 .../ray_portal_pass.png | 0 .../refraction_beckmann.png | 0 .../refraction_ggx.png | 0 .../refraction_sharp.png | 0 .../toon_diffuse.png | 0 .../toon_glossy.png | 0 .../translucent.png | 0 .../transparent.png | 0 .../velvet.png | 0 .../camera_central_cylindrical.png | 0 .../camera_depth_of_field.png | 0 .../camera_equiangular_cubemap_face.png | 0 .../camera_equirectangular.png | 0 .../camera_fisheye_equidistant.png | 0 .../camera_fisheye_equisolid.png | 0 .../camera_fisheye_polynomial.png | 0 .../camera_mirror_ball.png | 0 .../camera_ortho.png | 0 .../camera_ortho_depth_of_field_near_clip.png | 0 .../camera_polygonal_bokeh.png | 0 .../camera_stereo_panoramic.png | 0 .../camera_stereo_perspective.png | 0 .../both_displacement.png | 0 .../bump_glass.png | 0 .../bump_glossy.png | 0 .../bump_normal_texture.png | 0 .../bump_with_displacement.png | 0 .../compare_bump.png | 0 .../dicing_camera.png | 0 .../offscreen_dicing.png | 0 .../panorama_dicing.png | 0 .../true_displacement.png | 0 .../true_displacement_image.png | 0 .../true_displacement_scaled.png | 0 .../true_displacement_scaled_shared.png | 0 .../vector_displacement_object.png | 0 .../vector_displacement_tangent.png | 0 .../grease_pencil.png | 0 .../grease_pencil_motion_blur_center.png | 0 .../grease_pencil_motion_blur_end.png | 0 .../grease_pencil_motion_blur_start.png | 0 .../hair_basemesh_intercept.png | 0 .../hair_close_up.png | 0 .../hair_geom_reflection.png | 0 .../hair_geom_transmission.png | 0 .../hair_info.png | 0 .../hair_instancer_uv.png | 0 .../hair_particle_random.png | 0 .../hair_reflection.png | 0 .../hair_ribbon_close_up.png | 0 .../hair_transmission.png | 0 .../microfacet_hair_orientation.png | 0 .../principled_hair_absorptioncoefficient.png | 0 .../principled_hair_directcoloring.png | 0 .../principled_hair_melaninconcentration.png | 0 .../transparent_shadow_hair.png | 0 .../transparent_shadow_hair_blur.png | 0 .../image_alpha_blend.png | 0 .../image_alpha_blend_osl.png | 0 .../image_alpha_channel_packed.png | 0 .../image_alpha_channel_packed_osl.png | 0 .../image_alpha_ignore.png | 0 .../image_alpha_ignore_osl.png | 0 .../image_log.png | 0 .../image_log_osl.png | 0 .../image_non_color.png | 0 .../image_non_color_osl.png | 0 .../image_byte1.png | 0 .../image_byte1_16bit.png | 0 .../image_byte3.png | 0 .../image_byte3_16bit.png | 0 .../image_byte4.png | 0 .../image_byte4_16bit.png | 0 .../image_float3.png | 0 .../image_float4.png | 0 .../image_generated_byte.png | 0 .../image_generated_float.png | 0 .../image_half3.png | 0 .../image_half4.png | 0 .../image_missing.png | 0 .../image_packed_byte1.png | 0 .../image_packed_byte1_16bit.png | 0 .../image_packed_byte3.png | 0 .../image_packed_byte3_16bit.png | 0 .../image_packed_byte4.png | 0 .../image_packed_byte4_16bit.png | 0 .../image_packed_float3.png | 0 .../image_packed_float4.png | 0 .../image_packed_half3.png | 0 .../image_packed_half4.png | 0 .../image_mapping_clip_closest.png | 0 .../image_mapping_clip_closest_1px.png | 0 .../image_mapping_clip_closest_1px_osl.png | 0 .../image_mapping_clip_closest_osl.png | 0 .../image_mapping_clip_cubic.png | 0 .../image_mapping_clip_cubic_1px.png | 0 .../image_mapping_clip_cubic_1px_osl.png | 0 .../image_mapping_clip_cubic_osl.png | 0 .../image_mapping_clip_linear.png | 0 .../image_mapping_clip_linear_1px.png | 0 .../image_mapping_clip_linear_1px_osl.png | 0 .../image_mapping_clip_linear_osl.png | 0 .../image_mapping_extend_closest.png | 0 .../image_mapping_extend_closest_1px.png | 0 .../image_mapping_extend_closest_1px_osl.png | 0 .../image_mapping_extend_closest_osl.png | 0 .../image_mapping_extend_cubic.png | 0 .../image_mapping_extend_cubic_1px.png | 0 .../image_mapping_extend_cubic_1px_osl.png | 0 .../image_mapping_extend_cubic_osl.png | 0 .../image_mapping_extend_linear.png | 0 .../image_mapping_extend_linear_1px.png | 0 .../image_mapping_extend_linear_1px_osl.png | 0 .../image_mapping_extend_linear_osl.png | 0 .../image_mapping_mirror_closest.png | 0 .../image_mapping_mirror_closest_osl.png | 0 .../image_mapping_mirror_cubic.png | 0 .../image_mapping_mirror_cubic_osl.png | 0 .../image_mapping_mirror_linear.png | 0 .../image_mapping_mirror_linear_osl.png | 0 .../image_mapping_repeat_closest.png | 0 .../image_mapping_repeat_closest_1px.png | 0 .../image_mapping_repeat_closest_1px_osl.png | 0 .../image_mapping_repeat_closest_osl.png | 0 .../image_mapping_repeat_cubic.png | 0 .../image_mapping_repeat_cubic_1px.png | 0 .../image_mapping_repeat_cubic_1px_osl.png | 0 .../image_mapping_repeat_cubic_osl.png | 0 .../image_mapping_repeat_linear.png | 0 .../image_mapping_repeat_linear_1px.png | 0 .../image_mapping_repeat_linear_1px_osl.png | 0 .../image_mapping_repeat_linear_osl.png | 0 .../image_mapping_udim.png | 0 .../image_mapping_udim_packed.png | 0 .../image_mapping_uvtile_osl.png | 0 .../image_texture_limit_byte1.png | 0 .../image_texture_limit_byte1_16bit.png | 0 .../image_texture_limit_byte3.png | 0 .../image_texture_limit_byte3_16bit.png | 0 .../image_texture_limit_byte4.png | 0 .../image_texture_limit_byte4_16bit.png | 0 .../image_texture_limit_float3.png | 0 .../image_texture_limit_float4.png | 0 .../image_texture_limit_generated_byte.png | 0 .../image_texture_limit_generated_float.png | 0 .../image_texture_limit_half3.png | 0 .../image_texture_limit_half4.png | 0 .../image_texture_limit_packed_byte1.png | 0 ...image_texture_limit_packed_byte1_16bit.png | 0 .../image_texture_limit_packed_byte3.png | 0 ...image_texture_limit_packed_byte3_16bit.png | 0 .../image_texture_limit_packed_byte4.png | 0 ...image_texture_limit_packed_byte4_16bit.png | 0 .../image_texture_limit_packed_float3.png | 0 .../image_texture_limit_packed_float4.png | 0 .../image_texture_limit_packed_half3.png | 0 .../image_texture_limit_packed_half4.png | 0 .../ao_approximate.png | 0 .../clamp_both.png | 0 .../clamp_direct.png | 0 .../clamp_indirect.png | 0 .../complex_shadow_intersection.png | 0 .../light_path_diffuse_depth.png | 0 .../light_path_glossy_depth.png | 0 .../light_path_is_camera_ray.png | 0 .../light_path_is_diffuse_ray.png | 0 .../light_path_is_glossy_ray.png | 0 .../light_path_is_reflection_ray.png | 0 .../light_path_is_shadow_ray.png | 0 .../light_path_is_singular_ray.png | 0 .../light_path_is_transmission_ray.png | 0 .../light_path_is_volume_scatter_ray.png | 0 .../light_path_ray_depth.png | 0 .../light_path_ray_length.png | 0 .../light_path_transmission_depth.png | 0 .../light_path_transparent_depth.png | 0 .../long_distance_precision.png | 0 .../ray_offset.png | 0 .../resumable_render.png | 0 .../sample_subset.png | 0 .../shading_offset.png | 0 .../shadow_all_max_bounces.png | 0 .../transparent_shadow.png | 0 .../transparent_shadow_limit_0.png | 0 .../transparent_shadow_limit_1.png | 0 .../transparent_shadow_limit_1024.png | 0 .../transparent_shadow_limit_401.png | 0 .../transparent_spatial_splits.png | 0 .../underwater_caustics.png | 0 .../all_light_types.png | 0 .../all_light_types_in_volume.png | 0 .../area_light.png | 0 .../area_light_uv.png | 0 .../cast_shadow_versioning.png | 0 .../distant_light.png | 0 .../distant_light_with_world_volume.png | 0 .../ellipse_light_spread.png | 0 .../ies_light.png | 0 .../instanced_mesh_lights.png | 0 .../light_falloff.png | 0 .../light_normalize.png | 0 .../light_ray_visibility.png | 0 .../light_ray_visibility_light_tree.png | 0 .../light_spread.png | 0 .../light_temperature.png | 0 .../light_texture.png | 0 .../light_tree_bump_map.png | 0 .../light_tree_bump_map_no_correction.png | 0 .../light_tree_multi_distant.png | 0 .../light_tree_node_subtended_angle.png | 0 .../lights_below_surface.png | 0 .../mesh_light.png | 0 .../mesh_light_backface.png | 0 .../mesh_light_small.png | 0 .../multiple_area_lights.png | 0 .../multiple_lights_in_volume.png | 0 .../multiple_mesh_lights.png | 0 .../point_light.png | 0 .../portal.png | 0 .../soft_sphere_light.png | 0 .../sphere_light.png | 0 .../sphere_spot_light.png | 0 .../spot_light.png | 0 .../spot_light_adaptive_split.png | 0 .../translucent_inside_outside.png | 0 .../triangle_light_sampling.png | 0 .../varying_brightness.png | 0 .../volume_zero_angle_distant_light.png | 0 .../light_link_distant_multi_tree.png | 0 .../light_link_distant_tree.png | 0 .../light_link_exclude.png | 0 .../light_link_hidden.png | 0 .../light_link_instanced_receiver.png | 0 .../light_link_mesh_tree.png | 0 .../light_link_simple.png | 0 .../light_link_simple_tree.png | 0 .../light_link_single_light.png | 0 .../light_link_surface_in_volume.png | 0 .../light_link_volume.png | 0 .../link_link_share_bit_trail.png | 0 .../shadow_link_blocked.png | 0 .../shadow_link_blocked_distant.png | 0 .../shadow_link_clamp.png | 0 .../shadow_link_distant.png | 0 .../shadow_link_glossy.png | 0 .../shadow_link_hidden.png | 0 .../shadow_link_mesh.png | 0 .../shadow_link_multiple_lights.png | 0 .../shadow_link_simple.png | 0 .../shadow_link_simple_3D_curve.png | 0 .../shadow_link_simple_point_cloud.png | 0 .../shadow_link_simple_ribbon_curve.png | 0 .../shadow_link_transparency.png | 0 .../shadow_link_volume.png | 0 ...adaptive_subdivision_geometry_features.png | 0 .../autosmooth_custom_normals.png | 0 .../autosmooth_simple.png | 0 .../autosmooth_subdmesh_catmull.png | 0 .../autosmooth_subdmesh_linear.png | 0 .../bvh8_close_proximity_visibility.png | 0 .../culling.png | 0 .../curve_modifier.png | 0 .../double_instance_transformation.png | 0 .../edit_mode.png | 0 .../normal_types.png | 0 .../normal_types_motion.png | 0 .../pointiness.png | 0 .../pointiness_autosplit.png | 0 .../pointiness_split_faces.png | 0 .../shadow_terminator.png | 0 .../shadow_terminator_metal.png | 0 .../tangent_missing_uv.png | 0 .../tangent_no_uv.png | 0 .../tangent_render_uv.png | 0 .../tangent_specific_uv_other.png | 0 .../tangent_specific_uv_render.png | 0 .../tangent_triangles.png | 0 .../texture_space_bezier.png | 0 .../texture_space_bezier_auto.png | 0 .../texture_space_font.png | 0 .../texture_space_font_auto.png | 0 .../texture_space_mesh_modifier.png | 0 .../texture_space_nurbs.png | 0 .../texture_space_nurbs_auto.png | 0 .../visibility_instances.png | 0 .../visibility_particles.png | 0 .../watertight.png | 0 .../watertight_orig.png | 0 .../bvh_steps_curve_segments_0.png | 0 .../bvh_steps_curve_segments_3.png | 0 .../bvh_steps_line_segments_0.png | 0 .../bvh_steps_line_segments_3.png | 0 .../camera_zoom_blur_perspective.png | 0 .../curve_motion_blur.png | 0 .../fluid_motion_blur.png | 0 .../fluid_motion_blur_disabled.png | 0 .../large_combined_motion.png | 0 .../mblur_deform_autosmooth.png | 0 .../mblur_deform_simple.png | 0 .../multi_step_motion_blur.png | 0 .../multi_step_velocity_motion_blur.png | 0 .../rolling_shutter.png | 0 .../scale_motion_blur.png | 0 .../shutter_curve_default.png | 0 .../shutter_curve_triangle.png | 0 .../shutter_moving_camera_center.png | 0 .../shutter_moving_camera_end.png | 0 .../shutter_moving_camera_start.png | 0 .../shutter_moving_object_center.png | 0 .../shutter_moving_object_end.png | 0 .../shutter_moving_object_start.png | 0 .../subd_motion_blur.png | 0 .../fire.png | 0 .../openvdb_overlap.png | 0 .../openvdb_smoke.png | 0 .../point_density_particle_object.png | 0 .../point_density_particle_world.png | 0 .../point_density_vertices_object.png | 0 .../point_density_vertices_world.png | 0 .../principled_blackbody.png | 0 .../principled_smoke.png | 0 .../smoke.png | 0 .../smoke_color.png | 0 .../smoke_fire.png | 0 .../point_info.png | 0 .../points.png | 0 .../points_emission.png | 0 .../points_motion.png | 0 .../points_transparent.png | 0 .../points_volume.png | 0 .../principled_bsdf_coat.png | 0 .../principled_bsdf_coat_zero_weight.png | 0 .../principled_bsdf_default.png | 0 .../principled_bsdf_emission.png | 0 .../principled_bsdf_emission_alpha.png | 0 .../principled_bsdf_metallic.png | 0 .../principled_bsdf_sheen.png | 0 .../principled_bsdf_specular.png | 0 .../principled_bsdf_subsurface.png | 0 .../principled_bsdf_thinfilm_reflection.png | 0 .../principled_bsdf_thinfilm_transmission.png | 0 .../principled_bsdf_transmission.png | 0 .../aov_position.png | 0 .../freestyle.png | 0 .../freestyle_stroke_material.png | 0 .../render_passes_ao.png | 0 .../render_passes_aov_color.png | 0 .../render_passes_aov_value.png | 0 .../render_passes_cryptomatte_asset.png | 0 .../render_passes_cryptomatte_material.png | 0 .../render_passes_cryptomatte_object.png | 0 .../render_passes_diffuse_color.png | 0 .../render_passes_diffuse_direct.png | 0 .../render_passes_diffuse_indirect.png | 0 .../render_passes_emission.png | 0 .../render_passes_environment.png | 0 .../render_passes_mist.png | 0 .../render_passes_normal.png | 0 .../render_passes_shadow.png | 0 .../render_passes_specular_color.png | 0 .../render_passes_specular_direct.png | 0 .../render_passes_specular_indirect.png | 0 .../render_passes_thinfilm_color.png | 0 .../rlayer_flags_01.png | 0 .../rlayer_flags_02.png | 0 .../rlayer_flags_03.png | 0 .../rlayer_flags_04.png | 0 .../shadow_catcher_ao_pass.png | 0 .../ambient_occlusion.png | 0 .../ambient_occlusion_only_local.png | 0 .../bevel.png | 0 .../bevel_mblur.png | 0 .../blackbody.png | 0 .../camera_data_distance.png | 0 .../camera_data_vector.png | 0 .../constant_fold.png | 0 .../custom_normal_map.png | 0 .../diffuse_normal_map.png | 0 .../emission.png | 0 .../float_math.png | 0 .../fresnel_layer_weight.png | 0 .../glossy_normal_map.png | 0 .../holdout.png | 0 .../hsv.png | 0 .../invert.png | 0 .../mix_color.png | 0 .../node_group_color.png | 0 .../node_group_float.png | 0 .../node_group_vector.png | 0 .../normal.png | 0 .../object_info.png | 0 .../rgb_curves_input_0.5.png | 0 .../rgb_curves_input_1.2.png | 0 .../rgb_curves_input_2.0_extrapolate.png | 0 .../rgb_curves_input_neg_0.5.png | 0 .../rgb_curves_input_neg_1.2.png | 0 .../rgb_curves_input_neg_2.0_extrapolate.png | 0 .../tex_voronoi.png | 0 .../texture_coordinate_camera.png | 0 .../texture_coordinate_generated.png | 0 .../texture_coordinate_normal.png | 0 .../texture_coordinate_object.png | 0 ...xture_coordinate_object_with_reference.png | 0 .../texture_coordinate_reflection.png | 0 .../texture_coordinate_uv.png | 0 .../texture_coordinate_window.png | 0 .../vector_math.png | 0 .../wavelength.png | 0 .../sss_concave_clamp.png | 0 .../sss_diffuse_mix_clamp.png | 0 .../sss_hair.png | 0 .../sss_reflection_clamp.png | 0 .../subsurface_base_color_mix.png | 0 .../subsurface_behind_glass.png | 0 .../subsurface_burley.png | 0 .../subsurface_cubic.png | 0 .../subsurface_gaussian.png | 0 .../subsurface_mix.png | 0 .../subsurface_random_walk.png | 0 .../subsurface_random_walk_thin.png | 0 .../subsurface_small_radius.png | 0 .../brick.png | 0 .../checker.png | 0 .../environment_equiangular.png | 0 .../environment_mirror_ball.png | 0 .../garbor.png | 0 .../gradient.png | 0 .../image.png | 0 .../magic.png | 0 .../musgrave_fbm_36.png | 0 .../musgrave_hetero_terrain_36.png | 0 .../musgrave_hybrid_multifractal_36.png | 0 .../musgrave_multifractal_36.png | 0 .../musgrave_ridged_multifractal_36.png | 0 .../noise.png | 0 .../noise_lacunarity.png | 0 .../sky_hosek_wilkie.png | 0 ...hita_decreased_disk_increased_air_dust.png | 0 .../sky_nishita_default.png | 0 .../sky_nishita_increased_disk_ozone.png | 0 .../sky_nishita_no_disk_high_altitude.png | 0 .../sky_preetham.png | 0 .../voronoi_distace_to_edge.png | 0 .../voronoi_distace_to_edge_fractal.png | 0 .../voronoi_f1.png | 0 .../voronoi_f1_fractal.png | 0 .../voronoi_f2.png | 0 .../voronoi_f2_fractal.png | 0 .../voronoi_n_sphere_radius.png | 0 .../voronoi_smooth_f1.png | 0 .../voronoi_smooth_f1_fractal.png | 0 .../wave_bands_saw.png | 0 .../wave_bands_sine.png | 0 .../wave_bands_triangle.png | 0 .../wave_rings_saw.png | 0 .../wave_rings_sine.png | 0 .../wave_rings_triangle.png | 0 .../white_noise_1spp.png | 0 .../white_noise_256spp.png | 0 .../camera_in_volume_camera_and_volume.png | 0 .../camera_in_volume_camera_only.png | 0 .../camera_in_volume_nested.png | 0 .../camera_in_volume_simple.png | 0 .../implicit_volume.png | 0 .../overlapping_different_anisotropy.png | 0 .../principled_absorption.png | 0 .../principled_bsdf_interior.png | 0 .../volume_absobtion.png | 0 .../volume_deep_stack.png | 0 .../volume_edge_fireflies.png | 0 .../volume_output_absorption.png | 0 .../volume_output_mix_volume.png | 0 .../volume_output_scatter.png | 0 .../volume_output_surface.png | 0 .../volume_overlap.png | 0 .../volume_scatter.png | 0 .../volume_scatter_albedo.png | 0 .../volume_scatter_draine.png | 0 .../volume_scatter_fournier-forand.png | 0 .../volume_scatter_mie.png | 0 .../volume_scatter_mie_small_particles.png | 0 .../volume_scatter_rayleigh.png | 0 .../volume_step_offset.png | 0 .../volume_transparent_shadow.png | 0 .../volume_zero_extinction_channel.png | 0 .../world_volume.png | 0 tests/python/CMakeLists.txt | 2 +- tests/python/eevee_render_tests.py | 12 +- tests/python/workbench_render_tests.py | 2 +- tools/utils_doc/code_layout_diagram.py | 2 +- 557 files changed, 469 insertions(+), 467 deletions(-) rename tests/files/render/attributes/{eevee_next_renders => eevee_renders}/attribute_default_color.png (100%) rename tests/files/render/attributes/{eevee_next_renders => eevee_renders}/attribute_uniform.png (100%) rename tests/files/render/attributes/{eevee_next_renders => eevee_renders}/attribute_view_layer.png (100%) rename tests/files/render/attributes/{eevee_next_renders => eevee_renders}/attributes_long_property_path.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/diffuse.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/ggx_low_roughness.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/glass_beckmann.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/glass_ggx.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/glass_multiggx_tinted.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/glass_sharp.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/glossy_ashikhmin.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/glossy_beckmann.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/glossy_ggx.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/glossy_multiscatter_ggx.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/glossy_roughness_texture.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/glossy_sharp.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/metallic_beckmann_physical.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/metallic_ggx_physical.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/metallic_multiggx_f82.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/metallic_multiggx_physical.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/ray_portal.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/ray_portal_pass.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/refraction_beckmann.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/refraction_ggx.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/refraction_sharp.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/toon_diffuse.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/toon_glossy.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/translucent.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/transparent.png (100%) rename tests/files/render/bsdf/{eevee_next_renders => eevee_renders}/velvet.png (100%) rename tests/files/render/camera/{eevee_next_renders => eevee_renders}/camera_central_cylindrical.png (100%) rename tests/files/render/camera/{eevee_next_renders => eevee_renders}/camera_depth_of_field.png (100%) rename tests/files/render/camera/{eevee_next_renders => eevee_renders}/camera_equiangular_cubemap_face.png (100%) rename tests/files/render/camera/{eevee_next_renders => eevee_renders}/camera_equirectangular.png (100%) rename tests/files/render/camera/{eevee_next_renders => eevee_renders}/camera_fisheye_equidistant.png (100%) rename tests/files/render/camera/{eevee_next_renders => eevee_renders}/camera_fisheye_equisolid.png (100%) rename tests/files/render/camera/{eevee_next_renders => eevee_renders}/camera_fisheye_polynomial.png (100%) rename tests/files/render/camera/{eevee_next_renders => eevee_renders}/camera_mirror_ball.png (100%) rename tests/files/render/camera/{eevee_next_renders => eevee_renders}/camera_ortho.png (100%) rename tests/files/render/camera/{eevee_next_renders => eevee_renders}/camera_ortho_depth_of_field_near_clip.png (100%) rename tests/files/render/camera/{eevee_next_renders => eevee_renders}/camera_polygonal_bokeh.png (100%) rename tests/files/render/camera/{eevee_next_renders => eevee_renders}/camera_stereo_panoramic.png (100%) rename tests/files/render/camera/{eevee_next_renders => eevee_renders}/camera_stereo_perspective.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/both_displacement.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/bump_glass.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/bump_glossy.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/bump_normal_texture.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/bump_with_displacement.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/compare_bump.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/dicing_camera.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/offscreen_dicing.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/panorama_dicing.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/true_displacement.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/true_displacement_image.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/true_displacement_scaled.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/true_displacement_scaled_shared.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/vector_displacement_object.png (100%) rename tests/files/render/displacement/{eevee_next_renders => eevee_renders}/vector_displacement_tangent.png (100%) rename tests/files/render/grease_pencil/{eevee_next_renders => eevee_renders}/grease_pencil.png (100%) rename tests/files/render/grease_pencil/{eevee_next_renders => eevee_renders}/grease_pencil_motion_blur_center.png (100%) rename tests/files/render/grease_pencil/{eevee_next_renders => eevee_renders}/grease_pencil_motion_blur_end.png (100%) rename tests/files/render/grease_pencil/{eevee_next_renders => eevee_renders}/grease_pencil_motion_blur_start.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/hair_basemesh_intercept.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/hair_close_up.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/hair_geom_reflection.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/hair_geom_transmission.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/hair_info.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/hair_instancer_uv.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/hair_particle_random.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/hair_reflection.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/hair_ribbon_close_up.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/hair_transmission.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/microfacet_hair_orientation.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/principled_hair_absorptioncoefficient.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/principled_hair_directcoloring.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/principled_hair_melaninconcentration.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/transparent_shadow_hair.png (100%) rename tests/files/render/hair/{eevee_next_renders => eevee_renders}/transparent_shadow_hair_blur.png (100%) rename tests/files/render/image_colorspace/{eevee_next_renders => eevee_renders}/image_alpha_blend.png (100%) rename tests/files/render/image_colorspace/{eevee_next_renders => eevee_renders}/image_alpha_blend_osl.png (100%) rename tests/files/render/image_colorspace/{eevee_next_renders => eevee_renders}/image_alpha_channel_packed.png (100%) rename tests/files/render/image_colorspace/{eevee_next_renders => eevee_renders}/image_alpha_channel_packed_osl.png (100%) rename tests/files/render/image_colorspace/{eevee_next_renders => eevee_renders}/image_alpha_ignore.png (100%) rename tests/files/render/image_colorspace/{eevee_next_renders => eevee_renders}/image_alpha_ignore_osl.png (100%) rename tests/files/render/image_colorspace/{eevee_next_renders => eevee_renders}/image_log.png (100%) rename tests/files/render/image_colorspace/{eevee_next_renders => eevee_renders}/image_log_osl.png (100%) rename tests/files/render/image_colorspace/{eevee_next_renders => eevee_renders}/image_non_color.png (100%) rename tests/files/render/image_colorspace/{eevee_next_renders => eevee_renders}/image_non_color_osl.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_byte1.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_byte1_16bit.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_byte3.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_byte3_16bit.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_byte4.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_byte4_16bit.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_float3.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_float4.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_generated_byte.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_generated_float.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_half3.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_half4.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_missing.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_packed_byte1.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_packed_byte1_16bit.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_packed_byte3.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_packed_byte3_16bit.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_packed_byte4.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_packed_byte4_16bit.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_packed_float3.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_packed_float4.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_packed_half3.png (100%) rename tests/files/render/image_data_types/{eevee_next_renders => eevee_renders}/image_packed_half4.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_clip_closest.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_clip_closest_1px.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_clip_closest_1px_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_clip_closest_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_clip_cubic.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_clip_cubic_1px.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_clip_cubic_1px_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_clip_cubic_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_clip_linear.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_clip_linear_1px.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_clip_linear_1px_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_clip_linear_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_extend_closest.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_extend_closest_1px.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_extend_closest_1px_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_extend_closest_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_extend_cubic.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_extend_cubic_1px.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_extend_cubic_1px_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_extend_cubic_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_extend_linear.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_extend_linear_1px.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_extend_linear_1px_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_extend_linear_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_mirror_closest.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_mirror_closest_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_mirror_cubic.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_mirror_cubic_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_mirror_linear.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_mirror_linear_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_repeat_closest.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_repeat_closest_1px.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_repeat_closest_1px_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_repeat_closest_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_repeat_cubic.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_repeat_cubic_1px.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_repeat_cubic_1px_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_repeat_cubic_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_repeat_linear.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_repeat_linear_1px.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_repeat_linear_1px_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_repeat_linear_osl.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_udim.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_udim_packed.png (100%) rename tests/files/render/image_mapping/{eevee_next_renders => eevee_renders}/image_mapping_uvtile_osl.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_byte1.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_byte1_16bit.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_byte3.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_byte3_16bit.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_byte4.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_byte4_16bit.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_float3.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_float4.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_generated_byte.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_generated_float.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_half3.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_half4.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_packed_byte1.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_packed_byte1_16bit.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_packed_byte3.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_packed_byte3_16bit.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_packed_byte4.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_packed_byte4_16bit.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_packed_float3.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_packed_float4.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_packed_half3.png (100%) rename tests/files/render/image_texture_limit/{eevee_next_renders => eevee_renders}/image_texture_limit_packed_half4.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/ao_approximate.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/clamp_both.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/clamp_direct.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/clamp_indirect.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/complex_shadow_intersection.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/light_path_diffuse_depth.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/light_path_glossy_depth.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/light_path_is_camera_ray.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/light_path_is_diffuse_ray.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/light_path_is_glossy_ray.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/light_path_is_reflection_ray.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/light_path_is_shadow_ray.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/light_path_is_singular_ray.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/light_path_is_transmission_ray.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/light_path_is_volume_scatter_ray.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/light_path_ray_depth.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/light_path_ray_length.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/light_path_transmission_depth.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/light_path_transparent_depth.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/long_distance_precision.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/ray_offset.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/resumable_render.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/sample_subset.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/shading_offset.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/shadow_all_max_bounces.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/transparent_shadow.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/transparent_shadow_limit_0.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/transparent_shadow_limit_1.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/transparent_shadow_limit_1024.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/transparent_shadow_limit_401.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/transparent_spatial_splits.png (100%) rename tests/files/render/integrator/{eevee_next_renders => eevee_renders}/underwater_caustics.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/all_light_types.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/all_light_types_in_volume.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/area_light.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/area_light_uv.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/cast_shadow_versioning.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/distant_light.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/distant_light_with_world_volume.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/ellipse_light_spread.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/ies_light.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/instanced_mesh_lights.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/light_falloff.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/light_normalize.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/light_ray_visibility.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/light_ray_visibility_light_tree.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/light_spread.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/light_temperature.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/light_texture.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/light_tree_bump_map.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/light_tree_bump_map_no_correction.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/light_tree_multi_distant.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/light_tree_node_subtended_angle.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/lights_below_surface.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/mesh_light.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/mesh_light_backface.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/mesh_light_small.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/multiple_area_lights.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/multiple_lights_in_volume.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/multiple_mesh_lights.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/point_light.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/portal.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/soft_sphere_light.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/sphere_light.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/sphere_spot_light.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/spot_light.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/spot_light_adaptive_split.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/translucent_inside_outside.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/triangle_light_sampling.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/varying_brightness.png (100%) rename tests/files/render/light/{eevee_next_renders => eevee_renders}/volume_zero_angle_distant_light.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/light_link_distant_multi_tree.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/light_link_distant_tree.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/light_link_exclude.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/light_link_hidden.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/light_link_instanced_receiver.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/light_link_mesh_tree.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/light_link_simple.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/light_link_simple_tree.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/light_link_single_light.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/light_link_surface_in_volume.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/light_link_volume.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/link_link_share_bit_trail.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/shadow_link_blocked.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/shadow_link_blocked_distant.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/shadow_link_clamp.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/shadow_link_distant.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/shadow_link_glossy.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/shadow_link_hidden.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/shadow_link_mesh.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/shadow_link_multiple_lights.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/shadow_link_simple.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/shadow_link_simple_3D_curve.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/shadow_link_simple_point_cloud.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/shadow_link_simple_ribbon_curve.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/shadow_link_transparency.png (100%) rename tests/files/render/light_linking/{eevee_next_renders => eevee_renders}/shadow_link_volume.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/adaptive_subdivision_geometry_features.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/autosmooth_custom_normals.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/autosmooth_simple.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/autosmooth_subdmesh_catmull.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/autosmooth_subdmesh_linear.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/bvh8_close_proximity_visibility.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/culling.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/curve_modifier.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/double_instance_transformation.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/edit_mode.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/normal_types.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/normal_types_motion.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/pointiness.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/pointiness_autosplit.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/pointiness_split_faces.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/shadow_terminator.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/shadow_terminator_metal.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/tangent_missing_uv.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/tangent_no_uv.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/tangent_render_uv.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/tangent_specific_uv_other.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/tangent_specific_uv_render.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/tangent_triangles.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/texture_space_bezier.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/texture_space_bezier_auto.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/texture_space_font.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/texture_space_font_auto.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/texture_space_mesh_modifier.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/texture_space_nurbs.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/texture_space_nurbs_auto.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/visibility_instances.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/visibility_particles.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/watertight.png (100%) rename tests/files/render/mesh/{eevee_next_renders => eevee_renders}/watertight_orig.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/bvh_steps_curve_segments_0.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/bvh_steps_curve_segments_3.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/bvh_steps_line_segments_0.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/bvh_steps_line_segments_3.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/camera_zoom_blur_perspective.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/curve_motion_blur.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/fluid_motion_blur.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/fluid_motion_blur_disabled.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/large_combined_motion.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/mblur_deform_autosmooth.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/mblur_deform_simple.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/multi_step_motion_blur.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/multi_step_velocity_motion_blur.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/rolling_shutter.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/scale_motion_blur.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/shutter_curve_default.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/shutter_curve_triangle.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/shutter_moving_camera_center.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/shutter_moving_camera_end.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/shutter_moving_camera_start.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/shutter_moving_object_center.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/shutter_moving_object_end.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/shutter_moving_object_start.png (100%) rename tests/files/render/motion_blur/{eevee_next_renders => eevee_renders}/subd_motion_blur.png (100%) rename tests/files/render/openvdb/{eevee_next_renders => eevee_renders}/fire.png (100%) rename tests/files/render/openvdb/{eevee_next_renders => eevee_renders}/openvdb_overlap.png (100%) rename tests/files/render/openvdb/{eevee_next_renders => eevee_renders}/openvdb_smoke.png (100%) rename tests/files/render/openvdb/{eevee_next_renders => eevee_renders}/point_density_particle_object.png (100%) rename tests/files/render/openvdb/{eevee_next_renders => eevee_renders}/point_density_particle_world.png (100%) rename tests/files/render/openvdb/{eevee_next_renders => eevee_renders}/point_density_vertices_object.png (100%) rename tests/files/render/openvdb/{eevee_next_renders => eevee_renders}/point_density_vertices_world.png (100%) rename tests/files/render/openvdb/{eevee_next_renders => eevee_renders}/principled_blackbody.png (100%) rename tests/files/render/openvdb/{eevee_next_renders => eevee_renders}/principled_smoke.png (100%) rename tests/files/render/openvdb/{eevee_next_renders => eevee_renders}/smoke.png (100%) rename tests/files/render/openvdb/{eevee_next_renders => eevee_renders}/smoke_color.png (100%) rename tests/files/render/openvdb/{eevee_next_renders => eevee_renders}/smoke_fire.png (100%) rename tests/files/render/pointcloud/{eevee_next_renders => eevee_renders}/point_info.png (100%) rename tests/files/render/pointcloud/{eevee_next_renders => eevee_renders}/points.png (100%) rename tests/files/render/pointcloud/{eevee_next_renders => eevee_renders}/points_emission.png (100%) rename tests/files/render/pointcloud/{eevee_next_renders => eevee_renders}/points_motion.png (100%) rename tests/files/render/pointcloud/{eevee_next_renders => eevee_renders}/points_transparent.png (100%) rename tests/files/render/pointcloud/{eevee_next_renders => eevee_renders}/points_volume.png (100%) rename tests/files/render/principled_bsdf/{eevee_next_renders => eevee_renders}/principled_bsdf_coat.png (100%) rename tests/files/render/principled_bsdf/{eevee_next_renders => eevee_renders}/principled_bsdf_coat_zero_weight.png (100%) rename tests/files/render/principled_bsdf/{eevee_next_renders => eevee_renders}/principled_bsdf_default.png (100%) rename tests/files/render/principled_bsdf/{eevee_next_renders => eevee_renders}/principled_bsdf_emission.png (100%) rename tests/files/render/principled_bsdf/{eevee_next_renders => eevee_renders}/principled_bsdf_emission_alpha.png (100%) rename tests/files/render/principled_bsdf/{eevee_next_renders => eevee_renders}/principled_bsdf_metallic.png (100%) rename tests/files/render/principled_bsdf/{eevee_next_renders => eevee_renders}/principled_bsdf_sheen.png (100%) rename tests/files/render/principled_bsdf/{eevee_next_renders => eevee_renders}/principled_bsdf_specular.png (100%) rename tests/files/render/principled_bsdf/{eevee_next_renders => eevee_renders}/principled_bsdf_subsurface.png (100%) rename tests/files/render/principled_bsdf/{eevee_next_renders => eevee_renders}/principled_bsdf_thinfilm_reflection.png (100%) rename tests/files/render/principled_bsdf/{eevee_next_renders => eevee_renders}/principled_bsdf_thinfilm_transmission.png (100%) rename tests/files/render/principled_bsdf/{eevee_next_renders => eevee_renders}/principled_bsdf_transmission.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/aov_position.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/freestyle.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/freestyle_stroke_material.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_ao.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_aov_color.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_aov_value.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_cryptomatte_asset.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_cryptomatte_material.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_cryptomatte_object.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_diffuse_color.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_diffuse_direct.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_diffuse_indirect.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_emission.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_environment.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_mist.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_normal.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_shadow.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_specular_color.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_specular_direct.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_specular_indirect.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/render_passes_thinfilm_color.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/rlayer_flags_01.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/rlayer_flags_02.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/rlayer_flags_03.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/rlayer_flags_04.png (100%) rename tests/files/render/render_layer/{eevee_next_renders => eevee_renders}/shadow_catcher_ao_pass.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/ambient_occlusion.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/ambient_occlusion_only_local.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/bevel.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/bevel_mblur.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/blackbody.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/camera_data_distance.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/camera_data_vector.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/constant_fold.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/custom_normal_map.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/diffuse_normal_map.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/emission.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/float_math.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/fresnel_layer_weight.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/glossy_normal_map.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/holdout.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/hsv.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/invert.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/mix_color.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/node_group_color.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/node_group_float.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/node_group_vector.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/normal.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/object_info.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/rgb_curves_input_0.5.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/rgb_curves_input_1.2.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/rgb_curves_input_2.0_extrapolate.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/rgb_curves_input_neg_0.5.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/rgb_curves_input_neg_1.2.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/rgb_curves_input_neg_2.0_extrapolate.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/tex_voronoi.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/texture_coordinate_camera.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/texture_coordinate_generated.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/texture_coordinate_normal.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/texture_coordinate_object.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/texture_coordinate_object_with_reference.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/texture_coordinate_reflection.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/texture_coordinate_uv.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/texture_coordinate_window.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/vector_math.png (100%) rename tests/files/render/shader/{eevee_next_renders => eevee_renders}/wavelength.png (100%) rename tests/files/render/sss/{eevee_next_renders => eevee_renders}/sss_concave_clamp.png (100%) rename tests/files/render/sss/{eevee_next_renders => eevee_renders}/sss_diffuse_mix_clamp.png (100%) rename tests/files/render/sss/{eevee_next_renders => eevee_renders}/sss_hair.png (100%) rename tests/files/render/sss/{eevee_next_renders => eevee_renders}/sss_reflection_clamp.png (100%) rename tests/files/render/sss/{eevee_next_renders => eevee_renders}/subsurface_base_color_mix.png (100%) rename tests/files/render/sss/{eevee_next_renders => eevee_renders}/subsurface_behind_glass.png (100%) rename tests/files/render/sss/{eevee_next_renders => eevee_renders}/subsurface_burley.png (100%) rename tests/files/render/sss/{eevee_next_renders => eevee_renders}/subsurface_cubic.png (100%) rename tests/files/render/sss/{eevee_next_renders => eevee_renders}/subsurface_gaussian.png (100%) rename tests/files/render/sss/{eevee_next_renders => eevee_renders}/subsurface_mix.png (100%) rename tests/files/render/sss/{eevee_next_renders => eevee_renders}/subsurface_random_walk.png (100%) rename tests/files/render/sss/{eevee_next_renders => eevee_renders}/subsurface_random_walk_thin.png (100%) rename tests/files/render/sss/{eevee_next_renders => eevee_renders}/subsurface_small_radius.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/brick.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/checker.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/environment_equiangular.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/environment_mirror_ball.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/garbor.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/gradient.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/image.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/magic.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/musgrave_fbm_36.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/musgrave_hetero_terrain_36.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/musgrave_hybrid_multifractal_36.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/musgrave_multifractal_36.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/musgrave_ridged_multifractal_36.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/noise.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/noise_lacunarity.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/sky_hosek_wilkie.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/sky_nishita_decreased_disk_increased_air_dust.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/sky_nishita_default.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/sky_nishita_increased_disk_ozone.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/sky_nishita_no_disk_high_altitude.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/sky_preetham.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/voronoi_distace_to_edge.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/voronoi_distace_to_edge_fractal.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/voronoi_f1.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/voronoi_f1_fractal.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/voronoi_f2.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/voronoi_f2_fractal.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/voronoi_n_sphere_radius.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/voronoi_smooth_f1.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/voronoi_smooth_f1_fractal.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/wave_bands_saw.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/wave_bands_sine.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/wave_bands_triangle.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/wave_rings_saw.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/wave_rings_sine.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/wave_rings_triangle.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/white_noise_1spp.png (100%) rename tests/files/render/texture/{eevee_next_renders => eevee_renders}/white_noise_256spp.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/camera_in_volume_camera_and_volume.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/camera_in_volume_camera_only.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/camera_in_volume_nested.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/camera_in_volume_simple.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/implicit_volume.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/overlapping_different_anisotropy.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/principled_absorption.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/principled_bsdf_interior.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_absobtion.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_deep_stack.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_edge_fireflies.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_output_absorption.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_output_mix_volume.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_output_scatter.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_output_surface.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_overlap.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_scatter.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_scatter_albedo.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_scatter_draine.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_scatter_fournier-forand.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_scatter_mie.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_scatter_mie_small_particles.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_scatter_rayleigh.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_step_offset.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_transparent_shadow.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/volume_zero_extinction_channel.png (100%) rename tests/files/render/volume/{eevee_next_renders => eevee_renders}/world_volume.png (100%) diff --git a/scripts/addons_core/hydra_storm/ui.py b/scripts/addons_core/hydra_storm/ui.py index 823acb5ec58..a33de401252 100644 --- a/scripts/addons_core/hydra_storm/ui.py +++ b/scripts/addons_core/hydra_storm/ui.py @@ -245,7 +245,6 @@ def get_panels(): 'EEVEE_MATERIAL_PT_context_material', 'EEVEE_MATERIAL_PT_surface', 'EEVEE_MATERIAL_PT_volume', - # TODO: move to `EEVEE_NEXT_MATERIAL_PT_settings`. 'EEVEE_MATERIAL_PT_settings', 'EEVEE_WORLD_PT_surface', } @@ -259,8 +258,7 @@ def get_panels(): 'BLENDER_RENDER' in compat_engines and panel_cls.__name__ not in exclude_panels ) or ( - # NOTE: once `EEVEE_NEXT_MATERIAL_PT_settings` has been removed, `BLENDER_EEVEE` can be removed too. - ('BLENDER_EEVEE' in compat_engines or 'BLENDER_EEVEE_NEXT' in compat_engines) and + 'BLENDER_EEVEE' in compat_engines and panel_cls.__name__ in include_eevee_panels ) ): diff --git a/scripts/startup/bl_operators/image_as_planes.py b/scripts/startup/bl_operators/image_as_planes.py index 7df92c5861f..53ec36d80d0 100644 --- a/scripts/startup/bl_operators/image_as_planes.py +++ b/scripts/startup/bl_operators/image_as_planes.py @@ -37,7 +37,7 @@ from bpy_extras.io_utils import ImportHelper # ----------------------------------------------------------------------------- # Constants -COMPATIBLE_ENGINES = {'CYCLES', 'BLENDER_EEVEE_NEXT', 'BLENDER_WORKBENCH'} +COMPATIBLE_ENGINES = {'CYCLES', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'} # ----------------------------------------------------------------------------- # Image loading diff --git a/scripts/startup/bl_operators/presets.py b/scripts/startup/bl_operators/presets.py index 7849c094e2a..31bb419b145 100644 --- a/scripts/startup/bl_operators/presets.py +++ b/scripts/startup/bl_operators/presets.py @@ -565,7 +565,7 @@ class AddPresetEEVEERaytracing(AddPresetBase, Operator): """Add or remove an EEVEE ray-tracing preset""" bl_idname = "render.eevee_raytracing_preset_add" bl_label = "Add Raytracing Preset" - preset_menu = "RENDER_PT_eevee_next_raytracing_presets" + preset_menu = "RENDER_PT_eevee_raytracing_presets" preset_defines = [ "eevee = bpy.context.scene.eevee", diff --git a/scripts/startup/bl_ui/node_add_menu_shader.py b/scripts/startup/bl_ui/node_add_menu_shader.py index e42e5ed5aab..02b1f4934cc 100644 --- a/scripts/startup/bl_ui/node_add_menu_shader.py +++ b/scripts/startup/bl_ui/node_add_menu_shader.py @@ -35,7 +35,7 @@ def cycles_shader_nodes_poll(context): def eevee_shader_nodes_poll(context): - return context.engine == 'BLENDER_EEVEE_NEXT' + return context.engine == 'BLENDER_EEVEE' def object_not_eevee_shader_nodes_poll(context): diff --git a/scripts/startup/bl_ui/properties_data_camera.py b/scripts/startup/bl_ui/properties_data_camera.py index 58b793b42ac..4fd5f01107d 100644 --- a/scripts/startup/bl_ui/properties_data_camera.py +++ b/scripts/startup/bl_ui/properties_data_camera.py @@ -28,7 +28,7 @@ class CAMERA_PT_presets(PresetPanel, Panel): preset_add_operator = "camera.preset_add" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -40,7 +40,7 @@ class CAMERA_PT_safe_areas_presets(PresetPanel, Panel): preset_add_operator = "camera.safe_areas_preset_add" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -50,7 +50,7 @@ class DATA_PT_context_camera(CameraButtonsPanel, Panel): bl_options = {'HIDE_HEADER'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -72,7 +72,7 @@ class DATA_PT_lens(CameraButtonsPanel, Panel): bl_translation_context = i18n_contexts.id_camera COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -130,7 +130,7 @@ class DATA_PT_lens(CameraButtonsPanel, Panel): sub = col.column(align=True) sub.prop(cam, "central_cylindrical_radius", text="Cylinder Radius") - elif engine in {'BLENDER_RENDER', 'BLENDER_EEVEE_NEXT', 'BLENDER_WORKBENCH'}: + elif engine in {'BLENDER_RENDER', 'BLENDER_EEVEE', 'BLENDER_WORKBENCH'}: if cam.lens_unit == 'MILLIMETERS': col.prop(cam, "lens") elif cam.lens_unit == 'FOV': @@ -167,7 +167,7 @@ class DATA_PT_camera_stereoscopy(CameraButtonsPanel, Panel): bl_label = "Stereoscopy" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -219,7 +219,7 @@ class DATA_PT_camera(CameraButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -252,7 +252,7 @@ class DATA_PT_camera_dof(CameraButtonsPanel, Panel): bl_label = "Depth of Field" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -289,7 +289,7 @@ class DATA_PT_camera_dof_aperture(CameraButtonsPanel, Panel): bl_label = "Aperture" bl_parent_id = "DATA_PT_camera_dof" COMPAT_ENGINES = { - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -317,7 +317,7 @@ class DATA_PT_camera_background_image(CameraButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -430,7 +430,7 @@ class DATA_PT_camera_display(CameraButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -467,7 +467,7 @@ class DATA_PT_camera_display_composition_guides(CameraButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -498,7 +498,7 @@ class DATA_PT_camera_safe_areas(CameraButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -532,7 +532,7 @@ class DATA_PT_camera_safe_areas_center_cut(CameraButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -560,7 +560,7 @@ class DATA_PT_camera_safe_areas_center_cut(CameraButtonsPanel, Panel): class DATA_PT_camera_animation(CameraButtonsPanel, PropertiesAnimationMixin, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _animated_id_context_property = "camera" @@ -569,7 +569,7 @@ class DATA_PT_camera_animation(CameraButtonsPanel, PropertiesAnimationMixin, Pro class DATA_PT_custom_props_camera(CameraButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _context_path = "object.data" diff --git a/scripts/startup/bl_ui/properties_data_curves.py b/scripts/startup/bl_ui/properties_data_curves.py index 234355e8705..a9d5637aebc 100644 --- a/scripts/startup/bl_ui/properties_data_curves.py +++ b/scripts/startup/bl_ui/properties_data_curves.py @@ -24,7 +24,7 @@ class DATA_PT_context_curves(DataButtonsPanel, Panel): bl_options = {'HIDE_HEADER'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -45,7 +45,7 @@ class DATA_PT_curves_surface(DataButtonsPanel, Panel): bl_label = "Surface" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -153,7 +153,7 @@ class DATA_PT_CURVES_attributes(DataButtonsPanel, Panel): bl_label = "Attributes" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -186,7 +186,7 @@ class DATA_PT_CURVES_attributes(DataButtonsPanel, Panel): class DATA_PT_curves_animation(DataButtonsPanel, PropertiesAnimationMixin, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _animated_id_context_property = "curves" @@ -195,7 +195,7 @@ class DATA_PT_curves_animation(DataButtonsPanel, PropertiesAnimationMixin, Prope class DATA_PT_custom_props_curves(DataButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _context_path = "object.data" diff --git a/scripts/startup/bl_ui/properties_data_light.py b/scripts/startup/bl_ui/properties_data_light.py index e3f49f61800..492559f9185 100644 --- a/scripts/startup/bl_ui/properties_data_light.py +++ b/scripts/startup/bl_ui/properties_data_light.py @@ -25,7 +25,7 @@ class DATA_PT_context_light(DataButtonsPanel, Panel): bl_options = {'HIDE_HEADER'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -47,7 +47,7 @@ class DATA_PT_preview(DataButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', } def draw(self, context): @@ -74,7 +74,7 @@ class DATA_PT_light(DataButtonsPanel, Panel): class DATA_PT_EEVEE_light(DataButtonsPanel, Panel): bl_label = "Light" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -141,7 +141,7 @@ class DATA_PT_EEVEE_light_distance(DataButtonsPanel, Panel): bl_label = "Custom Distance" bl_parent_id = "DATA_PT_EEVEE_light" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -169,7 +169,7 @@ class DATA_PT_EEVEE_light_shadow(DataButtonsPanel, Panel): bl_label = "Shadow" bl_parent_id = "DATA_PT_EEVEE_light" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw_header(self, context): light = context.light @@ -203,7 +203,7 @@ class DATA_PT_EEVEE_light_influence(DataButtonsPanel, Panel): bl_label = "Influence" bl_parent_id = "DATA_PT_EEVEE_light" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -235,7 +235,7 @@ class DATA_PT_spot(DataButtonsPanel, Panel): bl_parent_id = "DATA_PT_EEVEE_light" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -262,7 +262,7 @@ class DATA_PT_spot(DataButtonsPanel, Panel): class DATA_PT_light_animation(DataButtonsPanel, PropertiesAnimationMixin, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -287,7 +287,7 @@ class DATA_PT_light_animation(DataButtonsPanel, PropertiesAnimationMixin, Proper class DATA_PT_custom_props_light(DataButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _context_path = "object.data" diff --git a/scripts/startup/bl_ui/properties_data_lightprobe.py b/scripts/startup/bl_ui/properties_data_lightprobe.py index a36ac8e23df..0c7222b0c9c 100644 --- a/scripts/startup/bl_ui/properties_data_lightprobe.py +++ b/scripts/startup/bl_ui/properties_data_lightprobe.py @@ -23,7 +23,7 @@ class DATA_PT_context_lightprobe(DataButtonsPanel, Panel): bl_options = {'HIDE_HEADER'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT' + 'BLENDER_EEVEE' } def draw(self, context): @@ -86,9 +86,9 @@ class DATA_PT_lightprobe(DataButtonsPanel, Panel): sub.prop(probe, "clip_end", text="End", text_ctxt=i18n_contexts.id_camera) -class DATA_PT_lightprobe_eevee_next(DataButtonsPanel, Panel): +class DATA_PT_lightprobe_eevee(DataButtonsPanel, Panel): bl_label = "Probe" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -163,7 +163,7 @@ class DATA_PT_lightprobe_visibility(DataButtonsPanel, Panel): class DATA_PT_lightprobe_capture(DataButtonsPanel, Panel): bl_label = "Capture" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -188,7 +188,7 @@ class DATA_PT_lightprobe_capture(DataButtonsPanel, Panel): class DATA_PT_lightprobe_bake(DataButtonsPanel, Panel): bl_label = "Bake" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -209,7 +209,7 @@ class DATA_PT_lightprobe_bake(DataButtonsPanel, Panel): class DATA_PT_lightprobe_bake_resolution(DataButtonsPanel, Panel): bl_label = "Resolution" bl_parent_id = "DATA_PT_lightprobe_bake" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -232,7 +232,7 @@ class DATA_PT_lightprobe_bake_resolution(DataButtonsPanel, Panel): class DATA_PT_lightprobe_bake_capture(DataButtonsPanel, Panel): bl_label = "Capture" bl_parent_id = "DATA_PT_lightprobe_bake" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -255,7 +255,7 @@ class DATA_PT_lightprobe_bake_offset(DataButtonsPanel, Panel): bl_label = "Offset" bl_parent_id = "DATA_PT_lightprobe_bake_capture" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -273,7 +273,7 @@ class DATA_PT_lightprobe_bake_clamping(DataButtonsPanel, Panel): bl_label = "Clamping" bl_parent_id = "DATA_PT_lightprobe_bake_capture" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -292,7 +292,7 @@ class DATA_PT_lightprobe_parallax(DataButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', } @classmethod @@ -350,10 +350,10 @@ class DATA_PT_lightprobe_display(DataButtonsPanel, Panel): sub.prop(probe, "show_parallax") -class DATA_PT_lightprobe_display_eevee_next(DataButtonsPanel, Panel): +class DATA_PT_lightprobe_display_eevee(DataButtonsPanel, Panel): bl_label = "Viewport Display" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -386,14 +386,14 @@ class DATA_PT_lightprobe_display_eevee_next(DataButtonsPanel, Panel): class DATA_PT_lightprobe_animation(DataButtonsPanel, PropertiesAnimationMixin, Panel): - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} _animated_id_context_property = "lightprobe" classes = ( DATA_PT_context_lightprobe, DATA_PT_lightprobe, - DATA_PT_lightprobe_eevee_next, + DATA_PT_lightprobe_eevee, DATA_PT_lightprobe_capture, DATA_PT_lightprobe_bake, DATA_PT_lightprobe_bake_resolution, @@ -403,7 +403,7 @@ classes = ( DATA_PT_lightprobe_visibility, DATA_PT_lightprobe_parallax, DATA_PT_lightprobe_display, - DATA_PT_lightprobe_display_eevee_next, + DATA_PT_lightprobe_display_eevee, DATA_PT_lightprobe_animation, ) diff --git a/scripts/startup/bl_ui/properties_data_mesh.py b/scripts/startup/bl_ui/properties_data_mesh.py index e6619599318..97776dd4953 100644 --- a/scripts/startup/bl_ui/properties_data_mesh.py +++ b/scripts/startup/bl_ui/properties_data_mesh.py @@ -146,7 +146,7 @@ class DATA_PT_context_mesh(MeshButtonsPanel, Panel): bl_options = {'HIDE_HEADER'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -168,7 +168,7 @@ class DATA_PT_texture_space(MeshButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -192,7 +192,7 @@ class DATA_PT_vertex_groups(MeshButtonsPanel, Panel): bl_label = "Vertex Groups" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -259,7 +259,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel): bl_label = "Shape Keys" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -357,7 +357,7 @@ class DATA_PT_uv_texture(MeshButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -383,7 +383,7 @@ class DATA_PT_remesh(MeshButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -415,7 +415,7 @@ class DATA_PT_customdata(MeshButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -439,7 +439,7 @@ class DATA_PT_customdata(MeshButtonsPanel, Panel): class DATA_PT_mesh_animation(MeshButtonsPanel, PropertiesAnimationMixin, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -464,7 +464,7 @@ class DATA_PT_mesh_animation(MeshButtonsPanel, PropertiesAnimationMixin, Propert class DATA_PT_custom_props_mesh(MeshButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _context_path = "object.data" @@ -524,7 +524,7 @@ class DATA_PT_mesh_attributes(MeshButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -662,7 +662,7 @@ class DATA_PT_vertex_colors(MeshButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } diff --git a/scripts/startup/bl_ui/properties_data_pointcloud.py b/scripts/startup/bl_ui/properties_data_pointcloud.py index deb3bd697db..e02f7ea4d3c 100644 --- a/scripts/startup/bl_ui/properties_data_pointcloud.py +++ b/scripts/startup/bl_ui/properties_data_pointcloud.py @@ -23,7 +23,7 @@ class DATA_PT_context_pointcloud(DataButtonsPanel, Panel): bl_options = {'HIDE_HEADER'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -120,7 +120,7 @@ class DATA_PT_pointcloud_attributes(DataButtonsPanel, Panel): bl_label = "Attributes" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -153,7 +153,7 @@ class DATA_PT_pointcloud_attributes(DataButtonsPanel, Panel): class DATA_PT_custom_props_pointcloud(DataButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _context_path = "object.data" diff --git a/scripts/startup/bl_ui/properties_data_speaker.py b/scripts/startup/bl_ui/properties_data_speaker.py index d626f769940..d262b46f7d2 100644 --- a/scripts/startup/bl_ui/properties_data_speaker.py +++ b/scripts/startup/bl_ui/properties_data_speaker.py @@ -24,7 +24,7 @@ class DATA_PT_context_speaker(DataButtonsPanel, Panel): bl_options = {'HIDE_HEADER'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -45,7 +45,7 @@ class DATA_PT_speaker(DataButtonsPanel, Panel): bl_label = "Sound" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -71,7 +71,7 @@ class DATA_PT_distance(DataButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -99,7 +99,7 @@ class DATA_PT_cone(DataButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -125,7 +125,7 @@ class DATA_PT_cone(DataButtonsPanel, Panel): class DATA_PT_speaker_animation(DataButtonsPanel, PropertiesAnimationMixin, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _animated_id_context_property = "speaker" @@ -134,7 +134,7 @@ class DATA_PT_speaker_animation(DataButtonsPanel, PropertiesAnimationMixin, Prop class DATA_PT_custom_props_speaker(DataButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _context_path = "object.data" diff --git a/scripts/startup/bl_ui/properties_data_volume.py b/scripts/startup/bl_ui/properties_data_volume.py index f1f80eb01b5..00f4af7792a 100644 --- a/scripts/startup/bl_ui/properties_data_volume.py +++ b/scripts/startup/bl_ui/properties_data_volume.py @@ -24,7 +24,7 @@ class DATA_PT_context_volume(DataButtonsPanel, Panel): bl_options = {'HIDE_HEADER'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -45,7 +45,7 @@ class DATA_PT_volume_file(DataButtonsPanel, Panel): bl_label = "OpenVDB File" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -94,7 +94,7 @@ class DATA_PT_volume_grids(DataButtonsPanel, Panel): bl_label = "Grids" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -111,7 +111,7 @@ class DATA_PT_volume_render(DataButtonsPanel, Panel): bl_label = "Render" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -147,7 +147,7 @@ class DATA_PT_volume_viewport_display(DataButtonsPanel, Panel): bl_label = "Viewport Display" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -175,7 +175,7 @@ class DATA_PT_volume_viewport_display_slicing(DataButtonsPanel, Panel): bl_parent_id = "DATA_PT_volume_viewport_display" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -205,7 +205,7 @@ class DATA_PT_volume_viewport_display_slicing(DataButtonsPanel, Panel): class DATA_PT_volume_animation(DataButtonsPanel, PropertiesAnimationMixin, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _animated_id_context_property = "volume" @@ -214,7 +214,7 @@ class DATA_PT_volume_animation(DataButtonsPanel, PropertiesAnimationMixin, Prope class DATA_PT_custom_props_volume(DataButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _context_path = "object.data" diff --git a/scripts/startup/bl_ui/properties_freestyle.py b/scripts/startup/bl_ui/properties_freestyle.py index d0fe93e3726..92cbd3fd354 100644 --- a/scripts/startup/bl_ui/properties_freestyle.py +++ b/scripts/startup/bl_ui/properties_freestyle.py @@ -27,7 +27,7 @@ class RENDER_PT_freestyle(RenderFreestyleButtonsPanel, Panel): bl_order = 10 COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -89,7 +89,7 @@ class ViewLayerFreestyleLineStyle(ViewLayerFreestyleEditorButtonsPanel): # Freestyle Linestyle Panels COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -137,7 +137,7 @@ class VIEWLAYER_PT_freestyle(ViewLayerFreestyleButtonsPanel, Panel): bl_label = "Freestyle" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -171,7 +171,7 @@ class VIEWLAYER_PT_freestyle_edge_detection(ViewLayerFreestyleButtonsPanel, Pane bl_parent_id = "VIEWLAYER_PT_freestyle" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -205,7 +205,7 @@ class VIEWLAYER_PT_freestyle_style_modules(ViewLayerFreestyleButtonsPanel, Panel bl_parent_id = "VIEWLAYER_PT_freestyle" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -245,7 +245,7 @@ class VIEWLAYER_PT_freestyle_lineset(ViewLayerFreestyleEditorButtonsPanel, Panel bl_label = "Freestyle Line Set" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -312,7 +312,7 @@ class VIEWLAYER_PT_freestyle_lineset_visibilty(ViewLayerFreestyleLineStyle, Pane bl_parent_id = "VIEWLAYER_PT_freestyle_lineset" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -350,7 +350,7 @@ class VIEWLAYER_PT_freestyle_lineset_edgetype(ViewLayerFreestyleLineStyle, Panel bl_parent_id = "VIEWLAYER_PT_freestyle_lineset" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -404,7 +404,7 @@ class VIEWLAYER_PT_freestyle_lineset_facemarks(ViewLayerFreestyleLineStyle, Pane bl_parent_id = "VIEWLAYER_PT_freestyle_lineset" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } bl_options = {'DEFAULT_CLOSED'} @@ -437,7 +437,7 @@ class VIEWLAYER_PT_freestyle_lineset_collection(ViewLayerFreestyleLineStyle, Pan bl_parent_id = "VIEWLAYER_PT_freestyle_lineset" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } bl_options = {'DEFAULT_CLOSED'} @@ -1259,7 +1259,7 @@ class VIEWLAYER_PT_freestyle_animation(ViewLayerFreestyleButtonsPanel, Propertie bl_label = "Freestyle Animation" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1297,7 +1297,7 @@ class MATERIAL_PT_freestyle_line(MaterialFreestyleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } diff --git a/scripts/startup/bl_ui/properties_material.py b/scripts/startup/bl_ui/properties_material.py index 64f1be77bc8..12e41789cac 100644 --- a/scripts/startup/bl_ui/properties_material.py +++ b/scripts/startup/bl_ui/properties_material.py @@ -60,7 +60,7 @@ class MaterialButtonsPanel: class MATERIAL_PT_preview(MaterialButtonsPanel, Panel): bl_label = "Preview" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): self.layout.template_preview(context.material) @@ -69,7 +69,7 @@ class MATERIAL_PT_preview(MaterialButtonsPanel, Panel): class MATERIAL_PT_custom_props(MaterialButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _context_path = "material" @@ -81,7 +81,7 @@ class EEVEE_MATERIAL_PT_context_material(MaterialButtonsPanel, Panel): bl_context = "material" bl_options = {'HIDE_HEADER'} COMPAT_ENGINES = { - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -166,7 +166,7 @@ def panel_node_draw(layout, ntree, _output_type, input_name): class EEVEE_MATERIAL_PT_surface(MaterialButtonsPanel, Panel): bl_label = "Surface" bl_context = "material" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -190,7 +190,7 @@ class EEVEE_MATERIAL_PT_volume(MaterialButtonsPanel, Panel): bl_translation_context = i18n_contexts.id_id bl_context = "material" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -212,7 +212,7 @@ class EEVEE_MATERIAL_PT_displacement(MaterialButtonsPanel, Panel): bl_label = "Displacement" bl_context = "material" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -235,7 +235,7 @@ class EEVEE_MATERIAL_PT_thickness(MaterialButtonsPanel, Panel): bl_translation_context = i18n_contexts.id_material bl_context = "material" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -304,16 +304,6 @@ def draw_material_settings(self, context): draw_material_volume_settings(layout, mat, False) -# TODO: used by `./scripts/addons_core/hydra_storm/ui.py`, move to `EEVEE_NEXT_MATERIAL_PT_settings`. -class EEVEE_MATERIAL_PT_settings(MaterialButtonsPanel, Panel): - bl_label = "Settings" - bl_context = "material" - COMPAT_ENGINES = {'BLENDER_EEVEE'} - - def draw(self, context): - draw_material_settings(self, context) - - class EEVEE_MATERIAL_PT_viewport_settings(MaterialButtonsPanel, Panel): bl_label = "Settings" bl_context = "material" @@ -324,10 +314,10 @@ class EEVEE_MATERIAL_PT_viewport_settings(MaterialButtonsPanel, Panel): draw_material_settings(self, context) -class EEVEE_NEXT_MATERIAL_PT_settings(MaterialButtonsPanel, Panel): +class EEVEE_MATERIAL_PT_settings(MaterialButtonsPanel, Panel): bl_label = "Settings" bl_context = "material" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -339,11 +329,11 @@ class EEVEE_NEXT_MATERIAL_PT_settings(MaterialButtonsPanel, Panel): layout.prop(mat, "pass_index") -class EEVEE_NEXT_MATERIAL_PT_settings_surface(MaterialButtonsPanel, Panel): +class EEVEE_MATERIAL_PT_settings_surface(MaterialButtonsPanel, Panel): bl_label = "Surface" bl_context = "material" - bl_parent_id = "EEVEE_NEXT_MATERIAL_PT_settings" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + bl_parent_id = "EEVEE_MATERIAL_PT_settings" + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -355,11 +345,11 @@ class EEVEE_NEXT_MATERIAL_PT_settings_surface(MaterialButtonsPanel, Panel): draw_material_surface_settings(layout, mat) -class EEVEE_NEXT_MATERIAL_PT_settings_volume(MaterialButtonsPanel, Panel): +class EEVEE_MATERIAL_PT_settings_volume(MaterialButtonsPanel, Panel): bl_label = "Volume" bl_context = "material" - bl_parent_id = "EEVEE_NEXT_MATERIAL_PT_settings" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + bl_parent_id = "EEVEE_MATERIAL_PT_settings" + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -434,7 +424,7 @@ class MATERIAL_PT_lineart(MaterialButtonsPanel, Panel): class MATERIAL_PT_animation(MaterialButtonsPanel, Panel, PropertiesAnimationMixin): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -466,9 +456,8 @@ classes = ( EEVEE_MATERIAL_PT_displacement, EEVEE_MATERIAL_PT_thickness, EEVEE_MATERIAL_PT_settings, - EEVEE_NEXT_MATERIAL_PT_settings, - EEVEE_NEXT_MATERIAL_PT_settings_surface, - EEVEE_NEXT_MATERIAL_PT_settings_volume, + EEVEE_MATERIAL_PT_settings_surface, + EEVEE_MATERIAL_PT_settings_volume, MATERIAL_PT_lineart, MATERIAL_PT_viewport, EEVEE_MATERIAL_PT_viewport_settings, diff --git a/scripts/startup/bl_ui/properties_object.py b/scripts/startup/bl_ui/properties_object.py index 1fc8c5874db..0e3be9551bf 100644 --- a/scripts/startup/bl_ui/properties_object.py +++ b/scripts/startup/bl_ui/properties_object.py @@ -379,7 +379,7 @@ class OBJECT_PT_visibility(ObjectButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -400,7 +400,7 @@ class OBJECT_PT_visibility(ObjectButtonsPanel, Panel): col.prop(ob, "hide_viewport", text="Viewports", toggle=False, invert_checkbox=True) col.prop(ob, "hide_render", text="Renders", toggle=False, invert_checkbox=True) - if context.engine == 'BLENDER_EEVEE_NEXT': + if context.engine == 'BLENDER_EEVEE': if ob.type in {'MESH', 'CURVE', 'SURFACE', 'META', 'FONT', 'CURVES', 'POINTCLOUD', 'VOLUME'}: layout.separator() col = layout.column(heading="Ray Visibility") @@ -454,7 +454,7 @@ class OBJECT_PT_shading(ObjectButtonsPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', } @classmethod @@ -564,7 +564,7 @@ class OBJECT_PT_shadow_terminator(ObjectButtonsPanel, Panel): bl_parent_id = "OBJECT_PT_shading" bl_context = "object" COMPAT_ENGINES = { - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'CYCLES', } @@ -579,12 +579,12 @@ class OBJECT_PT_shadow_terminator(ObjectButtonsPanel, Panel): flow = layout.grid_flow(row_major=False, columns=0, even_columns=True, even_rows=False, align=True) ob = context.object - if context.engine == 'BLENDER_EEVEE_NEXT': + if context.engine == 'BLENDER_EEVEE': flow.prop(ob, "shadow_terminator_normal_offset", text="Normal Offset") flow.prop(ob, "shadow_terminator_geometry_offset", text="Geometry Offset") - if context.engine != 'BLENDER_EEVEE_NEXT': + if context.engine != 'BLENDER_EEVEE': flow.prop(ob, "shadow_terminator_shading_offset", text="Shading Offset") diff --git a/scripts/startup/bl_ui/properties_output.py b/scripts/startup/bl_ui/properties_output.py index adc5b4bde2f..75f972085c0 100644 --- a/scripts/startup/bl_ui/properties_output.py +++ b/scripts/startup/bl_ui/properties_output.py @@ -54,7 +54,7 @@ class RENDER_PT_format(RenderOutputButtonsPanel, Panel): bl_label = "Format" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -136,7 +136,7 @@ class RENDER_PT_frame_range(RenderOutputButtonsPanel, Panel): bl_label = "Frame Range" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -159,7 +159,7 @@ class RENDER_PT_time_stretching(RenderOutputButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -180,7 +180,7 @@ class RENDER_PT_post_processing(RenderOutputButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -202,7 +202,7 @@ class RENDER_PT_stamp(RenderOutputButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -240,7 +240,7 @@ class RENDER_PT_stamp_note(RenderOutputButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -264,7 +264,7 @@ class RENDER_PT_stamp_burn(RenderOutputButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -292,7 +292,7 @@ class RENDER_PT_output(RenderOutputButtonsPanel, Panel): bl_label = "Output" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -325,7 +325,7 @@ class RENDER_PT_output_views(RenderOutputButtonsPanel, Panel): bl_parent_id = "RENDER_PT_output" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -349,7 +349,7 @@ class RENDER_PT_output_color_management(RenderOutputButtonsPanel, Panel): bl_parent_id = "RENDER_PT_output" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -390,7 +390,7 @@ class RENDER_PT_output_pixel_density(RenderOutputButtonsPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', 'BLENDER_EEVEE', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -465,7 +465,7 @@ class RENDER_PT_encoding(RenderOutputButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -494,7 +494,7 @@ class RENDER_PT_encoding_video(RenderOutputButtonsPanel, Panel): bl_parent_id = "RENDER_PT_encoding" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -595,7 +595,7 @@ class RENDER_PT_encoding_audio(RenderOutputButtonsPanel, Panel): bl_parent_id = "RENDER_PT_encoding" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -641,7 +641,7 @@ class RENDER_PT_stereoscopy(RenderOutputButtonsPanel, Panel): bl_label = "Stereoscopy" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } bl_options = {'DEFAULT_CLOSED'} diff --git a/scripts/startup/bl_ui/properties_particle.py b/scripts/startup/bl_ui/properties_particle.py index 4558f9bbcbb..25666cce5fd 100644 --- a/scripts/startup/bl_ui/properties_particle.py +++ b/scripts/startup/bl_ui/properties_particle.py @@ -63,7 +63,7 @@ class PARTICLE_MT_context_menu(Menu): bl_label = "Particle Specials" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -105,7 +105,7 @@ class PARTICLE_PT_hair_dynamics_presets(PresetPanel, Panel): preset_add_operator = "particle.hair_dynamics_preset_add" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -163,7 +163,7 @@ class PARTICLE_PT_context_particles(ParticleButtonsPanel, Panel): bl_options = {'HIDE_HEADER'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -263,7 +263,7 @@ class PARTICLE_PT_emission(ParticleButtonsPanel, Panel): bl_translation_context = i18n_contexts.id_particlesettings COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -319,7 +319,7 @@ class PARTICLE_PT_emission_source(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -360,7 +360,7 @@ class PARTICLE_PT_hair_dynamics(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -453,7 +453,7 @@ class PARTICLE_PT_hair_dynamics_collision(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -489,7 +489,7 @@ class PARTICLE_PT_hair_dynamics_structure(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -524,7 +524,7 @@ class PARTICLE_PT_hair_dynamics_volume(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -559,7 +559,7 @@ class PARTICLE_PT_cache(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -596,7 +596,7 @@ class PARTICLE_PT_velocity(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -649,7 +649,7 @@ class PARTICLE_PT_rotation(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -708,7 +708,7 @@ class PARTICLE_PT_rotation_angular_velocity(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -737,7 +737,7 @@ class PARTICLE_PT_physics(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -794,7 +794,7 @@ class PARTICLE_PT_physics_fluid_advanced(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -843,7 +843,7 @@ class PARTICLE_PT_physics_fluid_springs(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -871,7 +871,7 @@ class PARTICLE_PT_physics_fluid_springs_viscoelastic(ParticleButtonsPanel, Panel bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -911,7 +911,7 @@ class PARTICLE_PT_physics_fluid_springs_advanced(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -939,7 +939,7 @@ class PARTICLE_PT_physics_boids_movement(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -996,7 +996,7 @@ class PARTICLE_PT_physics_boids_battle(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1027,7 +1027,7 @@ class PARTICLE_PT_physics_boids_misc(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1056,7 +1056,7 @@ class PARTICLE_PT_physics_relations(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1117,7 +1117,7 @@ class PARTICLE_PT_physics_fluid_interaction(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1164,7 +1164,7 @@ class PARTICLE_PT_physics_deflection(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1194,7 +1194,7 @@ class PARTICLE_PT_physics_forces(ParticleButtonsPanel, Panel): bl_parent_id = "PARTICLE_PT_physics" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1225,7 +1225,7 @@ class PARTICLE_PT_physics_integration(ParticleButtonsPanel, Panel): bl_parent_id = "PARTICLE_PT_physics" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1263,7 +1263,7 @@ class PARTICLE_PT_boidbrain(ParticleButtonsPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1367,7 +1367,7 @@ class PARTICLE_PT_render(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1418,7 +1418,7 @@ class PARTICLE_PT_render_extra(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1446,7 +1446,7 @@ class PARTICLE_PT_render_path(ParticleButtonsPanel, Panel): bl_parent_id = "PARTICLE_PT_render" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1472,7 +1472,7 @@ class PARTICLE_PT_render_path_timing(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1504,7 +1504,7 @@ class PARTICLE_PT_render_object(ParticleButtonsPanel, Panel): bl_parent_id = "PARTICLE_PT_render" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1533,7 +1533,7 @@ class PARTICLE_PT_render_collection(ParticleButtonsPanel, Panel): bl_parent_id = "PARTICLE_PT_render" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1567,7 +1567,7 @@ class PARTICLE_PT_render_collection_use_count(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1621,7 +1621,7 @@ class PARTICLE_PT_draw(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1684,7 +1684,7 @@ class PARTICLE_PT_children(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1741,7 +1741,7 @@ class PARTICLE_PT_children_parting(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1776,7 +1776,7 @@ class PARTICLE_PT_children_clumping(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1816,7 +1816,7 @@ class PARTICLE_PT_children_clumping_noise(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1844,7 +1844,7 @@ class PARTICLE_PT_children_roughness(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1889,7 +1889,7 @@ class PARTICLE_PT_children_kink(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1943,7 +1943,7 @@ class PARTICLE_PT_field_weights(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1968,7 +1968,7 @@ class PARTICLE_PT_force_fields(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1988,7 +1988,7 @@ class PARTICLE_PT_force_fields_type1(ParticleButtonsPanel, Panel): bl_parent_id = "PARTICLE_PT_force_fields" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -2009,7 +2009,7 @@ class PARTICLE_PT_force_fields_type2(ParticleButtonsPanel, Panel): bl_parent_id = "PARTICLE_PT_force_fields" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -2031,7 +2031,7 @@ class PARTICLE_PT_force_fields_type1_falloff(ParticleButtonsPanel, Panel): bl_parent_id = "PARTICLE_PT_force_fields_type1" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -2051,7 +2051,7 @@ class PARTICLE_PT_force_fields_type2_falloff(ParticleButtonsPanel, Panel): bl_parent_id = "PARTICLE_PT_force_fields_type2" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -2070,7 +2070,7 @@ class PARTICLE_PT_vertexgroups(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -2163,7 +2163,7 @@ class PARTICLE_PT_textures(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -2199,7 +2199,7 @@ class PARTICLE_PT_hair_shape(ParticleButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -2231,7 +2231,7 @@ class PARTICLE_PT_hair_shape(ParticleButtonsPanel, Panel): class PARTICLE_PT_animation(ParticleButtonsPanel, PropertiesAnimationMixin, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -2244,7 +2244,7 @@ class PARTICLE_PT_animation(ParticleButtonsPanel, PropertiesAnimationMixin, Prop class PARTICLE_PT_custom_props(ParticleButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _context_path = "particle_system.settings" diff --git a/scripts/startup/bl_ui/properties_physics_cloth.py b/scripts/startup/bl_ui/properties_physics_cloth.py index a49538a20c1..a0ad39f25b4 100644 --- a/scripts/startup/bl_ui/properties_physics_cloth.py +++ b/scripts/startup/bl_ui/properties_physics_cloth.py @@ -39,7 +39,7 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel, Panel): bl_label = "Cloth" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -68,7 +68,7 @@ class PHYSICS_PT_cloth_physical_properties(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_cloth" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -96,7 +96,7 @@ class PHYSICS_PT_cloth_stiffness(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_cloth_physical_properties" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -131,7 +131,7 @@ class PHYSICS_PT_cloth_damping(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_cloth_physical_properties" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -166,7 +166,7 @@ class PHYSICS_PT_cloth_internal_springs(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_cloth_physical_properties" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -212,7 +212,7 @@ class PHYSICS_PT_cloth_pressure(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_cloth_physical_properties" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -260,7 +260,7 @@ class PHYSICS_PT_cloth_cache(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -275,7 +275,7 @@ class PHYSICS_PT_cloth_shape(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -329,7 +329,7 @@ class PHYSICS_PT_cloth_collision(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -353,7 +353,7 @@ class PHYSICS_PT_cloth_object_collision(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_cloth_collision" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -393,7 +393,7 @@ class PHYSICS_PT_cloth_self_collision(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_cloth_collision" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -434,7 +434,7 @@ class PHYSICS_PT_cloth_property_weights(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -492,7 +492,7 @@ class PHYSICS_PT_cloth_field_weights(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } diff --git a/scripts/startup/bl_ui/properties_physics_common.py b/scripts/startup/bl_ui/properties_physics_common.py index 5d239c717a0..514f671df13 100644 --- a/scripts/startup/bl_ui/properties_physics_common.py +++ b/scripts/startup/bl_ui/properties_physics_common.py @@ -57,7 +57,7 @@ class PHYSICS_PT_add(PhysicButtonsPanel, Panel): bl_options = {'HIDE_HEADER'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } diff --git a/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/scripts/startup/bl_ui/properties_physics_dynamicpaint.py index 2022d1a438a..aba2d002386 100644 --- a/scripts/startup/bl_ui/properties_physics_dynamicpaint.py +++ b/scripts/startup/bl_ui/properties_physics_dynamicpaint.py @@ -88,7 +88,7 @@ class PHYSICS_PT_dynamic_paint(PhysicButtonsPanel, Panel): bl_label = "Dynamic Paint" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -113,7 +113,7 @@ class PHYSICS_PT_dynamic_paint_settings(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_dynamic_paint" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -201,7 +201,7 @@ class PHYSICS_PT_dp_surface_canvas(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_dynamic_paint" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -268,7 +268,7 @@ class PHYSICS_PT_dp_surface_canvas_paint_dry(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -309,7 +309,7 @@ class PHYSICS_PT_dp_surface_canvas_paint_dissolve(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -350,7 +350,7 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -430,7 +430,7 @@ class PHYSICS_PT_dp_canvas_output_paintmaps(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -464,7 +464,7 @@ class PHYSICS_PT_dp_canvas_output_wetmaps(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -498,7 +498,7 @@ class PHYSICS_PT_dp_canvas_initial_color(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -542,7 +542,7 @@ class PHYSICS_PT_dp_effects(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -563,7 +563,7 @@ class PHYSICS_PT_dp_effects_spread(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -602,7 +602,7 @@ class PHYSICS_PT_dp_effects_drip(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -642,7 +642,7 @@ class PHYSICS_PT_dp_effects_drip_weights(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -670,7 +670,7 @@ class PHYSICS_PT_dp_effects_shrink(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -704,7 +704,7 @@ class PHYSICS_PT_dp_cache(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -728,7 +728,7 @@ class PHYSICS_PT_dp_brush_source(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_dynamic_paint" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -795,7 +795,7 @@ class PHYSICS_PT_dp_brush_source_color_ramp(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_dp_brush_source" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -828,7 +828,7 @@ class PHYSICS_PT_dp_brush_velocity(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -863,7 +863,7 @@ class PHYSICS_PT_dp_brush_velocity_color_ramp(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -888,7 +888,7 @@ class PHYSICS_PT_dp_brush_velocity_smudge(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -920,7 +920,7 @@ class PHYSICS_PT_dp_brush_wave(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } diff --git a/scripts/startup/bl_ui/properties_physics_field.py b/scripts/startup/bl_ui/properties_physics_field.py index c68f7aa9a07..305790ba126 100644 --- a/scripts/startup/bl_ui/properties_physics_field.py +++ b/scripts/startup/bl_ui/properties_physics_field.py @@ -34,7 +34,7 @@ class PHYSICS_PT_field(PhysicButtonsPanel, Panel): bl_label = "Force Fields" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -60,7 +60,7 @@ class PHYSICS_PT_field_settings(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_field" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -151,7 +151,7 @@ class PHYSICS_PT_field_settings_kink(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_field_settings" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -189,7 +189,7 @@ class PHYSICS_PT_field_settings_texture_select(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_field_settings" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -215,7 +215,7 @@ class PHYSICS_PT_field_falloff(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_field" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -244,7 +244,7 @@ class PHYSICS_PT_field_falloff_angular(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_field_falloff" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -287,7 +287,7 @@ class PHYSICS_PT_field_falloff_radial(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_field_falloff" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -335,7 +335,7 @@ class PHYSICS_PT_collision(PhysicButtonsPanel, Panel): bl_label = "Collision" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -370,7 +370,7 @@ class PHYSICS_PT_collision_particle(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_collision" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -420,7 +420,7 @@ class PHYSICS_PT_collision_softbody(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_collision" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } diff --git a/scripts/startup/bl_ui/properties_physics_fluid.py b/scripts/startup/bl_ui/properties_physics_fluid.py index 9c767d80121..58073176460 100644 --- a/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/scripts/startup/bl_ui/properties_physics_fluid.py @@ -101,7 +101,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel): bl_label = "Fluid" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -129,7 +129,7 @@ class PHYSICS_PT_settings(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_fluid" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -296,7 +296,7 @@ class PHYSICS_PT_borders(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_settings" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -333,7 +333,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_fluid" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -371,7 +371,7 @@ class PHYSICS_PT_smoke_dissolve(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -419,7 +419,7 @@ class PHYSICS_PT_fire(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -462,7 +462,7 @@ class PHYSICS_PT_liquid(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_fluid" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -529,7 +529,7 @@ class PHYSICS_PT_flow_source(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -574,7 +574,7 @@ class PHYSICS_PT_flow_initial_velocity(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_settings" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -620,7 +620,7 @@ class PHYSICS_PT_flow_texture(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -675,7 +675,7 @@ class PHYSICS_PT_adaptive_domain(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -731,7 +731,7 @@ class PHYSICS_PT_noise(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -815,7 +815,7 @@ class PHYSICS_PT_mesh(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -914,7 +914,7 @@ class PHYSICS_PT_particles(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1050,7 +1050,7 @@ class PHYSICS_PT_diffusion(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1101,7 +1101,7 @@ class PHYSICS_PT_viscosity(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1145,7 +1145,7 @@ class PHYSICS_PT_guide(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1215,7 +1215,7 @@ class PHYSICS_PT_collections(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1246,7 +1246,7 @@ class PHYSICS_PT_cache(PhysicButtonsPanel, Panel): bl_parent_id = "PHYSICS_PT_fluid" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1323,7 +1323,7 @@ class PHYSICS_PT_export(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1379,7 +1379,7 @@ class PHYSICS_PT_field_weights(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1572,7 +1572,7 @@ class PHYSICS_PT_fluid_domain_render(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } diff --git a/scripts/startup/bl_ui/properties_physics_rigidbody.py b/scripts/startup/bl_ui/properties_physics_rigidbody.py index fcff2205dbf..b4d468c6df1 100644 --- a/scripts/startup/bl_ui/properties_physics_rigidbody.py +++ b/scripts/startup/bl_ui/properties_physics_rigidbody.py @@ -23,7 +23,7 @@ class PHYSICS_PT_rigid_body(PHYSICS_PT_rigidbody_panel, Panel): bl_label = "Rigid Body" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -62,7 +62,7 @@ class PHYSICS_PT_rigid_body_settings(PHYSICS_PT_rigidbody_panel, Panel): bl_parent_id = "PHYSICS_PT_rigid_body" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -98,7 +98,7 @@ class PHYSICS_PT_rigid_body_collisions(PHYSICS_PT_rigidbody_panel, Panel): bl_parent_id = "PHYSICS_PT_rigid_body" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -152,7 +152,7 @@ class PHYSICS_PT_rigid_body_collisions_surface(PHYSICS_PT_rigidbody_panel, Panel bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -184,7 +184,7 @@ class PHYSICS_PT_rigid_body_collisions_sensitivity(PHYSICS_PT_rigidbody_panel, P bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -225,7 +225,7 @@ class PHYSICS_PT_rigid_body_collisions_collections(PHYSICS_PT_rigidbody_panel, P bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -251,7 +251,7 @@ class PHYSICS_PT_rigid_body_dynamics(PHYSICS_PT_rigidbody_panel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -290,7 +290,7 @@ class PHYSICS_PT_rigid_body_dynamics_deactivation(PHYSICS_PT_rigidbody_panel, Pa bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } diff --git a/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py b/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py index 28d4368f059..f041b3e1787 100644 --- a/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py +++ b/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py @@ -17,7 +17,7 @@ class PHYSICS_PT_rigid_body_constraint(PHYSICS_PT_rigidbody_constraint_panel, Pa bl_label = "Rigid Body Constraint" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -41,7 +41,7 @@ class PHYSICS_PT_rigid_body_constraint_settings(PHYSICS_PT_rigidbody_constraint_ bl_parent_id = "PHYSICS_PT_rigid_body_constraint" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -76,7 +76,7 @@ class PHYSICS_PT_rigid_body_constraint_objects(PHYSICS_PT_rigidbody_constraint_p bl_parent_id = "PHYSICS_PT_rigid_body_constraint" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -101,7 +101,7 @@ class PHYSICS_PT_rigid_body_constraint_override_iterations(PHYSICS_PT_rigidbody_ bl_parent_id = "PHYSICS_PT_rigid_body_constraint" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -131,7 +131,7 @@ class PHYSICS_PT_rigid_body_constraint_limits(PHYSICS_PT_rigidbody_constraint_pa bl_parent_id = "PHYSICS_PT_rigid_body_constraint" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -154,7 +154,7 @@ class PHYSICS_PT_rigid_body_constraint_limits_linear(PHYSICS_PT_rigidbody_constr bl_parent_id = "PHYSICS_PT_rigid_body_constraint_limits" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -217,7 +217,7 @@ class PHYSICS_PT_rigid_body_constraint_limits_angular(PHYSICS_PT_rigidbody_const bl_parent_id = "PHYSICS_PT_rigid_body_constraint_limits" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -289,7 +289,7 @@ class PHYSICS_PT_rigid_body_constraint_motor(PHYSICS_PT_rigidbody_constraint_pan bl_parent_id = "PHYSICS_PT_rigid_body_constraint" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -312,7 +312,7 @@ class PHYSICS_PT_rigid_body_constraint_motor_angular(PHYSICS_PT_rigidbody_constr bl_parent_id = "PHYSICS_PT_rigid_body_constraint_motor" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -356,7 +356,7 @@ class PHYSICS_PT_rigid_body_constraint_motor_linear(PHYSICS_PT_rigidbody_constra bl_parent_id = "PHYSICS_PT_rigid_body_constraint_motor" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -398,7 +398,7 @@ class PHYSICS_PT_rigid_body_constraint_springs(PHYSICS_PT_rigidbody_constraint_p bl_parent_id = "PHYSICS_PT_rigid_body_constraint" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -428,7 +428,7 @@ class PHYSICS_PT_rigid_body_constraint_springs_angular(PHYSICS_PT_rigidbody_cons bl_parent_id = "PHYSICS_PT_rigid_body_constraint_springs" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -482,7 +482,7 @@ class PHYSICS_PT_rigid_body_constraint_springs_linear(PHYSICS_PT_rigidbody_const bl_parent_id = "PHYSICS_PT_rigid_body_constraint_springs" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } diff --git a/scripts/startup/bl_ui/properties_physics_softbody.py b/scripts/startup/bl_ui/properties_physics_softbody.py index d901d9d120a..4e8159076f9 100644 --- a/scripts/startup/bl_ui/properties_physics_softbody.py +++ b/scripts/startup/bl_ui/properties_physics_softbody.py @@ -32,7 +32,7 @@ class PHYSICS_PT_softbody(PhysicButtonsPanel, Panel): bl_label = "Soft Body" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -52,7 +52,7 @@ class PHYSICS_PT_softbody_object(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -84,7 +84,7 @@ class PHYSICS_PT_softbody_simulation(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -106,7 +106,7 @@ class PHYSICS_PT_softbody_cache(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -121,7 +121,7 @@ class PHYSICS_PT_softbody_goal(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -150,7 +150,7 @@ class PHYSICS_PT_softbody_goal_strengths(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -180,7 +180,7 @@ class PHYSICS_PT_softbody_goal_settings(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -207,7 +207,7 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -262,7 +262,7 @@ class PHYSICS_PT_softbody_edge_aerodynamics(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -289,7 +289,7 @@ class PHYSICS_PT_softbody_edge_stiffness(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -317,7 +317,7 @@ class PHYSICS_PT_softbody_collision(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -356,7 +356,7 @@ class PHYSICS_PT_softbody_solver(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -385,7 +385,7 @@ class PHYSICS_PT_softbody_solver_diagnostics(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -408,7 +408,7 @@ class PHYSICS_PT_softbody_solver_helpers(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -435,7 +435,7 @@ class PHYSICS_PT_softbody_field_weights(PhysicButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } diff --git a/scripts/startup/bl_ui/properties_render.py b/scripts/startup/bl_ui/properties_render.py index d90d15e2c19..443f780854b 100644 --- a/scripts/startup/bl_ui/properties_render.py +++ b/scripts/startup/bl_ui/properties_render.py @@ -53,7 +53,7 @@ class RENDER_PT_color_management(RenderButtonsPanel, Panel): bl_order = 100 COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -91,7 +91,7 @@ class RENDER_PT_color_management_display_settings(RenderButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -122,7 +122,7 @@ class RENDER_PT_color_management_curves(RenderButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -160,7 +160,7 @@ class RENDER_PT_color_management_white_balance(RenderButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -194,10 +194,10 @@ class RENDER_PT_color_management_white_balance(RenderButtonsPanel, Panel): col.prop(view, "white_balance_tint") -class RENDER_PT_eevee_next_motion_blur(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_motion_blur(RenderButtonsPanel, Panel): bl_label = "Motion Blur" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -225,11 +225,11 @@ class RENDER_PT_eevee_next_motion_blur(RenderButtonsPanel, Panel): col.prop(eevee_props, "motion_blur_steps", text="Steps") -class RENDER_PT_eevee_next_motion_blur_curve(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_motion_blur_curve(RenderButtonsPanel, Panel): bl_label = "Shutter Curve" - bl_parent_id = "RENDER_PT_eevee_next_motion_blur" + bl_parent_id = "RENDER_PT_eevee_motion_blur" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -254,10 +254,10 @@ class RENDER_PT_eevee_next_motion_blur_curve(RenderButtonsPanel, Panel): row.operator("render.shutter_curve_preset", icon='NOCURVE', text="").shape = 'MAX' -class RENDER_PT_eevee_next_depth_of_field(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_depth_of_field(RenderButtonsPanel, Panel): bl_label = "Depth of Field" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -284,10 +284,10 @@ class RENDER_PT_eevee_next_depth_of_field(RenderButtonsPanel, Panel): sub.prop(props, "bokeh_overblur") -class RENDER_PT_eevee_next_volumes(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_volumes(RenderButtonsPanel, Panel): bl_label = "Volumes" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -310,11 +310,11 @@ class RENDER_PT_eevee_next_volumes(RenderButtonsPanel, Panel): col.prop(props, "volumetric_ray_depth", text="Max Depth") -class RENDER_PT_eevee_next_volumes_range(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_volumes_range(RenderButtonsPanel, Panel): bl_label = "Custom Range" bl_options = {'DEFAULT_CLOSED'} - bl_parent_id = "RENDER_PT_eevee_next_volumes" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + bl_parent_id = "RENDER_PT_eevee_volumes" + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -339,17 +339,17 @@ class RENDER_PT_eevee_next_volumes_range(RenderButtonsPanel, Panel): col.prop(props, "volumetric_end") -class RENDER_PT_eevee_next_raytracing_presets(PresetPanel, Panel): +class RENDER_PT_eevee_raytracing_presets(PresetPanel, Panel): bl_label = "Raytracing Presets" preset_subdir = "eevee/raytracing" preset_operator = "script.execute_preset" preset_add_operator = "render.eevee_raytracing_preset_add" -class RENDER_PT_eevee_next_raytracing(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_raytracing(RenderButtonsPanel, Panel): bl_label = "Raytracing" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -360,7 +360,7 @@ class RENDER_PT_eevee_next_raytracing(RenderButtonsPanel, Panel): self.layout.prop(props, "use_raytracing", text="") def draw_header_preset(self, _context): - RENDER_PT_eevee_next_raytracing_presets.draw_panel_header(self.layout) + RENDER_PT_eevee_raytracing_presets.draw_panel_header(self.layout) def draw(self, context): scene = context.scene @@ -379,11 +379,11 @@ class RENDER_PT_eevee_next_raytracing(RenderButtonsPanel, Panel): col.prop(options, "resolution_scale") -class RENDER_PT_eevee_next_screen_trace(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_screen_trace(RenderButtonsPanel, Panel): bl_label = "Screen Tracing" bl_options = {'DEFAULT_CLOSED'} - bl_parent_id = "RENDER_PT_eevee_next_raytracing" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + bl_parent_id = "RENDER_PT_eevee_raytracing" + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -406,11 +406,11 @@ class RENDER_PT_eevee_next_screen_trace(RenderButtonsPanel, Panel): col.prop(props, "screen_trace_thickness", text="Thickness") -class RENDER_PT_eevee_next_gi_approximation(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_gi_approximation(RenderButtonsPanel, Panel): bl_label = "Fast GI Approximation" bl_options = {'DEFAULT_CLOSED'} - bl_parent_id = "RENDER_PT_eevee_next_raytracing" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + bl_parent_id = "RENDER_PT_eevee_raytracing" + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -454,11 +454,11 @@ class RENDER_PT_eevee_next_gi_approximation(RenderButtonsPanel, Panel): col.prop(props, "fast_gi_bias", text="Bias") -class RENDER_PT_eevee_next_denoise(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_denoise(RenderButtonsPanel, Panel): bl_label = "Denoising" bl_options = {'DEFAULT_CLOSED'} - bl_parent_id = "RENDER_PT_eevee_next_raytracing" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + bl_parent_id = "RENDER_PT_eevee_raytracing" + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -492,10 +492,10 @@ class RENDER_PT_eevee_next_denoise(RenderButtonsPanel, Panel): col.prop(props, "denoise_bilateral") -class RENDER_PT_eevee_next_clamping(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_clamping(RenderButtonsPanel, Panel): bl_label = "Clamping" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -505,10 +505,10 @@ class RENDER_PT_eevee_next_clamping(RenderButtonsPanel, Panel): pass -class RENDER_PT_eevee_next_clamping_surface(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_clamping_surface(RenderButtonsPanel, Panel): bl_label = "Surface" - bl_parent_id = "RENDER_PT_eevee_next_clamping" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + bl_parent_id = "RENDER_PT_eevee_clamping" + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -526,10 +526,10 @@ class RENDER_PT_eevee_next_clamping_surface(RenderButtonsPanel, Panel): col.prop(props, "clamp_surface_indirect", text="Indirect Light") -class RENDER_PT_eevee_next_clamping_volume(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_clamping_volume(RenderButtonsPanel, Panel): bl_label = "Volume" - bl_parent_id = "RENDER_PT_eevee_next_clamping" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + bl_parent_id = "RENDER_PT_eevee_clamping" + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -547,11 +547,11 @@ class RENDER_PT_eevee_next_clamping_volume(RenderButtonsPanel, Panel): col.prop(props, "clamp_volume_indirect", text="Indirect Light") -class RENDER_PT_eevee_next_sampling_shadows(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_sampling_shadows(RenderButtonsPanel, Panel): bl_label = "Shadows" - bl_parent_id = "RENDER_PT_eevee_next_sampling" + bl_parent_id = "RENDER_PT_eevee_sampling" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -587,9 +587,9 @@ class RENDER_PT_eevee_next_sampling_shadows(RenderButtonsPanel, Panel): col.prop(props, "shadow_resolution_scale", text="Resolution") -class RENDER_PT_eevee_next_sampling(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_sampling(RenderButtonsPanel, Panel): bl_label = "Sampling" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -599,10 +599,10 @@ class RENDER_PT_eevee_next_sampling(RenderButtonsPanel, Panel): pass -class RENDER_PT_eevee_next_sampling_viewport(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_sampling_viewport(RenderButtonsPanel, Panel): bl_label = "Viewport" - bl_parent_id = "RENDER_PT_eevee_next_sampling" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + bl_parent_id = "RENDER_PT_eevee_sampling" + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -624,10 +624,10 @@ class RENDER_PT_eevee_next_sampling_viewport(RenderButtonsPanel, Panel): # Add SSS sample count here. -class RENDER_PT_eevee_next_sampling_render(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_sampling_render(RenderButtonsPanel, Panel): bl_label = "Render" - bl_parent_id = "RENDER_PT_eevee_next_sampling" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + bl_parent_id = "RENDER_PT_eevee_sampling" + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -647,11 +647,11 @@ class RENDER_PT_eevee_next_sampling_render(RenderButtonsPanel, Panel): # Add SSS sample count here. -class RENDER_PT_eevee_next_sampling_advanced(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_sampling_advanced(RenderButtonsPanel, Panel): bl_label = "Advanced" - bl_parent_id = "RENDER_PT_eevee_next_sampling" + bl_parent_id = "RENDER_PT_eevee_sampling" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -669,10 +669,10 @@ class RENDER_PT_eevee_next_sampling_advanced(RenderButtonsPanel, Panel): col.prop(props, "light_threshold") -class RENDER_PT_eevee_next_film(RenderButtonsPanel, Panel): +class RENDER_PT_eevee_film(RenderButtonsPanel, Panel): bl_label = "Film" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -714,7 +714,7 @@ def draw_curves_settings(self, context): class RENDER_PT_eevee_hair(RenderButtonsPanel, Panel): bl_label = "Curves" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -728,7 +728,7 @@ class RENDER_PT_eevee_performance(RenderButtonsPanel, Panel): bl_label = "Performance" bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -787,7 +787,7 @@ class RENDER_PT_eevee_performance_compositor(RenderButtonsPanel, CompositorPerfo bl_options = {'DEFAULT_CLOSED'} bl_parent_id = "RENDER_PT_eevee_performance" COMPAT_ENGINES = { - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -798,7 +798,7 @@ class RENDER_PT_eevee_performance_compositor_denoise_settings( bl_options = {'DEFAULT_CLOSED'} bl_parent_id = "RENDER_PT_eevee_performance_compositor" COMPAT_ENGINES = { - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -807,7 +807,7 @@ class RENDER_PT_eevee_performance_memory(RenderButtonsPanel, Panel): bl_label = "Memory" bl_parent_id = "RENDER_PT_eevee_performance" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -829,7 +829,7 @@ class RENDER_PT_eevee_performance_viewport(RenderButtonsPanel, Panel): bl_label = "Viewport" bl_parent_id = "RENDER_PT_eevee_performance" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -854,7 +854,7 @@ class RENDER_PT_gpencil(RenderButtonsPanel, Panel): bl_order = 10 COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -872,7 +872,7 @@ class RENDER_PT_grease_pencil_viewport(RenderButtonsPanel, Panel): bl_parent_id = "RENDER_PT_gpencil" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -894,7 +894,7 @@ class RENDER_PT_grease_pencil_render(RenderButtonsPanel, Panel): bl_parent_id = "RENDER_PT_gpencil" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -995,7 +995,7 @@ class RENDER_PT_simplify(RenderButtonsPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1012,7 +1012,7 @@ class RENDER_PT_simplify_viewport(RenderButtonsPanel, Panel): bl_parent_id = "RENDER_PT_simplify" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1044,7 +1044,7 @@ class RENDER_PT_simplify_render(RenderButtonsPanel, Panel): bl_parent_id = "RENDER_PT_simplify" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -1070,7 +1070,7 @@ class RENDER_PT_simplify_greasepencil(RenderButtonsPanel, Panel, GreasePencilSim bl_parent_id = "RENDER_PT_simplify" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } bl_options = {'DEFAULT_CLOSED'} @@ -1097,30 +1097,30 @@ class RENDER_PT_hydra_debug(RenderButtonsPanel, Panel): classes = ( RENDER_PT_context, - RENDER_PT_eevee_next_sampling, - RENDER_PT_eevee_next_sampling_viewport, - RENDER_PT_eevee_next_sampling_render, - RENDER_PT_eevee_next_sampling_shadows, - RENDER_PT_eevee_next_sampling_advanced, - RENDER_PT_eevee_next_clamping, - RENDER_PT_eevee_next_clamping_surface, - RENDER_PT_eevee_next_clamping_volume, - RENDER_PT_eevee_next_raytracing_presets, - RENDER_PT_eevee_next_raytracing, - RENDER_PT_eevee_next_screen_trace, - RENDER_PT_eevee_next_denoise, - RENDER_PT_eevee_next_gi_approximation, - RENDER_PT_eevee_next_volumes, - RENDER_PT_eevee_next_volumes_range, + RENDER_PT_eevee_sampling, + RENDER_PT_eevee_sampling_viewport, + RENDER_PT_eevee_sampling_render, + RENDER_PT_eevee_sampling_shadows, + RENDER_PT_eevee_sampling_advanced, + RENDER_PT_eevee_clamping, + RENDER_PT_eevee_clamping_surface, + RENDER_PT_eevee_clamping_volume, + RENDER_PT_eevee_raytracing_presets, + RENDER_PT_eevee_raytracing, + RENDER_PT_eevee_screen_trace, + RENDER_PT_eevee_denoise, + RENDER_PT_eevee_gi_approximation, + RENDER_PT_eevee_volumes, + RENDER_PT_eevee_volumes_range, RENDER_PT_eevee_hair, RENDER_PT_simplify, RENDER_PT_simplify_viewport, RENDER_PT_simplify_render, RENDER_PT_simplify_greasepencil, - RENDER_PT_eevee_next_depth_of_field, - RENDER_PT_eevee_next_motion_blur, - RENDER_PT_eevee_next_motion_blur_curve, - RENDER_PT_eevee_next_film, + RENDER_PT_eevee_depth_of_field, + RENDER_PT_eevee_motion_blur, + RENDER_PT_eevee_motion_blur_curve, + RENDER_PT_eevee_film, RENDER_PT_eevee_performance, RENDER_PT_eevee_performance_memory, RENDER_PT_eevee_performance_viewport, diff --git a/scripts/startup/bl_ui/properties_scene.py b/scripts/startup/bl_ui/properties_scene.py index 3e3365f3ea7..fb1e2ce84fa 100644 --- a/scripts/startup/bl_ui/properties_scene.py +++ b/scripts/startup/bl_ui/properties_scene.py @@ -414,10 +414,10 @@ class SCENE_PT_rigid_body_field_weights(RigidBodySubPanel, Panel): effector_weights_ui(self, rbw.effector_weights, 'RIGID_BODY') -class SCENE_PT_eevee_next_light_probes(SceneButtonsPanel, Panel): +class SCENE_PT_eevee_light_probes(SceneButtonsPanel, Panel): bl_label = "Light Probes" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -480,7 +480,7 @@ classes = ( SCENE_PT_rigid_body_world_settings, SCENE_PT_rigid_body_cache, SCENE_PT_rigid_body_field_weights, - SCENE_PT_eevee_next_light_probes, + SCENE_PT_eevee_light_probes, SCENE_PT_animation, SCENE_PT_custom_props, ) diff --git a/scripts/startup/bl_ui/properties_texture.py b/scripts/startup/bl_ui/properties_texture.py index 386afa33472..da57693498a 100644 --- a/scripts/startup/bl_ui/properties_texture.py +++ b/scripts/startup/bl_ui/properties_texture.py @@ -73,7 +73,7 @@ class TEXTURE_PT_preview(TextureButtonsPanel, Panel): bl_label = "Preview" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -106,7 +106,7 @@ class TEXTURE_PT_context(TextureButtonsPanel, Panel): bl_options = {'HIDE_HEADER'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -149,7 +149,7 @@ class TEXTURE_PT_node(TextureButtonsPanel, Panel): bl_context = "texture" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -182,7 +182,7 @@ class TEXTURE_PT_clouds(TextureTypePanel, Panel): tex_type = 'CLOUDS' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -218,7 +218,7 @@ class TEXTURE_PT_wood(TextureTypePanel, Panel): tex_type = 'WOOD' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -259,7 +259,7 @@ class TEXTURE_PT_marble(TextureTypePanel, Panel): tex_type = 'MARBLE' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -297,7 +297,7 @@ class TEXTURE_PT_magic(TextureTypePanel, Panel): tex_type = 'MAGIC' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -320,7 +320,7 @@ class TEXTURE_PT_blend(TextureTypePanel, Panel): tex_type = 'BLEND' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -346,7 +346,7 @@ class TEXTURE_PT_stucci(TextureTypePanel, Panel): tex_type = 'STUCCI' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -381,7 +381,7 @@ class TEXTURE_PT_image(TextureTypePanel, Panel): tex_type = 'IMAGE' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -397,7 +397,7 @@ class TEXTURE_PT_image_settings(TextureTypePanel, Panel): tex_type = 'IMAGE' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -415,7 +415,7 @@ class TEXTURE_PT_image_sampling(TextureTypePanel, Panel): tex_type = 'IMAGE' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -438,7 +438,7 @@ class TEXTURE_PT_image_alpha(TextureTypePanel, Panel): tex_type = 'IMAGE' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -465,7 +465,7 @@ class TEXTURE_PT_image_mapping(TextureTypePanel, Panel): tex_type = 'IMAGE' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -521,7 +521,7 @@ class TEXTURE_PT_image_mapping_crop(TextureTypePanel, Panel): tex_type = 'IMAGE' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -547,7 +547,7 @@ class TEXTURE_PT_musgrave(TextureTypePanel, Panel): tex_type = 'MUSGRAVE' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -596,7 +596,7 @@ class TEXTURE_PT_voronoi(TextureTypePanel, Panel): tex_type = 'VORONOI' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -633,7 +633,7 @@ class TEXTURE_PT_voronoi_feature_weights(TextureTypePanel, Panel): tex_type = 'VORONOI' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -658,7 +658,7 @@ class TEXTURE_PT_distortednoise(TextureTypePanel, Panel): tex_type = 'DISTORTED_NOISE' COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -687,7 +687,7 @@ class TEXTURE_PT_distortednoise(TextureTypePanel, Panel): class TextureSlotPanel(TextureButtonsPanel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -703,7 +703,7 @@ class TEXTURE_PT_mapping(TextureSlotPanel, Panel): bl_label = "Mapping" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -775,7 +775,7 @@ class TEXTURE_PT_influence(TextureSlotPanel, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -861,7 +861,7 @@ class TEXTURE_PT_colors(TextureButtonsPanel, TextureColorsPoll, Panel): bl_options = {'DEFAULT_CLOSED'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -894,7 +894,7 @@ class TEXTURE_PT_colors_ramp(TextureButtonsPanel, TextureColorsPoll, Panel): bl_parent_id = "TEXTURE_PT_colors" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -954,7 +954,7 @@ class TEXTURE_PT_animation(TextureButtonsPanel, PropertiesAnimationMixin, Proper class TEXTURE_PT_custom_props(TextureButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _context_path = "texture" diff --git a/scripts/startup/bl_ui/properties_view_layer.py b/scripts/startup/bl_ui/properties_view_layer.py index 60776831c4e..9b172cba2c7 100644 --- a/scripts/startup/bl_ui/properties_view_layer.py +++ b/scripts/startup/bl_ui/properties_view_layer.py @@ -32,7 +32,7 @@ class VIEWLAYER_PT_layer(ViewLayerButtonsPanel, Panel): bl_label = "View Layer" COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -53,7 +53,7 @@ class VIEWLAYER_PT_layer(ViewLayerButtonsPanel, Panel): class VIEWLAYER_PT_layer_passes(ViewLayerButtonsPanel, Panel): bl_label = "Passes" COMPAT_ENGINES = { - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -61,11 +61,11 @@ class VIEWLAYER_PT_layer_passes(ViewLayerButtonsPanel, Panel): pass -class VIEWLAYER_PT_eevee_next_layer_passes_data(ViewLayerButtonsPanel, Panel): +class VIEWLAYER_PT_eevee_layer_passes_data(ViewLayerButtonsPanel, Panel): bl_label = "Data" bl_parent_id = "VIEWLAYER_PT_layer_passes" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -106,11 +106,11 @@ class VIEWLAYER_PT_workbench_layer_passes_data(ViewLayerButtonsPanel, Panel): col.prop(view_layer, "use_pass_grease_pencil", text="Grease Pencil") -class VIEWLAYER_PT_eevee_next_layer_passes_light(ViewLayerButtonsPanel, Panel): +class VIEWLAYER_PT_eevee_layer_passes_light(ViewLayerButtonsPanel, Panel): bl_label = "Light" bl_translation_context = i18n_contexts.render_layer bl_parent_id = "VIEWLAYER_PT_layer_passes" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -172,7 +172,7 @@ class ViewLayerAOVPanelHelper(ViewLayerButtonsPanel): class VIEWLAYER_PT_layer_passes_aov(ViewLayerAOVPanelHelper, Panel): bl_parent_id = "VIEWLAYER_PT_layer_passes" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} class ViewLayerCryptomattePanelHelper(ViewLayerButtonsPanel): @@ -201,7 +201,7 @@ class ViewLayerCryptomattePanelHelper(ViewLayerButtonsPanel): class VIEWLAYER_PT_layer_passes_cryptomatte(ViewLayerCryptomattePanelHelper, Panel): bl_parent_id = "VIEWLAYER_PT_layer_passes" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} class VIEWLAYER_MT_lightgroup_sync(Menu): @@ -248,7 +248,7 @@ class VIEWLAYER_PT_layer_passes_lightgroups(ViewLayerLightgroupsPanelHelper, Pan class VIEWLAYER_PT_filter(ViewLayerButtonsPanel, Panel): bl_label = "Filter" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -304,8 +304,8 @@ classes = ( VIEWLAYER_PT_layer, VIEWLAYER_PT_layer_passes, VIEWLAYER_PT_workbench_layer_passes_data, - VIEWLAYER_PT_eevee_next_layer_passes_data, - VIEWLAYER_PT_eevee_next_layer_passes_light, + VIEWLAYER_PT_eevee_layer_passes_data, + VIEWLAYER_PT_eevee_layer_passes_light, VIEWLAYER_PT_layer_passes_cryptomatte, VIEWLAYER_PT_layer_passes_aov, VIEWLAYER_PT_layer_passes_lightgroups, diff --git a/scripts/startup/bl_ui/properties_world.py b/scripts/startup/bl_ui/properties_world.py index 7c147eb1dc2..8449f96eb39 100644 --- a/scripts/startup/bl_ui/properties_world.py +++ b/scripts/startup/bl_ui/properties_world.py @@ -26,7 +26,7 @@ class WORLD_PT_context_world(WorldButtonsPanel, Panel): bl_options = {'HIDE_HEADER'} COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -50,7 +50,7 @@ class WORLD_PT_context_world(WorldButtonsPanel, Panel): class EEVEE_WORLD_PT_mist(WorldButtonsPanel, Panel): bl_label = "Mist Pass" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -74,7 +74,7 @@ class EEVEE_WORLD_PT_mist(WorldButtonsPanel, Panel): class WORLD_PT_animation(WorldButtonsPanel, PropertiesAnimationMixin, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } @@ -99,7 +99,7 @@ class WORLD_PT_animation(WorldButtonsPanel, PropertiesAnimationMixin, PropertyPa class WORLD_PT_custom_props(WorldButtonsPanel, PropertyPanel, Panel): COMPAT_ENGINES = { 'BLENDER_RENDER', - 'BLENDER_EEVEE_NEXT', + 'BLENDER_EEVEE', 'BLENDER_WORKBENCH', } _context_path = "world" @@ -108,7 +108,7 @@ class WORLD_PT_custom_props(WorldButtonsPanel, PropertyPanel, Panel): class EEVEE_WORLD_PT_surface(WorldButtonsPanel, Panel): bl_label = "Surface" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -145,7 +145,7 @@ class EEVEE_WORLD_PT_volume(WorldButtonsPanel, Panel): bl_label = "Volume" bl_translation_context = i18n_contexts.id_id bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -178,7 +178,7 @@ class EEVEE_WORLD_PT_volume(WorldButtonsPanel, Panel): class EEVEE_WORLD_PT_settings(WorldButtonsPanel, Panel): bl_label = "Settings" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): @@ -193,7 +193,7 @@ class EEVEE_WORLD_PT_settings(WorldButtonsPanel, Panel): class EEVEE_WORLD_PT_lightprobe(WorldButtonsPanel, Panel): bl_label = "Light Probe" bl_parent_id = "EEVEE_WORLD_PT_settings" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -207,7 +207,7 @@ class EEVEE_WORLD_PT_lightprobe(WorldButtonsPanel, Panel): class EEVEE_WORLD_PT_sun(WorldButtonsPanel, Panel): bl_label = "Sun" bl_parent_id = "EEVEE_WORLD_PT_settings" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw(self, context): layout = self.layout @@ -223,7 +223,7 @@ class EEVEE_WORLD_PT_sun_shadow(WorldButtonsPanel, Panel): bl_label = "Shadow" bl_parent_id = "EEVEE_WORLD_PT_sun" bl_options = {'DEFAULT_CLOSED'} - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} def draw_header(self, context): world = context.world diff --git a/scripts/startup/bl_ui/space_node.py b/scripts/startup/bl_ui/space_node.py index 0b110ace8c3..abc09556d34 100644 --- a/scripts/startup/bl_ui/space_node.py +++ b/scripts/startup/bl_ui/space_node.py @@ -20,9 +20,9 @@ from bl_ui.space_toolsystem_common import ( ToolActivePanelHelper, ) from bl_ui.properties_material import ( - EEVEE_NEXT_MATERIAL_PT_settings, - EEVEE_NEXT_MATERIAL_PT_settings_surface, - EEVEE_NEXT_MATERIAL_PT_settings_volume, + EEVEE_MATERIAL_PT_settings, + EEVEE_MATERIAL_PT_settings_surface, + EEVEE_MATERIAL_PT_settings_volume, MATERIAL_PT_viewport, ) from bl_ui.properties_world import ( @@ -1186,9 +1186,9 @@ classes = ( NODE_PT_active_node_properties, NODE_PT_gizmo_display, - node_panel(EEVEE_NEXT_MATERIAL_PT_settings), - node_panel(EEVEE_NEXT_MATERIAL_PT_settings_surface), - node_panel(EEVEE_NEXT_MATERIAL_PT_settings_volume), + node_panel(EEVEE_MATERIAL_PT_settings), + node_panel(EEVEE_MATERIAL_PT_settings_surface), + node_panel(EEVEE_MATERIAL_PT_settings_volume), node_panel(MATERIAL_PT_viewport), node_panel(WORLD_PT_viewport_display), node_panel(DATA_PT_light), diff --git a/scripts/startup/bl_ui/space_view3d.py b/scripts/startup/bl_ui/space_view3d.py index 52bf29f391b..c61fc7884ea 100644 --- a/scripts/startup/bl_ui/space_view3d.py +++ b/scripts/startup/bl_ui/space_view3d.py @@ -6565,7 +6565,7 @@ class VIEW3D_PT_shading_lighting(Panel): return True if shading.type == 'RENDERED': engine = context.scene.render.engine - if engine == 'BLENDER_EEVEE_NEXT': + if engine == 'BLENDER_EEVEE': return True return False @@ -6871,7 +6871,7 @@ class VIEW3D_PT_shading_render_pass(Panel): bl_region_type = 'HEADER' bl_label = "Render Pass" bl_parent_id = "VIEW3D_PT_shading" - COMPAT_ENGINES = {'BLENDER_EEVEE_NEXT'} + COMPAT_ENGINES = {'BLENDER_EEVEE'} @classmethod def poll(cls, context): diff --git a/source/blender/blenkernel/intern/scene.cc b/source/blender/blenkernel/intern/scene.cc index a79691eb760..5f91353a589 100644 --- a/source/blender/blenkernel/intern/scene.cc +++ b/source/blender/blenkernel/intern/scene.cc @@ -207,7 +207,7 @@ static void scene_init_data(ID *id) pset->brush[PE_BRUSH_CUT].strength = 1.0f; } - STRNCPY(scene->r.engine, RE_engine_id_BLENDER_EEVEE_NEXT); + STRNCPY(scene->r.engine, RE_engine_id_BLENDER_EEVEE); STRNCPY(scene->r.pic, U.renderdir); @@ -2831,8 +2831,7 @@ bool BKE_scene_use_spherical_stereo(Scene *scene) bool BKE_scene_uses_blender_eevee(const Scene *scene) { - return STREQ(scene->r.engine, RE_engine_id_BLENDER_EEVEE) || - STREQ(scene->r.engine, RE_engine_id_BLENDER_EEVEE_NEXT); + return STREQ(scene->r.engine, RE_engine_id_BLENDER_EEVEE); } bool BKE_scene_uses_blender_workbench(const Scene *scene) diff --git a/source/blender/blenloader/intern/versioning_500.cc b/source/blender/blenloader/intern/versioning_500.cc index 5e0b5e7c160..9e265fe2838 100644 --- a/source/blender/blenloader/intern/versioning_500.cc +++ b/source/blender/blenloader/intern/versioning_500.cc @@ -166,6 +166,14 @@ void blo_do_versions_500(FileData * /*fd*/, Library * /*lib*/, Main *bmain) FOREACH_NODETREE_END; } + if (!MAIN_VERSION_FILE_ATLEAST(bmain, 500, 9)) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { + if (STREQ(scene->r.engine, RE_engine_id_BLENDER_EEVEE_NEXT)) { + STRNCPY(scene->r.engine, RE_engine_id_BLENDER_EEVEE); + } + } + } + /** * Always bump subversion in BKE_blender_version.h when adding versioning * code here, and wrap it inside a MAIN_VERSION_FILE_ATLEAST check. diff --git a/source/blender/blenloader/intern/versioning_defaults.cc b/source/blender/blenloader/intern/versioning_defaults.cc index ce64c38997e..9810d4bb66d 100644 --- a/source/blender/blenloader/intern/versioning_defaults.cc +++ b/source/blender/blenloader/intern/versioning_defaults.cc @@ -349,7 +349,7 @@ static void blo_update_defaults_scene(Main *bmain, Scene *scene) { ToolSettings *ts = scene->toolsettings; - STRNCPY(scene->r.engine, RE_engine_id_BLENDER_EEVEE_NEXT); + STRNCPY(scene->r.engine, RE_engine_id_BLENDER_EEVEE); scene->r.cfra = 1.0f; diff --git a/source/blender/draw/engines/eevee/eevee_engine.cc b/source/blender/draw/engines/eevee/eevee_engine.cc index 9c75e9fd8a9..cd4f0da8b3c 100644 --- a/source/blender/draw/engines/eevee/eevee_engine.cc +++ b/source/blender/draw/engines/eevee/eevee_engine.cc @@ -75,7 +75,7 @@ static void eevee_render_update_passes(RenderEngine *engine, Scene *scene, ViewL RenderEngineType DRW_engine_viewport_eevee_type = { /*next*/ nullptr, /*prev*/ nullptr, - /*idname*/ "BLENDER_EEVEE_NEXT", + /*idname*/ "BLENDER_EEVEE", /*name*/ N_("EEVEE"), /*flag*/ RE_INTERNAL | RE_USE_PREVIEW | RE_USE_STEREO_VIEWPORT | RE_USE_GPU_CONTEXT, /*update*/ nullptr, diff --git a/source/blender/draw/engines/overlay/overlay_instance.cc b/source/blender/draw/engines/overlay/overlay_instance.cc index b1a15016c4c..5260ce79938 100644 --- a/source/blender/draw/engines/overlay/overlay_instance.cc +++ b/source/blender/draw/engines/overlay/overlay_instance.cc @@ -70,7 +70,7 @@ void Instance::init() BKE_scene_uses_blender_workbench(state.scene); const bool viewport_uses_eevee = STREQ( ED_view3d_engine_type(state.scene, state.v3d->shading.type)->idname, - RE_engine_id_BLENDER_EEVEE_NEXT); + RE_engine_id_BLENDER_EEVEE); const bool use_resolution_scaling = BKE_render_preview_pixel_size(&state.scene->r) != 1; /* Only workbench ensures the depth buffer is matching overlays. * Force depth prepass for other render engines. diff --git a/source/blender/editors/render/render_preview.cc b/source/blender/editors/render/render_preview.cc index b3718c276af..5a0d26f248c 100644 --- a/source/blender/editors/render/render_preview.cc +++ b/source/blender/editors/render/render_preview.cc @@ -270,7 +270,7 @@ const char *ED_preview_collection_name(const ePreviewType pr_type) static bool render_engine_supports_ray_visibility(const Scene *sce) { - return !STREQ(sce->r.engine, RE_engine_id_BLENDER_EEVEE_NEXT); + return !STREQ(sce->r.engine, RE_engine_id_BLENDER_EEVEE); } static void switch_preview_collection_visibility(ViewLayer *view_layer, const ePreviewType pr_type) @@ -511,7 +511,7 @@ static Scene *preview_prepare_scene( if (id_type == ID_TE) { /* Texture is not actually rendered with engine, just set dummy value. */ - STRNCPY(sce->r.engine, RE_engine_id_BLENDER_EEVEE_NEXT); + STRNCPY(sce->r.engine, RE_engine_id_BLENDER_EEVEE); } if (id_type == ID_MA) { diff --git a/source/blender/editors/space_view3d/view3d_draw.cc b/source/blender/editors/space_view3d/view3d_draw.cc index 8f1ee3cab0e..3bc4a878dc7 100644 --- a/source/blender/editors/space_view3d/view3d_draw.cc +++ b/source/blender/editors/space_view3d/view3d_draw.cc @@ -1656,7 +1656,7 @@ RenderEngineType *ED_view3d_engine_type(const Scene *scene, int drawtype) */ RenderEngineType *type = RE_engines_find(scene->r.engine); if (drawtype == OB_MATERIAL && (type->flag & RE_USE_EEVEE_VIEWPORT)) { - return RE_engines_find(RE_engine_id_BLENDER_EEVEE_NEXT); + return RE_engines_find(RE_engine_id_BLENDER_EEVEE); } return type; } @@ -2590,7 +2590,7 @@ bool ED_view3d_has_depth_buffer_updated(const Depsgraph *depsgraph, const View3D bool is_viewport_preview_solid = v3d->shading.type == OB_SOLID; bool is_viewport_preview_material = v3d->shading.type == OB_MATERIAL; bool is_viewport_render_eevee = v3d->shading.type == OB_RENDER && - (STREQ(engine_name, RE_engine_id_BLENDER_EEVEE_NEXT)); + (STREQ(engine_name, RE_engine_id_BLENDER_EEVEE)); bool is_viewport_render_workbench = v3d->shading.type == OB_RENDER && STREQ(engine_name, RE_engine_id_BLENDER_WORKBENCH); bool is_viewport_render_external_with_overlay = v3d->shading.type == OB_RENDER && diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 740a8cf26d3..22e7321fe5f 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -2359,9 +2359,10 @@ enum { /** #RenderData::engine (scene.cc) */ extern const char *RE_engine_id_BLENDER_EEVEE; -extern const char *RE_engine_id_BLENDER_EEVEE_NEXT; extern const char *RE_engine_id_BLENDER_WORKBENCH; extern const char *RE_engine_id_CYCLES; +/* Only used for versionning. Was used during the transition period between 4.2 and 5.0. */ +extern const char *RE_engine_id_BLENDER_EEVEE_NEXT; /** \} */ diff --git a/source/blender/makesrna/intern/rna_scene.cc b/source/blender/makesrna/intern/rna_scene.cc index 9e33d94f3f3..b7e409ed0e6 100644 --- a/source/blender/makesrna/intern/rna_scene.cc +++ b/source/blender/makesrna/intern/rna_scene.cc @@ -6935,7 +6935,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna) }; static const EnumPropertyItem engine_items[] = { - {0, "BLENDER_EEVEE_NEXT", 0, "EEVEE", ""}, + {0, "BLENDER_EEVEE", 0, "EEVEE", ""}, {0, nullptr, 0, nullptr, nullptr}, }; diff --git a/source/blender/makesrna/intern/rna_space.cc b/source/blender/makesrna/intern/rna_space.cc index 0c06fd30834..7902c6b67a0 100644 --- a/source/blender/makesrna/intern/rna_space.cc +++ b/source/blender/makesrna/intern/rna_space.cc @@ -1506,7 +1506,7 @@ static const EnumPropertyItem *rna_3DViewShading_render_pass_itemf(bContext *C, ViewLayer *view_layer = CTX_data_view_layer(C); const bool aov_available = BKE_view_layer_has_valid_aov(view_layer); - const bool eevee_active = STREQ(scene->r.engine, "BLENDER_EEVEE_NEXT"); + const bool eevee_active = STREQ(scene->r.engine, "BLENDER_EEVEE"); int totitem = 0; EnumPropertyItem *result = nullptr; diff --git a/source/blender/nodes/shader/node_shader_util.cc b/source/blender/nodes/shader/node_shader_util.cc index 20daf24e150..97cf0344261 100644 --- a/source/blender/nodes/shader/node_shader_util.cc +++ b/source/blender/nodes/shader/node_shader_util.cc @@ -103,7 +103,7 @@ bool object_eevee_shader_nodes_poll(const bContext *C) } const RenderEngineType *engine_type = CTX_data_engine_type(C); return STREQ(engine_type->idname, "BLENDER_EEVEE") || - STREQ(engine_type->idname, "BLENDER_EEVEE_NEXT"); + STREQ(engine_type->idname, "BLENDER_EEVEE"); } /* ****** */ diff --git a/source/blender/render/intern/engine.cc b/source/blender/render/intern/engine.cc index ce9ef04c59c..ba063b9bbf7 100644 --- a/source/blender/render/intern/engine.cc +++ b/source/blender/render/intern/engine.cc @@ -92,7 +92,7 @@ RenderEngineType *RE_engines_find(const char *idname) BLI_findstring(&R_engines, idname, offsetof(RenderEngineType, idname))); if (!type) { type = static_cast( - BLI_findstring(&R_engines, "BLENDER_EEVEE_NEXT", offsetof(RenderEngineType, idname))); + BLI_findstring(&R_engines, "BLENDER_EEVEE", offsetof(RenderEngineType, idname))); } return type; diff --git a/source/blender/render/intern/pipeline.cc b/source/blender/render/intern/pipeline.cc index 46b70dd00b8..ec2b0ed210f 100644 --- a/source/blender/render/intern/pipeline.cc +++ b/source/blender/render/intern/pipeline.cc @@ -2164,7 +2164,7 @@ void RE_RenderFreestyleStrokes(Render *re, Main *bmain, Scene *scene, const bool char scene_engine[32]; STRNCPY(scene_engine, re->r.engine); if (use_eevee_for_freestyle_render(re)) { - change_renderdata_engine(re, RE_engine_id_BLENDER_EEVEE_NEXT); + change_renderdata_engine(re, RE_engine_id_BLENDER_EEVEE); } RE_engine_render(re, false); diff --git a/source/creator/creator_args.cc b/source/creator/creator_args.cc index 86081f8b790..ab4752f9b6c 100644 --- a/source/creator/creator_args.cc +++ b/source/creator/creator_args.cc @@ -1966,7 +1966,9 @@ static int arg_handle_engine_set(int argc, const char **argv, void *data) { bContext *C = static_cast(data); if (argc >= 2) { - if (STREQ(argv[1], "help")) { + const char *engine_name = argv[1]; + + if (STREQ(engine_name, "help")) { printf("Blender Engine Listing:\n"); LISTBASE_FOREACH (RenderEngineType *, type, &R_engines) { printf("\t%s\n", type->idname); @@ -1976,12 +1978,17 @@ static int arg_handle_engine_set(int argc, const char **argv, void *data) else { Scene *scene = CTX_data_scene(C); if (scene) { - if (BLI_findstring(&R_engines, argv[1], offsetof(RenderEngineType, idname))) { - STRNCPY_UTF8(scene->r.engine, argv[1]); + /* Backwards compatibiltiy. */ + if (STREQ(engine_name, "BLENDER_EEVEE_NEXT")) { + engine_name = "BLENDER_EEVEE"; + } + + if (BLI_findstring(&R_engines, engine_name, offsetof(RenderEngineType, idname))) { + STRNCPY_UTF8(scene->r.engine, engine_name); DEG_id_tag_update(&scene->id, ID_RECALC_SYNC_TO_EVAL); } else { - fprintf(stderr, "\nError: engine not found '%s'\n", argv[1]); + fprintf(stderr, "\nError: engine not found '%s'\n", engine_name); exit(1); } } diff --git a/tests/files/render/attributes/eevee_next_renders/attribute_default_color.png b/tests/files/render/attributes/eevee_renders/attribute_default_color.png similarity index 100% rename from tests/files/render/attributes/eevee_next_renders/attribute_default_color.png rename to tests/files/render/attributes/eevee_renders/attribute_default_color.png diff --git a/tests/files/render/attributes/eevee_next_renders/attribute_uniform.png b/tests/files/render/attributes/eevee_renders/attribute_uniform.png similarity index 100% rename from tests/files/render/attributes/eevee_next_renders/attribute_uniform.png rename to tests/files/render/attributes/eevee_renders/attribute_uniform.png diff --git a/tests/files/render/attributes/eevee_next_renders/attribute_view_layer.png b/tests/files/render/attributes/eevee_renders/attribute_view_layer.png similarity index 100% rename from tests/files/render/attributes/eevee_next_renders/attribute_view_layer.png rename to tests/files/render/attributes/eevee_renders/attribute_view_layer.png diff --git a/tests/files/render/attributes/eevee_next_renders/attributes_long_property_path.png b/tests/files/render/attributes/eevee_renders/attributes_long_property_path.png similarity index 100% rename from tests/files/render/attributes/eevee_next_renders/attributes_long_property_path.png rename to tests/files/render/attributes/eevee_renders/attributes_long_property_path.png diff --git a/tests/files/render/bsdf/eevee_next_renders/diffuse.png b/tests/files/render/bsdf/eevee_renders/diffuse.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/diffuse.png rename to tests/files/render/bsdf/eevee_renders/diffuse.png diff --git a/tests/files/render/bsdf/eevee_next_renders/ggx_low_roughness.png b/tests/files/render/bsdf/eevee_renders/ggx_low_roughness.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/ggx_low_roughness.png rename to tests/files/render/bsdf/eevee_renders/ggx_low_roughness.png diff --git a/tests/files/render/bsdf/eevee_next_renders/glass_beckmann.png b/tests/files/render/bsdf/eevee_renders/glass_beckmann.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/glass_beckmann.png rename to tests/files/render/bsdf/eevee_renders/glass_beckmann.png diff --git a/tests/files/render/bsdf/eevee_next_renders/glass_ggx.png b/tests/files/render/bsdf/eevee_renders/glass_ggx.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/glass_ggx.png rename to tests/files/render/bsdf/eevee_renders/glass_ggx.png diff --git a/tests/files/render/bsdf/eevee_next_renders/glass_multiggx_tinted.png b/tests/files/render/bsdf/eevee_renders/glass_multiggx_tinted.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/glass_multiggx_tinted.png rename to tests/files/render/bsdf/eevee_renders/glass_multiggx_tinted.png diff --git a/tests/files/render/bsdf/eevee_next_renders/glass_sharp.png b/tests/files/render/bsdf/eevee_renders/glass_sharp.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/glass_sharp.png rename to tests/files/render/bsdf/eevee_renders/glass_sharp.png diff --git a/tests/files/render/bsdf/eevee_next_renders/glossy_ashikhmin.png b/tests/files/render/bsdf/eevee_renders/glossy_ashikhmin.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/glossy_ashikhmin.png rename to tests/files/render/bsdf/eevee_renders/glossy_ashikhmin.png diff --git a/tests/files/render/bsdf/eevee_next_renders/glossy_beckmann.png b/tests/files/render/bsdf/eevee_renders/glossy_beckmann.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/glossy_beckmann.png rename to tests/files/render/bsdf/eevee_renders/glossy_beckmann.png diff --git a/tests/files/render/bsdf/eevee_next_renders/glossy_ggx.png b/tests/files/render/bsdf/eevee_renders/glossy_ggx.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/glossy_ggx.png rename to tests/files/render/bsdf/eevee_renders/glossy_ggx.png diff --git a/tests/files/render/bsdf/eevee_next_renders/glossy_multiscatter_ggx.png b/tests/files/render/bsdf/eevee_renders/glossy_multiscatter_ggx.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/glossy_multiscatter_ggx.png rename to tests/files/render/bsdf/eevee_renders/glossy_multiscatter_ggx.png diff --git a/tests/files/render/bsdf/eevee_next_renders/glossy_roughness_texture.png b/tests/files/render/bsdf/eevee_renders/glossy_roughness_texture.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/glossy_roughness_texture.png rename to tests/files/render/bsdf/eevee_renders/glossy_roughness_texture.png diff --git a/tests/files/render/bsdf/eevee_next_renders/glossy_sharp.png b/tests/files/render/bsdf/eevee_renders/glossy_sharp.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/glossy_sharp.png rename to tests/files/render/bsdf/eevee_renders/glossy_sharp.png diff --git a/tests/files/render/bsdf/eevee_next_renders/metallic_beckmann_physical.png b/tests/files/render/bsdf/eevee_renders/metallic_beckmann_physical.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/metallic_beckmann_physical.png rename to tests/files/render/bsdf/eevee_renders/metallic_beckmann_physical.png diff --git a/tests/files/render/bsdf/eevee_next_renders/metallic_ggx_physical.png b/tests/files/render/bsdf/eevee_renders/metallic_ggx_physical.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/metallic_ggx_physical.png rename to tests/files/render/bsdf/eevee_renders/metallic_ggx_physical.png diff --git a/tests/files/render/bsdf/eevee_next_renders/metallic_multiggx_f82.png b/tests/files/render/bsdf/eevee_renders/metallic_multiggx_f82.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/metallic_multiggx_f82.png rename to tests/files/render/bsdf/eevee_renders/metallic_multiggx_f82.png diff --git a/tests/files/render/bsdf/eevee_next_renders/metallic_multiggx_physical.png b/tests/files/render/bsdf/eevee_renders/metallic_multiggx_physical.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/metallic_multiggx_physical.png rename to tests/files/render/bsdf/eevee_renders/metallic_multiggx_physical.png diff --git a/tests/files/render/bsdf/eevee_next_renders/ray_portal.png b/tests/files/render/bsdf/eevee_renders/ray_portal.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/ray_portal.png rename to tests/files/render/bsdf/eevee_renders/ray_portal.png diff --git a/tests/files/render/bsdf/eevee_next_renders/ray_portal_pass.png b/tests/files/render/bsdf/eevee_renders/ray_portal_pass.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/ray_portal_pass.png rename to tests/files/render/bsdf/eevee_renders/ray_portal_pass.png diff --git a/tests/files/render/bsdf/eevee_next_renders/refraction_beckmann.png b/tests/files/render/bsdf/eevee_renders/refraction_beckmann.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/refraction_beckmann.png rename to tests/files/render/bsdf/eevee_renders/refraction_beckmann.png diff --git a/tests/files/render/bsdf/eevee_next_renders/refraction_ggx.png b/tests/files/render/bsdf/eevee_renders/refraction_ggx.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/refraction_ggx.png rename to tests/files/render/bsdf/eevee_renders/refraction_ggx.png diff --git a/tests/files/render/bsdf/eevee_next_renders/refraction_sharp.png b/tests/files/render/bsdf/eevee_renders/refraction_sharp.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/refraction_sharp.png rename to tests/files/render/bsdf/eevee_renders/refraction_sharp.png diff --git a/tests/files/render/bsdf/eevee_next_renders/toon_diffuse.png b/tests/files/render/bsdf/eevee_renders/toon_diffuse.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/toon_diffuse.png rename to tests/files/render/bsdf/eevee_renders/toon_diffuse.png diff --git a/tests/files/render/bsdf/eevee_next_renders/toon_glossy.png b/tests/files/render/bsdf/eevee_renders/toon_glossy.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/toon_glossy.png rename to tests/files/render/bsdf/eevee_renders/toon_glossy.png diff --git a/tests/files/render/bsdf/eevee_next_renders/translucent.png b/tests/files/render/bsdf/eevee_renders/translucent.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/translucent.png rename to tests/files/render/bsdf/eevee_renders/translucent.png diff --git a/tests/files/render/bsdf/eevee_next_renders/transparent.png b/tests/files/render/bsdf/eevee_renders/transparent.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/transparent.png rename to tests/files/render/bsdf/eevee_renders/transparent.png diff --git a/tests/files/render/bsdf/eevee_next_renders/velvet.png b/tests/files/render/bsdf/eevee_renders/velvet.png similarity index 100% rename from tests/files/render/bsdf/eevee_next_renders/velvet.png rename to tests/files/render/bsdf/eevee_renders/velvet.png diff --git a/tests/files/render/camera/eevee_next_renders/camera_central_cylindrical.png b/tests/files/render/camera/eevee_renders/camera_central_cylindrical.png similarity index 100% rename from tests/files/render/camera/eevee_next_renders/camera_central_cylindrical.png rename to tests/files/render/camera/eevee_renders/camera_central_cylindrical.png diff --git a/tests/files/render/camera/eevee_next_renders/camera_depth_of_field.png b/tests/files/render/camera/eevee_renders/camera_depth_of_field.png similarity index 100% rename from tests/files/render/camera/eevee_next_renders/camera_depth_of_field.png rename to tests/files/render/camera/eevee_renders/camera_depth_of_field.png diff --git a/tests/files/render/camera/eevee_next_renders/camera_equiangular_cubemap_face.png b/tests/files/render/camera/eevee_renders/camera_equiangular_cubemap_face.png similarity index 100% rename from tests/files/render/camera/eevee_next_renders/camera_equiangular_cubemap_face.png rename to tests/files/render/camera/eevee_renders/camera_equiangular_cubemap_face.png diff --git a/tests/files/render/camera/eevee_next_renders/camera_equirectangular.png b/tests/files/render/camera/eevee_renders/camera_equirectangular.png similarity index 100% rename from tests/files/render/camera/eevee_next_renders/camera_equirectangular.png rename to tests/files/render/camera/eevee_renders/camera_equirectangular.png diff --git a/tests/files/render/camera/eevee_next_renders/camera_fisheye_equidistant.png b/tests/files/render/camera/eevee_renders/camera_fisheye_equidistant.png similarity index 100% rename from tests/files/render/camera/eevee_next_renders/camera_fisheye_equidistant.png rename to tests/files/render/camera/eevee_renders/camera_fisheye_equidistant.png diff --git a/tests/files/render/camera/eevee_next_renders/camera_fisheye_equisolid.png b/tests/files/render/camera/eevee_renders/camera_fisheye_equisolid.png similarity index 100% rename from tests/files/render/camera/eevee_next_renders/camera_fisheye_equisolid.png rename to tests/files/render/camera/eevee_renders/camera_fisheye_equisolid.png diff --git a/tests/files/render/camera/eevee_next_renders/camera_fisheye_polynomial.png b/tests/files/render/camera/eevee_renders/camera_fisheye_polynomial.png similarity index 100% rename from tests/files/render/camera/eevee_next_renders/camera_fisheye_polynomial.png rename to tests/files/render/camera/eevee_renders/camera_fisheye_polynomial.png diff --git a/tests/files/render/camera/eevee_next_renders/camera_mirror_ball.png b/tests/files/render/camera/eevee_renders/camera_mirror_ball.png similarity index 100% rename from tests/files/render/camera/eevee_next_renders/camera_mirror_ball.png rename to tests/files/render/camera/eevee_renders/camera_mirror_ball.png diff --git a/tests/files/render/camera/eevee_next_renders/camera_ortho.png b/tests/files/render/camera/eevee_renders/camera_ortho.png similarity index 100% rename from tests/files/render/camera/eevee_next_renders/camera_ortho.png rename to tests/files/render/camera/eevee_renders/camera_ortho.png diff --git a/tests/files/render/camera/eevee_next_renders/camera_ortho_depth_of_field_near_clip.png b/tests/files/render/camera/eevee_renders/camera_ortho_depth_of_field_near_clip.png similarity index 100% rename from tests/files/render/camera/eevee_next_renders/camera_ortho_depth_of_field_near_clip.png rename to tests/files/render/camera/eevee_renders/camera_ortho_depth_of_field_near_clip.png diff --git a/tests/files/render/camera/eevee_next_renders/camera_polygonal_bokeh.png b/tests/files/render/camera/eevee_renders/camera_polygonal_bokeh.png similarity index 100% rename from tests/files/render/camera/eevee_next_renders/camera_polygonal_bokeh.png rename to tests/files/render/camera/eevee_renders/camera_polygonal_bokeh.png diff --git a/tests/files/render/camera/eevee_next_renders/camera_stereo_panoramic.png b/tests/files/render/camera/eevee_renders/camera_stereo_panoramic.png similarity index 100% rename from tests/files/render/camera/eevee_next_renders/camera_stereo_panoramic.png rename to tests/files/render/camera/eevee_renders/camera_stereo_panoramic.png diff --git a/tests/files/render/camera/eevee_next_renders/camera_stereo_perspective.png b/tests/files/render/camera/eevee_renders/camera_stereo_perspective.png similarity index 100% rename from tests/files/render/camera/eevee_next_renders/camera_stereo_perspective.png rename to tests/files/render/camera/eevee_renders/camera_stereo_perspective.png diff --git a/tests/files/render/displacement/eevee_next_renders/both_displacement.png b/tests/files/render/displacement/eevee_renders/both_displacement.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/both_displacement.png rename to tests/files/render/displacement/eevee_renders/both_displacement.png diff --git a/tests/files/render/displacement/eevee_next_renders/bump_glass.png b/tests/files/render/displacement/eevee_renders/bump_glass.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/bump_glass.png rename to tests/files/render/displacement/eevee_renders/bump_glass.png diff --git a/tests/files/render/displacement/eevee_next_renders/bump_glossy.png b/tests/files/render/displacement/eevee_renders/bump_glossy.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/bump_glossy.png rename to tests/files/render/displacement/eevee_renders/bump_glossy.png diff --git a/tests/files/render/displacement/eevee_next_renders/bump_normal_texture.png b/tests/files/render/displacement/eevee_renders/bump_normal_texture.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/bump_normal_texture.png rename to tests/files/render/displacement/eevee_renders/bump_normal_texture.png diff --git a/tests/files/render/displacement/eevee_next_renders/bump_with_displacement.png b/tests/files/render/displacement/eevee_renders/bump_with_displacement.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/bump_with_displacement.png rename to tests/files/render/displacement/eevee_renders/bump_with_displacement.png diff --git a/tests/files/render/displacement/eevee_next_renders/compare_bump.png b/tests/files/render/displacement/eevee_renders/compare_bump.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/compare_bump.png rename to tests/files/render/displacement/eevee_renders/compare_bump.png diff --git a/tests/files/render/displacement/eevee_next_renders/dicing_camera.png b/tests/files/render/displacement/eevee_renders/dicing_camera.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/dicing_camera.png rename to tests/files/render/displacement/eevee_renders/dicing_camera.png diff --git a/tests/files/render/displacement/eevee_next_renders/offscreen_dicing.png b/tests/files/render/displacement/eevee_renders/offscreen_dicing.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/offscreen_dicing.png rename to tests/files/render/displacement/eevee_renders/offscreen_dicing.png diff --git a/tests/files/render/displacement/eevee_next_renders/panorama_dicing.png b/tests/files/render/displacement/eevee_renders/panorama_dicing.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/panorama_dicing.png rename to tests/files/render/displacement/eevee_renders/panorama_dicing.png diff --git a/tests/files/render/displacement/eevee_next_renders/true_displacement.png b/tests/files/render/displacement/eevee_renders/true_displacement.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/true_displacement.png rename to tests/files/render/displacement/eevee_renders/true_displacement.png diff --git a/tests/files/render/displacement/eevee_next_renders/true_displacement_image.png b/tests/files/render/displacement/eevee_renders/true_displacement_image.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/true_displacement_image.png rename to tests/files/render/displacement/eevee_renders/true_displacement_image.png diff --git a/tests/files/render/displacement/eevee_next_renders/true_displacement_scaled.png b/tests/files/render/displacement/eevee_renders/true_displacement_scaled.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/true_displacement_scaled.png rename to tests/files/render/displacement/eevee_renders/true_displacement_scaled.png diff --git a/tests/files/render/displacement/eevee_next_renders/true_displacement_scaled_shared.png b/tests/files/render/displacement/eevee_renders/true_displacement_scaled_shared.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/true_displacement_scaled_shared.png rename to tests/files/render/displacement/eevee_renders/true_displacement_scaled_shared.png diff --git a/tests/files/render/displacement/eevee_next_renders/vector_displacement_object.png b/tests/files/render/displacement/eevee_renders/vector_displacement_object.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/vector_displacement_object.png rename to tests/files/render/displacement/eevee_renders/vector_displacement_object.png diff --git a/tests/files/render/displacement/eevee_next_renders/vector_displacement_tangent.png b/tests/files/render/displacement/eevee_renders/vector_displacement_tangent.png similarity index 100% rename from tests/files/render/displacement/eevee_next_renders/vector_displacement_tangent.png rename to tests/files/render/displacement/eevee_renders/vector_displacement_tangent.png diff --git a/tests/files/render/grease_pencil/eevee_next_renders/grease_pencil.png b/tests/files/render/grease_pencil/eevee_renders/grease_pencil.png similarity index 100% rename from tests/files/render/grease_pencil/eevee_next_renders/grease_pencil.png rename to tests/files/render/grease_pencil/eevee_renders/grease_pencil.png diff --git a/tests/files/render/grease_pencil/eevee_next_renders/grease_pencil_motion_blur_center.png b/tests/files/render/grease_pencil/eevee_renders/grease_pencil_motion_blur_center.png similarity index 100% rename from tests/files/render/grease_pencil/eevee_next_renders/grease_pencil_motion_blur_center.png rename to tests/files/render/grease_pencil/eevee_renders/grease_pencil_motion_blur_center.png diff --git a/tests/files/render/grease_pencil/eevee_next_renders/grease_pencil_motion_blur_end.png b/tests/files/render/grease_pencil/eevee_renders/grease_pencil_motion_blur_end.png similarity index 100% rename from tests/files/render/grease_pencil/eevee_next_renders/grease_pencil_motion_blur_end.png rename to tests/files/render/grease_pencil/eevee_renders/grease_pencil_motion_blur_end.png diff --git a/tests/files/render/grease_pencil/eevee_next_renders/grease_pencil_motion_blur_start.png b/tests/files/render/grease_pencil/eevee_renders/grease_pencil_motion_blur_start.png similarity index 100% rename from tests/files/render/grease_pencil/eevee_next_renders/grease_pencil_motion_blur_start.png rename to tests/files/render/grease_pencil/eevee_renders/grease_pencil_motion_blur_start.png diff --git a/tests/files/render/hair/eevee_next_renders/hair_basemesh_intercept.png b/tests/files/render/hair/eevee_renders/hair_basemesh_intercept.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/hair_basemesh_intercept.png rename to tests/files/render/hair/eevee_renders/hair_basemesh_intercept.png diff --git a/tests/files/render/hair/eevee_next_renders/hair_close_up.png b/tests/files/render/hair/eevee_renders/hair_close_up.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/hair_close_up.png rename to tests/files/render/hair/eevee_renders/hair_close_up.png diff --git a/tests/files/render/hair/eevee_next_renders/hair_geom_reflection.png b/tests/files/render/hair/eevee_renders/hair_geom_reflection.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/hair_geom_reflection.png rename to tests/files/render/hair/eevee_renders/hair_geom_reflection.png diff --git a/tests/files/render/hair/eevee_next_renders/hair_geom_transmission.png b/tests/files/render/hair/eevee_renders/hair_geom_transmission.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/hair_geom_transmission.png rename to tests/files/render/hair/eevee_renders/hair_geom_transmission.png diff --git a/tests/files/render/hair/eevee_next_renders/hair_info.png b/tests/files/render/hair/eevee_renders/hair_info.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/hair_info.png rename to tests/files/render/hair/eevee_renders/hair_info.png diff --git a/tests/files/render/hair/eevee_next_renders/hair_instancer_uv.png b/tests/files/render/hair/eevee_renders/hair_instancer_uv.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/hair_instancer_uv.png rename to tests/files/render/hair/eevee_renders/hair_instancer_uv.png diff --git a/tests/files/render/hair/eevee_next_renders/hair_particle_random.png b/tests/files/render/hair/eevee_renders/hair_particle_random.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/hair_particle_random.png rename to tests/files/render/hair/eevee_renders/hair_particle_random.png diff --git a/tests/files/render/hair/eevee_next_renders/hair_reflection.png b/tests/files/render/hair/eevee_renders/hair_reflection.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/hair_reflection.png rename to tests/files/render/hair/eevee_renders/hair_reflection.png diff --git a/tests/files/render/hair/eevee_next_renders/hair_ribbon_close_up.png b/tests/files/render/hair/eevee_renders/hair_ribbon_close_up.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/hair_ribbon_close_up.png rename to tests/files/render/hair/eevee_renders/hair_ribbon_close_up.png diff --git a/tests/files/render/hair/eevee_next_renders/hair_transmission.png b/tests/files/render/hair/eevee_renders/hair_transmission.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/hair_transmission.png rename to tests/files/render/hair/eevee_renders/hair_transmission.png diff --git a/tests/files/render/hair/eevee_next_renders/microfacet_hair_orientation.png b/tests/files/render/hair/eevee_renders/microfacet_hair_orientation.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/microfacet_hair_orientation.png rename to tests/files/render/hair/eevee_renders/microfacet_hair_orientation.png diff --git a/tests/files/render/hair/eevee_next_renders/principled_hair_absorptioncoefficient.png b/tests/files/render/hair/eevee_renders/principled_hair_absorptioncoefficient.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/principled_hair_absorptioncoefficient.png rename to tests/files/render/hair/eevee_renders/principled_hair_absorptioncoefficient.png diff --git a/tests/files/render/hair/eevee_next_renders/principled_hair_directcoloring.png b/tests/files/render/hair/eevee_renders/principled_hair_directcoloring.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/principled_hair_directcoloring.png rename to tests/files/render/hair/eevee_renders/principled_hair_directcoloring.png diff --git a/tests/files/render/hair/eevee_next_renders/principled_hair_melaninconcentration.png b/tests/files/render/hair/eevee_renders/principled_hair_melaninconcentration.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/principled_hair_melaninconcentration.png rename to tests/files/render/hair/eevee_renders/principled_hair_melaninconcentration.png diff --git a/tests/files/render/hair/eevee_next_renders/transparent_shadow_hair.png b/tests/files/render/hair/eevee_renders/transparent_shadow_hair.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/transparent_shadow_hair.png rename to tests/files/render/hair/eevee_renders/transparent_shadow_hair.png diff --git a/tests/files/render/hair/eevee_next_renders/transparent_shadow_hair_blur.png b/tests/files/render/hair/eevee_renders/transparent_shadow_hair_blur.png similarity index 100% rename from tests/files/render/hair/eevee_next_renders/transparent_shadow_hair_blur.png rename to tests/files/render/hair/eevee_renders/transparent_shadow_hair_blur.png diff --git a/tests/files/render/image_colorspace/eevee_next_renders/image_alpha_blend.png b/tests/files/render/image_colorspace/eevee_renders/image_alpha_blend.png similarity index 100% rename from tests/files/render/image_colorspace/eevee_next_renders/image_alpha_blend.png rename to tests/files/render/image_colorspace/eevee_renders/image_alpha_blend.png diff --git a/tests/files/render/image_colorspace/eevee_next_renders/image_alpha_blend_osl.png b/tests/files/render/image_colorspace/eevee_renders/image_alpha_blend_osl.png similarity index 100% rename from tests/files/render/image_colorspace/eevee_next_renders/image_alpha_blend_osl.png rename to tests/files/render/image_colorspace/eevee_renders/image_alpha_blend_osl.png diff --git a/tests/files/render/image_colorspace/eevee_next_renders/image_alpha_channel_packed.png b/tests/files/render/image_colorspace/eevee_renders/image_alpha_channel_packed.png similarity index 100% rename from tests/files/render/image_colorspace/eevee_next_renders/image_alpha_channel_packed.png rename to tests/files/render/image_colorspace/eevee_renders/image_alpha_channel_packed.png diff --git a/tests/files/render/image_colorspace/eevee_next_renders/image_alpha_channel_packed_osl.png b/tests/files/render/image_colorspace/eevee_renders/image_alpha_channel_packed_osl.png similarity index 100% rename from tests/files/render/image_colorspace/eevee_next_renders/image_alpha_channel_packed_osl.png rename to tests/files/render/image_colorspace/eevee_renders/image_alpha_channel_packed_osl.png diff --git a/tests/files/render/image_colorspace/eevee_next_renders/image_alpha_ignore.png b/tests/files/render/image_colorspace/eevee_renders/image_alpha_ignore.png similarity index 100% rename from tests/files/render/image_colorspace/eevee_next_renders/image_alpha_ignore.png rename to tests/files/render/image_colorspace/eevee_renders/image_alpha_ignore.png diff --git a/tests/files/render/image_colorspace/eevee_next_renders/image_alpha_ignore_osl.png b/tests/files/render/image_colorspace/eevee_renders/image_alpha_ignore_osl.png similarity index 100% rename from tests/files/render/image_colorspace/eevee_next_renders/image_alpha_ignore_osl.png rename to tests/files/render/image_colorspace/eevee_renders/image_alpha_ignore_osl.png diff --git a/tests/files/render/image_colorspace/eevee_next_renders/image_log.png b/tests/files/render/image_colorspace/eevee_renders/image_log.png similarity index 100% rename from tests/files/render/image_colorspace/eevee_next_renders/image_log.png rename to tests/files/render/image_colorspace/eevee_renders/image_log.png diff --git a/tests/files/render/image_colorspace/eevee_next_renders/image_log_osl.png b/tests/files/render/image_colorspace/eevee_renders/image_log_osl.png similarity index 100% rename from tests/files/render/image_colorspace/eevee_next_renders/image_log_osl.png rename to tests/files/render/image_colorspace/eevee_renders/image_log_osl.png diff --git a/tests/files/render/image_colorspace/eevee_next_renders/image_non_color.png b/tests/files/render/image_colorspace/eevee_renders/image_non_color.png similarity index 100% rename from tests/files/render/image_colorspace/eevee_next_renders/image_non_color.png rename to tests/files/render/image_colorspace/eevee_renders/image_non_color.png diff --git a/tests/files/render/image_colorspace/eevee_next_renders/image_non_color_osl.png b/tests/files/render/image_colorspace/eevee_renders/image_non_color_osl.png similarity index 100% rename from tests/files/render/image_colorspace/eevee_next_renders/image_non_color_osl.png rename to tests/files/render/image_colorspace/eevee_renders/image_non_color_osl.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_byte1.png b/tests/files/render/image_data_types/eevee_renders/image_byte1.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_byte1.png rename to tests/files/render/image_data_types/eevee_renders/image_byte1.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_byte1_16bit.png b/tests/files/render/image_data_types/eevee_renders/image_byte1_16bit.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_byte1_16bit.png rename to tests/files/render/image_data_types/eevee_renders/image_byte1_16bit.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_byte3.png b/tests/files/render/image_data_types/eevee_renders/image_byte3.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_byte3.png rename to tests/files/render/image_data_types/eevee_renders/image_byte3.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_byte3_16bit.png b/tests/files/render/image_data_types/eevee_renders/image_byte3_16bit.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_byte3_16bit.png rename to tests/files/render/image_data_types/eevee_renders/image_byte3_16bit.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_byte4.png b/tests/files/render/image_data_types/eevee_renders/image_byte4.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_byte4.png rename to tests/files/render/image_data_types/eevee_renders/image_byte4.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_byte4_16bit.png b/tests/files/render/image_data_types/eevee_renders/image_byte4_16bit.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_byte4_16bit.png rename to tests/files/render/image_data_types/eevee_renders/image_byte4_16bit.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_float3.png b/tests/files/render/image_data_types/eevee_renders/image_float3.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_float3.png rename to tests/files/render/image_data_types/eevee_renders/image_float3.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_float4.png b/tests/files/render/image_data_types/eevee_renders/image_float4.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_float4.png rename to tests/files/render/image_data_types/eevee_renders/image_float4.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_generated_byte.png b/tests/files/render/image_data_types/eevee_renders/image_generated_byte.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_generated_byte.png rename to tests/files/render/image_data_types/eevee_renders/image_generated_byte.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_generated_float.png b/tests/files/render/image_data_types/eevee_renders/image_generated_float.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_generated_float.png rename to tests/files/render/image_data_types/eevee_renders/image_generated_float.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_half3.png b/tests/files/render/image_data_types/eevee_renders/image_half3.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_half3.png rename to tests/files/render/image_data_types/eevee_renders/image_half3.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_half4.png b/tests/files/render/image_data_types/eevee_renders/image_half4.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_half4.png rename to tests/files/render/image_data_types/eevee_renders/image_half4.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_missing.png b/tests/files/render/image_data_types/eevee_renders/image_missing.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_missing.png rename to tests/files/render/image_data_types/eevee_renders/image_missing.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_packed_byte1.png b/tests/files/render/image_data_types/eevee_renders/image_packed_byte1.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_packed_byte1.png rename to tests/files/render/image_data_types/eevee_renders/image_packed_byte1.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_packed_byte1_16bit.png b/tests/files/render/image_data_types/eevee_renders/image_packed_byte1_16bit.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_packed_byte1_16bit.png rename to tests/files/render/image_data_types/eevee_renders/image_packed_byte1_16bit.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_packed_byte3.png b/tests/files/render/image_data_types/eevee_renders/image_packed_byte3.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_packed_byte3.png rename to tests/files/render/image_data_types/eevee_renders/image_packed_byte3.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_packed_byte3_16bit.png b/tests/files/render/image_data_types/eevee_renders/image_packed_byte3_16bit.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_packed_byte3_16bit.png rename to tests/files/render/image_data_types/eevee_renders/image_packed_byte3_16bit.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_packed_byte4.png b/tests/files/render/image_data_types/eevee_renders/image_packed_byte4.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_packed_byte4.png rename to tests/files/render/image_data_types/eevee_renders/image_packed_byte4.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_packed_byte4_16bit.png b/tests/files/render/image_data_types/eevee_renders/image_packed_byte4_16bit.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_packed_byte4_16bit.png rename to tests/files/render/image_data_types/eevee_renders/image_packed_byte4_16bit.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_packed_float3.png b/tests/files/render/image_data_types/eevee_renders/image_packed_float3.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_packed_float3.png rename to tests/files/render/image_data_types/eevee_renders/image_packed_float3.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_packed_float4.png b/tests/files/render/image_data_types/eevee_renders/image_packed_float4.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_packed_float4.png rename to tests/files/render/image_data_types/eevee_renders/image_packed_float4.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_packed_half3.png b/tests/files/render/image_data_types/eevee_renders/image_packed_half3.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_packed_half3.png rename to tests/files/render/image_data_types/eevee_renders/image_packed_half3.png diff --git a/tests/files/render/image_data_types/eevee_next_renders/image_packed_half4.png b/tests/files/render/image_data_types/eevee_renders/image_packed_half4.png similarity index 100% rename from tests/files/render/image_data_types/eevee_next_renders/image_packed_half4.png rename to tests/files/render/image_data_types/eevee_renders/image_packed_half4.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_closest.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_clip_closest.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_closest.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_clip_closest.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_closest_1px.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_clip_closest_1px.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_closest_1px.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_clip_closest_1px.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_closest_1px_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_clip_closest_1px_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_closest_1px_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_clip_closest_1px_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_closest_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_clip_closest_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_closest_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_clip_closest_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_cubic.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_clip_cubic.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_cubic.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_clip_cubic.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_cubic_1px.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_clip_cubic_1px.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_cubic_1px.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_clip_cubic_1px.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_cubic_1px_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_clip_cubic_1px_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_cubic_1px_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_clip_cubic_1px_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_cubic_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_clip_cubic_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_cubic_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_clip_cubic_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_linear.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_clip_linear.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_linear.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_clip_linear.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_linear_1px.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_clip_linear_1px.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_linear_1px.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_clip_linear_1px.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_linear_1px_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_clip_linear_1px_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_linear_1px_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_clip_linear_1px_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_linear_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_clip_linear_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_clip_linear_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_clip_linear_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_closest.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_extend_closest.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_closest.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_extend_closest.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_closest_1px.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_extend_closest_1px.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_closest_1px.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_extend_closest_1px.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_closest_1px_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_extend_closest_1px_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_closest_1px_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_extend_closest_1px_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_closest_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_extend_closest_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_closest_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_extend_closest_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_cubic.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_extend_cubic.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_cubic.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_extend_cubic.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_cubic_1px.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_extend_cubic_1px.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_cubic_1px.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_extend_cubic_1px.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_cubic_1px_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_extend_cubic_1px_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_cubic_1px_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_extend_cubic_1px_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_cubic_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_extend_cubic_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_cubic_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_extend_cubic_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_linear.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_extend_linear.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_linear.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_extend_linear.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_linear_1px.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_extend_linear_1px.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_linear_1px.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_extend_linear_1px.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_linear_1px_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_extend_linear_1px_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_linear_1px_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_extend_linear_1px_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_linear_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_extend_linear_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_extend_linear_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_extend_linear_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_mirror_closest.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_mirror_closest.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_mirror_closest.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_mirror_closest.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_mirror_closest_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_mirror_closest_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_mirror_closest_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_mirror_closest_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_mirror_cubic.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_mirror_cubic.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_mirror_cubic.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_mirror_cubic.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_mirror_cubic_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_mirror_cubic_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_mirror_cubic_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_mirror_cubic_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_mirror_linear.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_mirror_linear.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_mirror_linear.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_mirror_linear.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_mirror_linear_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_mirror_linear_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_mirror_linear_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_mirror_linear_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_closest.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_closest.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_closest.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_closest.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_closest_1px.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_closest_1px.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_closest_1px.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_closest_1px.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_closest_1px_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_closest_1px_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_closest_1px_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_closest_1px_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_closest_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_closest_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_closest_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_closest_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_cubic.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_cubic.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_cubic.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_cubic.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_cubic_1px.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_cubic_1px.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_cubic_1px.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_cubic_1px.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_cubic_1px_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_cubic_1px_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_cubic_1px_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_cubic_1px_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_cubic_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_cubic_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_cubic_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_cubic_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_linear.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_linear.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_linear.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_linear.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_linear_1px.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_linear_1px.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_linear_1px.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_linear_1px.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_linear_1px_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_linear_1px_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_linear_1px_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_linear_1px_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_linear_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_linear_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_repeat_linear_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_repeat_linear_osl.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_udim.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_udim.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_udim.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_udim.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_udim_packed.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_udim_packed.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_udim_packed.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_udim_packed.png diff --git a/tests/files/render/image_mapping/eevee_next_renders/image_mapping_uvtile_osl.png b/tests/files/render/image_mapping/eevee_renders/image_mapping_uvtile_osl.png similarity index 100% rename from tests/files/render/image_mapping/eevee_next_renders/image_mapping_uvtile_osl.png rename to tests/files/render/image_mapping/eevee_renders/image_mapping_uvtile_osl.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_byte1.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_byte1.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_byte1.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_byte1.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_byte1_16bit.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_byte1_16bit.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_byte1_16bit.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_byte1_16bit.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_byte3.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_byte3.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_byte3.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_byte3.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_byte3_16bit.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_byte3_16bit.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_byte3_16bit.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_byte3_16bit.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_byte4.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_byte4.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_byte4.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_byte4.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_byte4_16bit.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_byte4_16bit.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_byte4_16bit.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_byte4_16bit.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_float3.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_float3.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_float3.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_float3.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_float4.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_float4.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_float4.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_float4.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_generated_byte.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_generated_byte.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_generated_byte.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_generated_byte.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_generated_float.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_generated_float.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_generated_float.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_generated_float.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_half3.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_half3.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_half3.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_half3.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_half4.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_half4.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_half4.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_half4.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_byte1.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_byte1.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_byte1.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_byte1.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_byte1_16bit.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_byte1_16bit.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_byte1_16bit.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_byte1_16bit.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_byte3.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_byte3.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_byte3.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_byte3.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_byte3_16bit.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_byte3_16bit.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_byte3_16bit.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_byte3_16bit.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_byte4.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_byte4.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_byte4.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_byte4.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_byte4_16bit.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_byte4_16bit.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_byte4_16bit.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_byte4_16bit.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_float3.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_float3.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_float3.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_float3.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_float4.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_float4.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_float4.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_float4.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_half3.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_half3.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_half3.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_half3.png diff --git a/tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_half4.png b/tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_half4.png similarity index 100% rename from tests/files/render/image_texture_limit/eevee_next_renders/image_texture_limit_packed_half4.png rename to tests/files/render/image_texture_limit/eevee_renders/image_texture_limit_packed_half4.png diff --git a/tests/files/render/integrator/eevee_next_renders/ao_approximate.png b/tests/files/render/integrator/eevee_renders/ao_approximate.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/ao_approximate.png rename to tests/files/render/integrator/eevee_renders/ao_approximate.png diff --git a/tests/files/render/integrator/eevee_next_renders/clamp_both.png b/tests/files/render/integrator/eevee_renders/clamp_both.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/clamp_both.png rename to tests/files/render/integrator/eevee_renders/clamp_both.png diff --git a/tests/files/render/integrator/eevee_next_renders/clamp_direct.png b/tests/files/render/integrator/eevee_renders/clamp_direct.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/clamp_direct.png rename to tests/files/render/integrator/eevee_renders/clamp_direct.png diff --git a/tests/files/render/integrator/eevee_next_renders/clamp_indirect.png b/tests/files/render/integrator/eevee_renders/clamp_indirect.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/clamp_indirect.png rename to tests/files/render/integrator/eevee_renders/clamp_indirect.png diff --git a/tests/files/render/integrator/eevee_next_renders/complex_shadow_intersection.png b/tests/files/render/integrator/eevee_renders/complex_shadow_intersection.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/complex_shadow_intersection.png rename to tests/files/render/integrator/eevee_renders/complex_shadow_intersection.png diff --git a/tests/files/render/integrator/eevee_next_renders/light_path_diffuse_depth.png b/tests/files/render/integrator/eevee_renders/light_path_diffuse_depth.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/light_path_diffuse_depth.png rename to tests/files/render/integrator/eevee_renders/light_path_diffuse_depth.png diff --git a/tests/files/render/integrator/eevee_next_renders/light_path_glossy_depth.png b/tests/files/render/integrator/eevee_renders/light_path_glossy_depth.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/light_path_glossy_depth.png rename to tests/files/render/integrator/eevee_renders/light_path_glossy_depth.png diff --git a/tests/files/render/integrator/eevee_next_renders/light_path_is_camera_ray.png b/tests/files/render/integrator/eevee_renders/light_path_is_camera_ray.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/light_path_is_camera_ray.png rename to tests/files/render/integrator/eevee_renders/light_path_is_camera_ray.png diff --git a/tests/files/render/integrator/eevee_next_renders/light_path_is_diffuse_ray.png b/tests/files/render/integrator/eevee_renders/light_path_is_diffuse_ray.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/light_path_is_diffuse_ray.png rename to tests/files/render/integrator/eevee_renders/light_path_is_diffuse_ray.png diff --git a/tests/files/render/integrator/eevee_next_renders/light_path_is_glossy_ray.png b/tests/files/render/integrator/eevee_renders/light_path_is_glossy_ray.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/light_path_is_glossy_ray.png rename to tests/files/render/integrator/eevee_renders/light_path_is_glossy_ray.png diff --git a/tests/files/render/integrator/eevee_next_renders/light_path_is_reflection_ray.png b/tests/files/render/integrator/eevee_renders/light_path_is_reflection_ray.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/light_path_is_reflection_ray.png rename to tests/files/render/integrator/eevee_renders/light_path_is_reflection_ray.png diff --git a/tests/files/render/integrator/eevee_next_renders/light_path_is_shadow_ray.png b/tests/files/render/integrator/eevee_renders/light_path_is_shadow_ray.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/light_path_is_shadow_ray.png rename to tests/files/render/integrator/eevee_renders/light_path_is_shadow_ray.png diff --git a/tests/files/render/integrator/eevee_next_renders/light_path_is_singular_ray.png b/tests/files/render/integrator/eevee_renders/light_path_is_singular_ray.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/light_path_is_singular_ray.png rename to tests/files/render/integrator/eevee_renders/light_path_is_singular_ray.png diff --git a/tests/files/render/integrator/eevee_next_renders/light_path_is_transmission_ray.png b/tests/files/render/integrator/eevee_renders/light_path_is_transmission_ray.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/light_path_is_transmission_ray.png rename to tests/files/render/integrator/eevee_renders/light_path_is_transmission_ray.png diff --git a/tests/files/render/integrator/eevee_next_renders/light_path_is_volume_scatter_ray.png b/tests/files/render/integrator/eevee_renders/light_path_is_volume_scatter_ray.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/light_path_is_volume_scatter_ray.png rename to tests/files/render/integrator/eevee_renders/light_path_is_volume_scatter_ray.png diff --git a/tests/files/render/integrator/eevee_next_renders/light_path_ray_depth.png b/tests/files/render/integrator/eevee_renders/light_path_ray_depth.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/light_path_ray_depth.png rename to tests/files/render/integrator/eevee_renders/light_path_ray_depth.png diff --git a/tests/files/render/integrator/eevee_next_renders/light_path_ray_length.png b/tests/files/render/integrator/eevee_renders/light_path_ray_length.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/light_path_ray_length.png rename to tests/files/render/integrator/eevee_renders/light_path_ray_length.png diff --git a/tests/files/render/integrator/eevee_next_renders/light_path_transmission_depth.png b/tests/files/render/integrator/eevee_renders/light_path_transmission_depth.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/light_path_transmission_depth.png rename to tests/files/render/integrator/eevee_renders/light_path_transmission_depth.png diff --git a/tests/files/render/integrator/eevee_next_renders/light_path_transparent_depth.png b/tests/files/render/integrator/eevee_renders/light_path_transparent_depth.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/light_path_transparent_depth.png rename to tests/files/render/integrator/eevee_renders/light_path_transparent_depth.png diff --git a/tests/files/render/integrator/eevee_next_renders/long_distance_precision.png b/tests/files/render/integrator/eevee_renders/long_distance_precision.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/long_distance_precision.png rename to tests/files/render/integrator/eevee_renders/long_distance_precision.png diff --git a/tests/files/render/integrator/eevee_next_renders/ray_offset.png b/tests/files/render/integrator/eevee_renders/ray_offset.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/ray_offset.png rename to tests/files/render/integrator/eevee_renders/ray_offset.png diff --git a/tests/files/render/integrator/eevee_next_renders/resumable_render.png b/tests/files/render/integrator/eevee_renders/resumable_render.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/resumable_render.png rename to tests/files/render/integrator/eevee_renders/resumable_render.png diff --git a/tests/files/render/integrator/eevee_next_renders/sample_subset.png b/tests/files/render/integrator/eevee_renders/sample_subset.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/sample_subset.png rename to tests/files/render/integrator/eevee_renders/sample_subset.png diff --git a/tests/files/render/integrator/eevee_next_renders/shading_offset.png b/tests/files/render/integrator/eevee_renders/shading_offset.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/shading_offset.png rename to tests/files/render/integrator/eevee_renders/shading_offset.png diff --git a/tests/files/render/integrator/eevee_next_renders/shadow_all_max_bounces.png b/tests/files/render/integrator/eevee_renders/shadow_all_max_bounces.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/shadow_all_max_bounces.png rename to tests/files/render/integrator/eevee_renders/shadow_all_max_bounces.png diff --git a/tests/files/render/integrator/eevee_next_renders/transparent_shadow.png b/tests/files/render/integrator/eevee_renders/transparent_shadow.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/transparent_shadow.png rename to tests/files/render/integrator/eevee_renders/transparent_shadow.png diff --git a/tests/files/render/integrator/eevee_next_renders/transparent_shadow_limit_0.png b/tests/files/render/integrator/eevee_renders/transparent_shadow_limit_0.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/transparent_shadow_limit_0.png rename to tests/files/render/integrator/eevee_renders/transparent_shadow_limit_0.png diff --git a/tests/files/render/integrator/eevee_next_renders/transparent_shadow_limit_1.png b/tests/files/render/integrator/eevee_renders/transparent_shadow_limit_1.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/transparent_shadow_limit_1.png rename to tests/files/render/integrator/eevee_renders/transparent_shadow_limit_1.png diff --git a/tests/files/render/integrator/eevee_next_renders/transparent_shadow_limit_1024.png b/tests/files/render/integrator/eevee_renders/transparent_shadow_limit_1024.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/transparent_shadow_limit_1024.png rename to tests/files/render/integrator/eevee_renders/transparent_shadow_limit_1024.png diff --git a/tests/files/render/integrator/eevee_next_renders/transparent_shadow_limit_401.png b/tests/files/render/integrator/eevee_renders/transparent_shadow_limit_401.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/transparent_shadow_limit_401.png rename to tests/files/render/integrator/eevee_renders/transparent_shadow_limit_401.png diff --git a/tests/files/render/integrator/eevee_next_renders/transparent_spatial_splits.png b/tests/files/render/integrator/eevee_renders/transparent_spatial_splits.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/transparent_spatial_splits.png rename to tests/files/render/integrator/eevee_renders/transparent_spatial_splits.png diff --git a/tests/files/render/integrator/eevee_next_renders/underwater_caustics.png b/tests/files/render/integrator/eevee_renders/underwater_caustics.png similarity index 100% rename from tests/files/render/integrator/eevee_next_renders/underwater_caustics.png rename to tests/files/render/integrator/eevee_renders/underwater_caustics.png diff --git a/tests/files/render/light/eevee_next_renders/all_light_types.png b/tests/files/render/light/eevee_renders/all_light_types.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/all_light_types.png rename to tests/files/render/light/eevee_renders/all_light_types.png diff --git a/tests/files/render/light/eevee_next_renders/all_light_types_in_volume.png b/tests/files/render/light/eevee_renders/all_light_types_in_volume.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/all_light_types_in_volume.png rename to tests/files/render/light/eevee_renders/all_light_types_in_volume.png diff --git a/tests/files/render/light/eevee_next_renders/area_light.png b/tests/files/render/light/eevee_renders/area_light.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/area_light.png rename to tests/files/render/light/eevee_renders/area_light.png diff --git a/tests/files/render/light/eevee_next_renders/area_light_uv.png b/tests/files/render/light/eevee_renders/area_light_uv.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/area_light_uv.png rename to tests/files/render/light/eevee_renders/area_light_uv.png diff --git a/tests/files/render/light/eevee_next_renders/cast_shadow_versioning.png b/tests/files/render/light/eevee_renders/cast_shadow_versioning.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/cast_shadow_versioning.png rename to tests/files/render/light/eevee_renders/cast_shadow_versioning.png diff --git a/tests/files/render/light/eevee_next_renders/distant_light.png b/tests/files/render/light/eevee_renders/distant_light.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/distant_light.png rename to tests/files/render/light/eevee_renders/distant_light.png diff --git a/tests/files/render/light/eevee_next_renders/distant_light_with_world_volume.png b/tests/files/render/light/eevee_renders/distant_light_with_world_volume.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/distant_light_with_world_volume.png rename to tests/files/render/light/eevee_renders/distant_light_with_world_volume.png diff --git a/tests/files/render/light/eevee_next_renders/ellipse_light_spread.png b/tests/files/render/light/eevee_renders/ellipse_light_spread.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/ellipse_light_spread.png rename to tests/files/render/light/eevee_renders/ellipse_light_spread.png diff --git a/tests/files/render/light/eevee_next_renders/ies_light.png b/tests/files/render/light/eevee_renders/ies_light.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/ies_light.png rename to tests/files/render/light/eevee_renders/ies_light.png diff --git a/tests/files/render/light/eevee_next_renders/instanced_mesh_lights.png b/tests/files/render/light/eevee_renders/instanced_mesh_lights.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/instanced_mesh_lights.png rename to tests/files/render/light/eevee_renders/instanced_mesh_lights.png diff --git a/tests/files/render/light/eevee_next_renders/light_falloff.png b/tests/files/render/light/eevee_renders/light_falloff.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/light_falloff.png rename to tests/files/render/light/eevee_renders/light_falloff.png diff --git a/tests/files/render/light/eevee_next_renders/light_normalize.png b/tests/files/render/light/eevee_renders/light_normalize.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/light_normalize.png rename to tests/files/render/light/eevee_renders/light_normalize.png diff --git a/tests/files/render/light/eevee_next_renders/light_ray_visibility.png b/tests/files/render/light/eevee_renders/light_ray_visibility.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/light_ray_visibility.png rename to tests/files/render/light/eevee_renders/light_ray_visibility.png diff --git a/tests/files/render/light/eevee_next_renders/light_ray_visibility_light_tree.png b/tests/files/render/light/eevee_renders/light_ray_visibility_light_tree.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/light_ray_visibility_light_tree.png rename to tests/files/render/light/eevee_renders/light_ray_visibility_light_tree.png diff --git a/tests/files/render/light/eevee_next_renders/light_spread.png b/tests/files/render/light/eevee_renders/light_spread.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/light_spread.png rename to tests/files/render/light/eevee_renders/light_spread.png diff --git a/tests/files/render/light/eevee_next_renders/light_temperature.png b/tests/files/render/light/eevee_renders/light_temperature.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/light_temperature.png rename to tests/files/render/light/eevee_renders/light_temperature.png diff --git a/tests/files/render/light/eevee_next_renders/light_texture.png b/tests/files/render/light/eevee_renders/light_texture.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/light_texture.png rename to tests/files/render/light/eevee_renders/light_texture.png diff --git a/tests/files/render/light/eevee_next_renders/light_tree_bump_map.png b/tests/files/render/light/eevee_renders/light_tree_bump_map.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/light_tree_bump_map.png rename to tests/files/render/light/eevee_renders/light_tree_bump_map.png diff --git a/tests/files/render/light/eevee_next_renders/light_tree_bump_map_no_correction.png b/tests/files/render/light/eevee_renders/light_tree_bump_map_no_correction.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/light_tree_bump_map_no_correction.png rename to tests/files/render/light/eevee_renders/light_tree_bump_map_no_correction.png diff --git a/tests/files/render/light/eevee_next_renders/light_tree_multi_distant.png b/tests/files/render/light/eevee_renders/light_tree_multi_distant.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/light_tree_multi_distant.png rename to tests/files/render/light/eevee_renders/light_tree_multi_distant.png diff --git a/tests/files/render/light/eevee_next_renders/light_tree_node_subtended_angle.png b/tests/files/render/light/eevee_renders/light_tree_node_subtended_angle.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/light_tree_node_subtended_angle.png rename to tests/files/render/light/eevee_renders/light_tree_node_subtended_angle.png diff --git a/tests/files/render/light/eevee_next_renders/lights_below_surface.png b/tests/files/render/light/eevee_renders/lights_below_surface.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/lights_below_surface.png rename to tests/files/render/light/eevee_renders/lights_below_surface.png diff --git a/tests/files/render/light/eevee_next_renders/mesh_light.png b/tests/files/render/light/eevee_renders/mesh_light.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/mesh_light.png rename to tests/files/render/light/eevee_renders/mesh_light.png diff --git a/tests/files/render/light/eevee_next_renders/mesh_light_backface.png b/tests/files/render/light/eevee_renders/mesh_light_backface.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/mesh_light_backface.png rename to tests/files/render/light/eevee_renders/mesh_light_backface.png diff --git a/tests/files/render/light/eevee_next_renders/mesh_light_small.png b/tests/files/render/light/eevee_renders/mesh_light_small.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/mesh_light_small.png rename to tests/files/render/light/eevee_renders/mesh_light_small.png diff --git a/tests/files/render/light/eevee_next_renders/multiple_area_lights.png b/tests/files/render/light/eevee_renders/multiple_area_lights.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/multiple_area_lights.png rename to tests/files/render/light/eevee_renders/multiple_area_lights.png diff --git a/tests/files/render/light/eevee_next_renders/multiple_lights_in_volume.png b/tests/files/render/light/eevee_renders/multiple_lights_in_volume.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/multiple_lights_in_volume.png rename to tests/files/render/light/eevee_renders/multiple_lights_in_volume.png diff --git a/tests/files/render/light/eevee_next_renders/multiple_mesh_lights.png b/tests/files/render/light/eevee_renders/multiple_mesh_lights.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/multiple_mesh_lights.png rename to tests/files/render/light/eevee_renders/multiple_mesh_lights.png diff --git a/tests/files/render/light/eevee_next_renders/point_light.png b/tests/files/render/light/eevee_renders/point_light.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/point_light.png rename to tests/files/render/light/eevee_renders/point_light.png diff --git a/tests/files/render/light/eevee_next_renders/portal.png b/tests/files/render/light/eevee_renders/portal.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/portal.png rename to tests/files/render/light/eevee_renders/portal.png diff --git a/tests/files/render/light/eevee_next_renders/soft_sphere_light.png b/tests/files/render/light/eevee_renders/soft_sphere_light.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/soft_sphere_light.png rename to tests/files/render/light/eevee_renders/soft_sphere_light.png diff --git a/tests/files/render/light/eevee_next_renders/sphere_light.png b/tests/files/render/light/eevee_renders/sphere_light.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/sphere_light.png rename to tests/files/render/light/eevee_renders/sphere_light.png diff --git a/tests/files/render/light/eevee_next_renders/sphere_spot_light.png b/tests/files/render/light/eevee_renders/sphere_spot_light.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/sphere_spot_light.png rename to tests/files/render/light/eevee_renders/sphere_spot_light.png diff --git a/tests/files/render/light/eevee_next_renders/spot_light.png b/tests/files/render/light/eevee_renders/spot_light.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/spot_light.png rename to tests/files/render/light/eevee_renders/spot_light.png diff --git a/tests/files/render/light/eevee_next_renders/spot_light_adaptive_split.png b/tests/files/render/light/eevee_renders/spot_light_adaptive_split.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/spot_light_adaptive_split.png rename to tests/files/render/light/eevee_renders/spot_light_adaptive_split.png diff --git a/tests/files/render/light/eevee_next_renders/translucent_inside_outside.png b/tests/files/render/light/eevee_renders/translucent_inside_outside.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/translucent_inside_outside.png rename to tests/files/render/light/eevee_renders/translucent_inside_outside.png diff --git a/tests/files/render/light/eevee_next_renders/triangle_light_sampling.png b/tests/files/render/light/eevee_renders/triangle_light_sampling.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/triangle_light_sampling.png rename to tests/files/render/light/eevee_renders/triangle_light_sampling.png diff --git a/tests/files/render/light/eevee_next_renders/varying_brightness.png b/tests/files/render/light/eevee_renders/varying_brightness.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/varying_brightness.png rename to tests/files/render/light/eevee_renders/varying_brightness.png diff --git a/tests/files/render/light/eevee_next_renders/volume_zero_angle_distant_light.png b/tests/files/render/light/eevee_renders/volume_zero_angle_distant_light.png similarity index 100% rename from tests/files/render/light/eevee_next_renders/volume_zero_angle_distant_light.png rename to tests/files/render/light/eevee_renders/volume_zero_angle_distant_light.png diff --git a/tests/files/render/light_linking/eevee_next_renders/light_link_distant_multi_tree.png b/tests/files/render/light_linking/eevee_renders/light_link_distant_multi_tree.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/light_link_distant_multi_tree.png rename to tests/files/render/light_linking/eevee_renders/light_link_distant_multi_tree.png diff --git a/tests/files/render/light_linking/eevee_next_renders/light_link_distant_tree.png b/tests/files/render/light_linking/eevee_renders/light_link_distant_tree.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/light_link_distant_tree.png rename to tests/files/render/light_linking/eevee_renders/light_link_distant_tree.png diff --git a/tests/files/render/light_linking/eevee_next_renders/light_link_exclude.png b/tests/files/render/light_linking/eevee_renders/light_link_exclude.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/light_link_exclude.png rename to tests/files/render/light_linking/eevee_renders/light_link_exclude.png diff --git a/tests/files/render/light_linking/eevee_next_renders/light_link_hidden.png b/tests/files/render/light_linking/eevee_renders/light_link_hidden.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/light_link_hidden.png rename to tests/files/render/light_linking/eevee_renders/light_link_hidden.png diff --git a/tests/files/render/light_linking/eevee_next_renders/light_link_instanced_receiver.png b/tests/files/render/light_linking/eevee_renders/light_link_instanced_receiver.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/light_link_instanced_receiver.png rename to tests/files/render/light_linking/eevee_renders/light_link_instanced_receiver.png diff --git a/tests/files/render/light_linking/eevee_next_renders/light_link_mesh_tree.png b/tests/files/render/light_linking/eevee_renders/light_link_mesh_tree.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/light_link_mesh_tree.png rename to tests/files/render/light_linking/eevee_renders/light_link_mesh_tree.png diff --git a/tests/files/render/light_linking/eevee_next_renders/light_link_simple.png b/tests/files/render/light_linking/eevee_renders/light_link_simple.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/light_link_simple.png rename to tests/files/render/light_linking/eevee_renders/light_link_simple.png diff --git a/tests/files/render/light_linking/eevee_next_renders/light_link_simple_tree.png b/tests/files/render/light_linking/eevee_renders/light_link_simple_tree.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/light_link_simple_tree.png rename to tests/files/render/light_linking/eevee_renders/light_link_simple_tree.png diff --git a/tests/files/render/light_linking/eevee_next_renders/light_link_single_light.png b/tests/files/render/light_linking/eevee_renders/light_link_single_light.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/light_link_single_light.png rename to tests/files/render/light_linking/eevee_renders/light_link_single_light.png diff --git a/tests/files/render/light_linking/eevee_next_renders/light_link_surface_in_volume.png b/tests/files/render/light_linking/eevee_renders/light_link_surface_in_volume.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/light_link_surface_in_volume.png rename to tests/files/render/light_linking/eevee_renders/light_link_surface_in_volume.png diff --git a/tests/files/render/light_linking/eevee_next_renders/light_link_volume.png b/tests/files/render/light_linking/eevee_renders/light_link_volume.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/light_link_volume.png rename to tests/files/render/light_linking/eevee_renders/light_link_volume.png diff --git a/tests/files/render/light_linking/eevee_next_renders/link_link_share_bit_trail.png b/tests/files/render/light_linking/eevee_renders/link_link_share_bit_trail.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/link_link_share_bit_trail.png rename to tests/files/render/light_linking/eevee_renders/link_link_share_bit_trail.png diff --git a/tests/files/render/light_linking/eevee_next_renders/shadow_link_blocked.png b/tests/files/render/light_linking/eevee_renders/shadow_link_blocked.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/shadow_link_blocked.png rename to tests/files/render/light_linking/eevee_renders/shadow_link_blocked.png diff --git a/tests/files/render/light_linking/eevee_next_renders/shadow_link_blocked_distant.png b/tests/files/render/light_linking/eevee_renders/shadow_link_blocked_distant.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/shadow_link_blocked_distant.png rename to tests/files/render/light_linking/eevee_renders/shadow_link_blocked_distant.png diff --git a/tests/files/render/light_linking/eevee_next_renders/shadow_link_clamp.png b/tests/files/render/light_linking/eevee_renders/shadow_link_clamp.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/shadow_link_clamp.png rename to tests/files/render/light_linking/eevee_renders/shadow_link_clamp.png diff --git a/tests/files/render/light_linking/eevee_next_renders/shadow_link_distant.png b/tests/files/render/light_linking/eevee_renders/shadow_link_distant.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/shadow_link_distant.png rename to tests/files/render/light_linking/eevee_renders/shadow_link_distant.png diff --git a/tests/files/render/light_linking/eevee_next_renders/shadow_link_glossy.png b/tests/files/render/light_linking/eevee_renders/shadow_link_glossy.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/shadow_link_glossy.png rename to tests/files/render/light_linking/eevee_renders/shadow_link_glossy.png diff --git a/tests/files/render/light_linking/eevee_next_renders/shadow_link_hidden.png b/tests/files/render/light_linking/eevee_renders/shadow_link_hidden.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/shadow_link_hidden.png rename to tests/files/render/light_linking/eevee_renders/shadow_link_hidden.png diff --git a/tests/files/render/light_linking/eevee_next_renders/shadow_link_mesh.png b/tests/files/render/light_linking/eevee_renders/shadow_link_mesh.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/shadow_link_mesh.png rename to tests/files/render/light_linking/eevee_renders/shadow_link_mesh.png diff --git a/tests/files/render/light_linking/eevee_next_renders/shadow_link_multiple_lights.png b/tests/files/render/light_linking/eevee_renders/shadow_link_multiple_lights.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/shadow_link_multiple_lights.png rename to tests/files/render/light_linking/eevee_renders/shadow_link_multiple_lights.png diff --git a/tests/files/render/light_linking/eevee_next_renders/shadow_link_simple.png b/tests/files/render/light_linking/eevee_renders/shadow_link_simple.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/shadow_link_simple.png rename to tests/files/render/light_linking/eevee_renders/shadow_link_simple.png diff --git a/tests/files/render/light_linking/eevee_next_renders/shadow_link_simple_3D_curve.png b/tests/files/render/light_linking/eevee_renders/shadow_link_simple_3D_curve.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/shadow_link_simple_3D_curve.png rename to tests/files/render/light_linking/eevee_renders/shadow_link_simple_3D_curve.png diff --git a/tests/files/render/light_linking/eevee_next_renders/shadow_link_simple_point_cloud.png b/tests/files/render/light_linking/eevee_renders/shadow_link_simple_point_cloud.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/shadow_link_simple_point_cloud.png rename to tests/files/render/light_linking/eevee_renders/shadow_link_simple_point_cloud.png diff --git a/tests/files/render/light_linking/eevee_next_renders/shadow_link_simple_ribbon_curve.png b/tests/files/render/light_linking/eevee_renders/shadow_link_simple_ribbon_curve.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/shadow_link_simple_ribbon_curve.png rename to tests/files/render/light_linking/eevee_renders/shadow_link_simple_ribbon_curve.png diff --git a/tests/files/render/light_linking/eevee_next_renders/shadow_link_transparency.png b/tests/files/render/light_linking/eevee_renders/shadow_link_transparency.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/shadow_link_transparency.png rename to tests/files/render/light_linking/eevee_renders/shadow_link_transparency.png diff --git a/tests/files/render/light_linking/eevee_next_renders/shadow_link_volume.png b/tests/files/render/light_linking/eevee_renders/shadow_link_volume.png similarity index 100% rename from tests/files/render/light_linking/eevee_next_renders/shadow_link_volume.png rename to tests/files/render/light_linking/eevee_renders/shadow_link_volume.png diff --git a/tests/files/render/mesh/eevee_next_renders/adaptive_subdivision_geometry_features.png b/tests/files/render/mesh/eevee_renders/adaptive_subdivision_geometry_features.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/adaptive_subdivision_geometry_features.png rename to tests/files/render/mesh/eevee_renders/adaptive_subdivision_geometry_features.png diff --git a/tests/files/render/mesh/eevee_next_renders/autosmooth_custom_normals.png b/tests/files/render/mesh/eevee_renders/autosmooth_custom_normals.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/autosmooth_custom_normals.png rename to tests/files/render/mesh/eevee_renders/autosmooth_custom_normals.png diff --git a/tests/files/render/mesh/eevee_next_renders/autosmooth_simple.png b/tests/files/render/mesh/eevee_renders/autosmooth_simple.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/autosmooth_simple.png rename to tests/files/render/mesh/eevee_renders/autosmooth_simple.png diff --git a/tests/files/render/mesh/eevee_next_renders/autosmooth_subdmesh_catmull.png b/tests/files/render/mesh/eevee_renders/autosmooth_subdmesh_catmull.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/autosmooth_subdmesh_catmull.png rename to tests/files/render/mesh/eevee_renders/autosmooth_subdmesh_catmull.png diff --git a/tests/files/render/mesh/eevee_next_renders/autosmooth_subdmesh_linear.png b/tests/files/render/mesh/eevee_renders/autosmooth_subdmesh_linear.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/autosmooth_subdmesh_linear.png rename to tests/files/render/mesh/eevee_renders/autosmooth_subdmesh_linear.png diff --git a/tests/files/render/mesh/eevee_next_renders/bvh8_close_proximity_visibility.png b/tests/files/render/mesh/eevee_renders/bvh8_close_proximity_visibility.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/bvh8_close_proximity_visibility.png rename to tests/files/render/mesh/eevee_renders/bvh8_close_proximity_visibility.png diff --git a/tests/files/render/mesh/eevee_next_renders/culling.png b/tests/files/render/mesh/eevee_renders/culling.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/culling.png rename to tests/files/render/mesh/eevee_renders/culling.png diff --git a/tests/files/render/mesh/eevee_next_renders/curve_modifier.png b/tests/files/render/mesh/eevee_renders/curve_modifier.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/curve_modifier.png rename to tests/files/render/mesh/eevee_renders/curve_modifier.png diff --git a/tests/files/render/mesh/eevee_next_renders/double_instance_transformation.png b/tests/files/render/mesh/eevee_renders/double_instance_transformation.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/double_instance_transformation.png rename to tests/files/render/mesh/eevee_renders/double_instance_transformation.png diff --git a/tests/files/render/mesh/eevee_next_renders/edit_mode.png b/tests/files/render/mesh/eevee_renders/edit_mode.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/edit_mode.png rename to tests/files/render/mesh/eevee_renders/edit_mode.png diff --git a/tests/files/render/mesh/eevee_next_renders/normal_types.png b/tests/files/render/mesh/eevee_renders/normal_types.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/normal_types.png rename to tests/files/render/mesh/eevee_renders/normal_types.png diff --git a/tests/files/render/mesh/eevee_next_renders/normal_types_motion.png b/tests/files/render/mesh/eevee_renders/normal_types_motion.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/normal_types_motion.png rename to tests/files/render/mesh/eevee_renders/normal_types_motion.png diff --git a/tests/files/render/mesh/eevee_next_renders/pointiness.png b/tests/files/render/mesh/eevee_renders/pointiness.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/pointiness.png rename to tests/files/render/mesh/eevee_renders/pointiness.png diff --git a/tests/files/render/mesh/eevee_next_renders/pointiness_autosplit.png b/tests/files/render/mesh/eevee_renders/pointiness_autosplit.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/pointiness_autosplit.png rename to tests/files/render/mesh/eevee_renders/pointiness_autosplit.png diff --git a/tests/files/render/mesh/eevee_next_renders/pointiness_split_faces.png b/tests/files/render/mesh/eevee_renders/pointiness_split_faces.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/pointiness_split_faces.png rename to tests/files/render/mesh/eevee_renders/pointiness_split_faces.png diff --git a/tests/files/render/mesh/eevee_next_renders/shadow_terminator.png b/tests/files/render/mesh/eevee_renders/shadow_terminator.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/shadow_terminator.png rename to tests/files/render/mesh/eevee_renders/shadow_terminator.png diff --git a/tests/files/render/mesh/eevee_next_renders/shadow_terminator_metal.png b/tests/files/render/mesh/eevee_renders/shadow_terminator_metal.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/shadow_terminator_metal.png rename to tests/files/render/mesh/eevee_renders/shadow_terminator_metal.png diff --git a/tests/files/render/mesh/eevee_next_renders/tangent_missing_uv.png b/tests/files/render/mesh/eevee_renders/tangent_missing_uv.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/tangent_missing_uv.png rename to tests/files/render/mesh/eevee_renders/tangent_missing_uv.png diff --git a/tests/files/render/mesh/eevee_next_renders/tangent_no_uv.png b/tests/files/render/mesh/eevee_renders/tangent_no_uv.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/tangent_no_uv.png rename to tests/files/render/mesh/eevee_renders/tangent_no_uv.png diff --git a/tests/files/render/mesh/eevee_next_renders/tangent_render_uv.png b/tests/files/render/mesh/eevee_renders/tangent_render_uv.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/tangent_render_uv.png rename to tests/files/render/mesh/eevee_renders/tangent_render_uv.png diff --git a/tests/files/render/mesh/eevee_next_renders/tangent_specific_uv_other.png b/tests/files/render/mesh/eevee_renders/tangent_specific_uv_other.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/tangent_specific_uv_other.png rename to tests/files/render/mesh/eevee_renders/tangent_specific_uv_other.png diff --git a/tests/files/render/mesh/eevee_next_renders/tangent_specific_uv_render.png b/tests/files/render/mesh/eevee_renders/tangent_specific_uv_render.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/tangent_specific_uv_render.png rename to tests/files/render/mesh/eevee_renders/tangent_specific_uv_render.png diff --git a/tests/files/render/mesh/eevee_next_renders/tangent_triangles.png b/tests/files/render/mesh/eevee_renders/tangent_triangles.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/tangent_triangles.png rename to tests/files/render/mesh/eevee_renders/tangent_triangles.png diff --git a/tests/files/render/mesh/eevee_next_renders/texture_space_bezier.png b/tests/files/render/mesh/eevee_renders/texture_space_bezier.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/texture_space_bezier.png rename to tests/files/render/mesh/eevee_renders/texture_space_bezier.png diff --git a/tests/files/render/mesh/eevee_next_renders/texture_space_bezier_auto.png b/tests/files/render/mesh/eevee_renders/texture_space_bezier_auto.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/texture_space_bezier_auto.png rename to tests/files/render/mesh/eevee_renders/texture_space_bezier_auto.png diff --git a/tests/files/render/mesh/eevee_next_renders/texture_space_font.png b/tests/files/render/mesh/eevee_renders/texture_space_font.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/texture_space_font.png rename to tests/files/render/mesh/eevee_renders/texture_space_font.png diff --git a/tests/files/render/mesh/eevee_next_renders/texture_space_font_auto.png b/tests/files/render/mesh/eevee_renders/texture_space_font_auto.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/texture_space_font_auto.png rename to tests/files/render/mesh/eevee_renders/texture_space_font_auto.png diff --git a/tests/files/render/mesh/eevee_next_renders/texture_space_mesh_modifier.png b/tests/files/render/mesh/eevee_renders/texture_space_mesh_modifier.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/texture_space_mesh_modifier.png rename to tests/files/render/mesh/eevee_renders/texture_space_mesh_modifier.png diff --git a/tests/files/render/mesh/eevee_next_renders/texture_space_nurbs.png b/tests/files/render/mesh/eevee_renders/texture_space_nurbs.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/texture_space_nurbs.png rename to tests/files/render/mesh/eevee_renders/texture_space_nurbs.png diff --git a/tests/files/render/mesh/eevee_next_renders/texture_space_nurbs_auto.png b/tests/files/render/mesh/eevee_renders/texture_space_nurbs_auto.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/texture_space_nurbs_auto.png rename to tests/files/render/mesh/eevee_renders/texture_space_nurbs_auto.png diff --git a/tests/files/render/mesh/eevee_next_renders/visibility_instances.png b/tests/files/render/mesh/eevee_renders/visibility_instances.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/visibility_instances.png rename to tests/files/render/mesh/eevee_renders/visibility_instances.png diff --git a/tests/files/render/mesh/eevee_next_renders/visibility_particles.png b/tests/files/render/mesh/eevee_renders/visibility_particles.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/visibility_particles.png rename to tests/files/render/mesh/eevee_renders/visibility_particles.png diff --git a/tests/files/render/mesh/eevee_next_renders/watertight.png b/tests/files/render/mesh/eevee_renders/watertight.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/watertight.png rename to tests/files/render/mesh/eevee_renders/watertight.png diff --git a/tests/files/render/mesh/eevee_next_renders/watertight_orig.png b/tests/files/render/mesh/eevee_renders/watertight_orig.png similarity index 100% rename from tests/files/render/mesh/eevee_next_renders/watertight_orig.png rename to tests/files/render/mesh/eevee_renders/watertight_orig.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/bvh_steps_curve_segments_0.png b/tests/files/render/motion_blur/eevee_renders/bvh_steps_curve_segments_0.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/bvh_steps_curve_segments_0.png rename to tests/files/render/motion_blur/eevee_renders/bvh_steps_curve_segments_0.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/bvh_steps_curve_segments_3.png b/tests/files/render/motion_blur/eevee_renders/bvh_steps_curve_segments_3.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/bvh_steps_curve_segments_3.png rename to tests/files/render/motion_blur/eevee_renders/bvh_steps_curve_segments_3.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/bvh_steps_line_segments_0.png b/tests/files/render/motion_blur/eevee_renders/bvh_steps_line_segments_0.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/bvh_steps_line_segments_0.png rename to tests/files/render/motion_blur/eevee_renders/bvh_steps_line_segments_0.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/bvh_steps_line_segments_3.png b/tests/files/render/motion_blur/eevee_renders/bvh_steps_line_segments_3.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/bvh_steps_line_segments_3.png rename to tests/files/render/motion_blur/eevee_renders/bvh_steps_line_segments_3.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/camera_zoom_blur_perspective.png b/tests/files/render/motion_blur/eevee_renders/camera_zoom_blur_perspective.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/camera_zoom_blur_perspective.png rename to tests/files/render/motion_blur/eevee_renders/camera_zoom_blur_perspective.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/curve_motion_blur.png b/tests/files/render/motion_blur/eevee_renders/curve_motion_blur.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/curve_motion_blur.png rename to tests/files/render/motion_blur/eevee_renders/curve_motion_blur.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/fluid_motion_blur.png b/tests/files/render/motion_blur/eevee_renders/fluid_motion_blur.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/fluid_motion_blur.png rename to tests/files/render/motion_blur/eevee_renders/fluid_motion_blur.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/fluid_motion_blur_disabled.png b/tests/files/render/motion_blur/eevee_renders/fluid_motion_blur_disabled.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/fluid_motion_blur_disabled.png rename to tests/files/render/motion_blur/eevee_renders/fluid_motion_blur_disabled.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/large_combined_motion.png b/tests/files/render/motion_blur/eevee_renders/large_combined_motion.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/large_combined_motion.png rename to tests/files/render/motion_blur/eevee_renders/large_combined_motion.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/mblur_deform_autosmooth.png b/tests/files/render/motion_blur/eevee_renders/mblur_deform_autosmooth.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/mblur_deform_autosmooth.png rename to tests/files/render/motion_blur/eevee_renders/mblur_deform_autosmooth.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/mblur_deform_simple.png b/tests/files/render/motion_blur/eevee_renders/mblur_deform_simple.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/mblur_deform_simple.png rename to tests/files/render/motion_blur/eevee_renders/mblur_deform_simple.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/multi_step_motion_blur.png b/tests/files/render/motion_blur/eevee_renders/multi_step_motion_blur.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/multi_step_motion_blur.png rename to tests/files/render/motion_blur/eevee_renders/multi_step_motion_blur.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/multi_step_velocity_motion_blur.png b/tests/files/render/motion_blur/eevee_renders/multi_step_velocity_motion_blur.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/multi_step_velocity_motion_blur.png rename to tests/files/render/motion_blur/eevee_renders/multi_step_velocity_motion_blur.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/rolling_shutter.png b/tests/files/render/motion_blur/eevee_renders/rolling_shutter.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/rolling_shutter.png rename to tests/files/render/motion_blur/eevee_renders/rolling_shutter.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/scale_motion_blur.png b/tests/files/render/motion_blur/eevee_renders/scale_motion_blur.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/scale_motion_blur.png rename to tests/files/render/motion_blur/eevee_renders/scale_motion_blur.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/shutter_curve_default.png b/tests/files/render/motion_blur/eevee_renders/shutter_curve_default.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/shutter_curve_default.png rename to tests/files/render/motion_blur/eevee_renders/shutter_curve_default.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/shutter_curve_triangle.png b/tests/files/render/motion_blur/eevee_renders/shutter_curve_triangle.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/shutter_curve_triangle.png rename to tests/files/render/motion_blur/eevee_renders/shutter_curve_triangle.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/shutter_moving_camera_center.png b/tests/files/render/motion_blur/eevee_renders/shutter_moving_camera_center.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/shutter_moving_camera_center.png rename to tests/files/render/motion_blur/eevee_renders/shutter_moving_camera_center.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/shutter_moving_camera_end.png b/tests/files/render/motion_blur/eevee_renders/shutter_moving_camera_end.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/shutter_moving_camera_end.png rename to tests/files/render/motion_blur/eevee_renders/shutter_moving_camera_end.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/shutter_moving_camera_start.png b/tests/files/render/motion_blur/eevee_renders/shutter_moving_camera_start.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/shutter_moving_camera_start.png rename to tests/files/render/motion_blur/eevee_renders/shutter_moving_camera_start.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/shutter_moving_object_center.png b/tests/files/render/motion_blur/eevee_renders/shutter_moving_object_center.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/shutter_moving_object_center.png rename to tests/files/render/motion_blur/eevee_renders/shutter_moving_object_center.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/shutter_moving_object_end.png b/tests/files/render/motion_blur/eevee_renders/shutter_moving_object_end.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/shutter_moving_object_end.png rename to tests/files/render/motion_blur/eevee_renders/shutter_moving_object_end.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/shutter_moving_object_start.png b/tests/files/render/motion_blur/eevee_renders/shutter_moving_object_start.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/shutter_moving_object_start.png rename to tests/files/render/motion_blur/eevee_renders/shutter_moving_object_start.png diff --git a/tests/files/render/motion_blur/eevee_next_renders/subd_motion_blur.png b/tests/files/render/motion_blur/eevee_renders/subd_motion_blur.png similarity index 100% rename from tests/files/render/motion_blur/eevee_next_renders/subd_motion_blur.png rename to tests/files/render/motion_blur/eevee_renders/subd_motion_blur.png diff --git a/tests/files/render/openvdb/eevee_next_renders/fire.png b/tests/files/render/openvdb/eevee_renders/fire.png similarity index 100% rename from tests/files/render/openvdb/eevee_next_renders/fire.png rename to tests/files/render/openvdb/eevee_renders/fire.png diff --git a/tests/files/render/openvdb/eevee_next_renders/openvdb_overlap.png b/tests/files/render/openvdb/eevee_renders/openvdb_overlap.png similarity index 100% rename from tests/files/render/openvdb/eevee_next_renders/openvdb_overlap.png rename to tests/files/render/openvdb/eevee_renders/openvdb_overlap.png diff --git a/tests/files/render/openvdb/eevee_next_renders/openvdb_smoke.png b/tests/files/render/openvdb/eevee_renders/openvdb_smoke.png similarity index 100% rename from tests/files/render/openvdb/eevee_next_renders/openvdb_smoke.png rename to tests/files/render/openvdb/eevee_renders/openvdb_smoke.png diff --git a/tests/files/render/openvdb/eevee_next_renders/point_density_particle_object.png b/tests/files/render/openvdb/eevee_renders/point_density_particle_object.png similarity index 100% rename from tests/files/render/openvdb/eevee_next_renders/point_density_particle_object.png rename to tests/files/render/openvdb/eevee_renders/point_density_particle_object.png diff --git a/tests/files/render/openvdb/eevee_next_renders/point_density_particle_world.png b/tests/files/render/openvdb/eevee_renders/point_density_particle_world.png similarity index 100% rename from tests/files/render/openvdb/eevee_next_renders/point_density_particle_world.png rename to tests/files/render/openvdb/eevee_renders/point_density_particle_world.png diff --git a/tests/files/render/openvdb/eevee_next_renders/point_density_vertices_object.png b/tests/files/render/openvdb/eevee_renders/point_density_vertices_object.png similarity index 100% rename from tests/files/render/openvdb/eevee_next_renders/point_density_vertices_object.png rename to tests/files/render/openvdb/eevee_renders/point_density_vertices_object.png diff --git a/tests/files/render/openvdb/eevee_next_renders/point_density_vertices_world.png b/tests/files/render/openvdb/eevee_renders/point_density_vertices_world.png similarity index 100% rename from tests/files/render/openvdb/eevee_next_renders/point_density_vertices_world.png rename to tests/files/render/openvdb/eevee_renders/point_density_vertices_world.png diff --git a/tests/files/render/openvdb/eevee_next_renders/principled_blackbody.png b/tests/files/render/openvdb/eevee_renders/principled_blackbody.png similarity index 100% rename from tests/files/render/openvdb/eevee_next_renders/principled_blackbody.png rename to tests/files/render/openvdb/eevee_renders/principled_blackbody.png diff --git a/tests/files/render/openvdb/eevee_next_renders/principled_smoke.png b/tests/files/render/openvdb/eevee_renders/principled_smoke.png similarity index 100% rename from tests/files/render/openvdb/eevee_next_renders/principled_smoke.png rename to tests/files/render/openvdb/eevee_renders/principled_smoke.png diff --git a/tests/files/render/openvdb/eevee_next_renders/smoke.png b/tests/files/render/openvdb/eevee_renders/smoke.png similarity index 100% rename from tests/files/render/openvdb/eevee_next_renders/smoke.png rename to tests/files/render/openvdb/eevee_renders/smoke.png diff --git a/tests/files/render/openvdb/eevee_next_renders/smoke_color.png b/tests/files/render/openvdb/eevee_renders/smoke_color.png similarity index 100% rename from tests/files/render/openvdb/eevee_next_renders/smoke_color.png rename to tests/files/render/openvdb/eevee_renders/smoke_color.png diff --git a/tests/files/render/openvdb/eevee_next_renders/smoke_fire.png b/tests/files/render/openvdb/eevee_renders/smoke_fire.png similarity index 100% rename from tests/files/render/openvdb/eevee_next_renders/smoke_fire.png rename to tests/files/render/openvdb/eevee_renders/smoke_fire.png diff --git a/tests/files/render/pointcloud/eevee_next_renders/point_info.png b/tests/files/render/pointcloud/eevee_renders/point_info.png similarity index 100% rename from tests/files/render/pointcloud/eevee_next_renders/point_info.png rename to tests/files/render/pointcloud/eevee_renders/point_info.png diff --git a/tests/files/render/pointcloud/eevee_next_renders/points.png b/tests/files/render/pointcloud/eevee_renders/points.png similarity index 100% rename from tests/files/render/pointcloud/eevee_next_renders/points.png rename to tests/files/render/pointcloud/eevee_renders/points.png diff --git a/tests/files/render/pointcloud/eevee_next_renders/points_emission.png b/tests/files/render/pointcloud/eevee_renders/points_emission.png similarity index 100% rename from tests/files/render/pointcloud/eevee_next_renders/points_emission.png rename to tests/files/render/pointcloud/eevee_renders/points_emission.png diff --git a/tests/files/render/pointcloud/eevee_next_renders/points_motion.png b/tests/files/render/pointcloud/eevee_renders/points_motion.png similarity index 100% rename from tests/files/render/pointcloud/eevee_next_renders/points_motion.png rename to tests/files/render/pointcloud/eevee_renders/points_motion.png diff --git a/tests/files/render/pointcloud/eevee_next_renders/points_transparent.png b/tests/files/render/pointcloud/eevee_renders/points_transparent.png similarity index 100% rename from tests/files/render/pointcloud/eevee_next_renders/points_transparent.png rename to tests/files/render/pointcloud/eevee_renders/points_transparent.png diff --git a/tests/files/render/pointcloud/eevee_next_renders/points_volume.png b/tests/files/render/pointcloud/eevee_renders/points_volume.png similarity index 100% rename from tests/files/render/pointcloud/eevee_next_renders/points_volume.png rename to tests/files/render/pointcloud/eevee_renders/points_volume.png diff --git a/tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_coat.png b/tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_coat.png similarity index 100% rename from tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_coat.png rename to tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_coat.png diff --git a/tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_coat_zero_weight.png b/tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_coat_zero_weight.png similarity index 100% rename from tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_coat_zero_weight.png rename to tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_coat_zero_weight.png diff --git a/tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_default.png b/tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_default.png similarity index 100% rename from tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_default.png rename to tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_default.png diff --git a/tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_emission.png b/tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_emission.png similarity index 100% rename from tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_emission.png rename to tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_emission.png diff --git a/tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_emission_alpha.png b/tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_emission_alpha.png similarity index 100% rename from tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_emission_alpha.png rename to tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_emission_alpha.png diff --git a/tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_metallic.png b/tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_metallic.png similarity index 100% rename from tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_metallic.png rename to tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_metallic.png diff --git a/tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_sheen.png b/tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_sheen.png similarity index 100% rename from tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_sheen.png rename to tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_sheen.png diff --git a/tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_specular.png b/tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_specular.png similarity index 100% rename from tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_specular.png rename to tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_specular.png diff --git a/tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_subsurface.png b/tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_subsurface.png similarity index 100% rename from tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_subsurface.png rename to tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_subsurface.png diff --git a/tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_thinfilm_reflection.png b/tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_thinfilm_reflection.png similarity index 100% rename from tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_thinfilm_reflection.png rename to tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_thinfilm_reflection.png diff --git a/tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_thinfilm_transmission.png b/tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_thinfilm_transmission.png similarity index 100% rename from tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_thinfilm_transmission.png rename to tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_thinfilm_transmission.png diff --git a/tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_transmission.png b/tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_transmission.png similarity index 100% rename from tests/files/render/principled_bsdf/eevee_next_renders/principled_bsdf_transmission.png rename to tests/files/render/principled_bsdf/eevee_renders/principled_bsdf_transmission.png diff --git a/tests/files/render/render_layer/eevee_next_renders/aov_position.png b/tests/files/render/render_layer/eevee_renders/aov_position.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/aov_position.png rename to tests/files/render/render_layer/eevee_renders/aov_position.png diff --git a/tests/files/render/render_layer/eevee_next_renders/freestyle.png b/tests/files/render/render_layer/eevee_renders/freestyle.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/freestyle.png rename to tests/files/render/render_layer/eevee_renders/freestyle.png diff --git a/tests/files/render/render_layer/eevee_next_renders/freestyle_stroke_material.png b/tests/files/render/render_layer/eevee_renders/freestyle_stroke_material.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/freestyle_stroke_material.png rename to tests/files/render/render_layer/eevee_renders/freestyle_stroke_material.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_ao.png b/tests/files/render/render_layer/eevee_renders/render_passes_ao.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_ao.png rename to tests/files/render/render_layer/eevee_renders/render_passes_ao.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_aov_color.png b/tests/files/render/render_layer/eevee_renders/render_passes_aov_color.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_aov_color.png rename to tests/files/render/render_layer/eevee_renders/render_passes_aov_color.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_aov_value.png b/tests/files/render/render_layer/eevee_renders/render_passes_aov_value.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_aov_value.png rename to tests/files/render/render_layer/eevee_renders/render_passes_aov_value.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_cryptomatte_asset.png b/tests/files/render/render_layer/eevee_renders/render_passes_cryptomatte_asset.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_cryptomatte_asset.png rename to tests/files/render/render_layer/eevee_renders/render_passes_cryptomatte_asset.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_cryptomatte_material.png b/tests/files/render/render_layer/eevee_renders/render_passes_cryptomatte_material.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_cryptomatte_material.png rename to tests/files/render/render_layer/eevee_renders/render_passes_cryptomatte_material.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_cryptomatte_object.png b/tests/files/render/render_layer/eevee_renders/render_passes_cryptomatte_object.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_cryptomatte_object.png rename to tests/files/render/render_layer/eevee_renders/render_passes_cryptomatte_object.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_diffuse_color.png b/tests/files/render/render_layer/eevee_renders/render_passes_diffuse_color.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_diffuse_color.png rename to tests/files/render/render_layer/eevee_renders/render_passes_diffuse_color.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_diffuse_direct.png b/tests/files/render/render_layer/eevee_renders/render_passes_diffuse_direct.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_diffuse_direct.png rename to tests/files/render/render_layer/eevee_renders/render_passes_diffuse_direct.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_diffuse_indirect.png b/tests/files/render/render_layer/eevee_renders/render_passes_diffuse_indirect.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_diffuse_indirect.png rename to tests/files/render/render_layer/eevee_renders/render_passes_diffuse_indirect.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_emission.png b/tests/files/render/render_layer/eevee_renders/render_passes_emission.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_emission.png rename to tests/files/render/render_layer/eevee_renders/render_passes_emission.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_environment.png b/tests/files/render/render_layer/eevee_renders/render_passes_environment.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_environment.png rename to tests/files/render/render_layer/eevee_renders/render_passes_environment.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_mist.png b/tests/files/render/render_layer/eevee_renders/render_passes_mist.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_mist.png rename to tests/files/render/render_layer/eevee_renders/render_passes_mist.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_normal.png b/tests/files/render/render_layer/eevee_renders/render_passes_normal.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_normal.png rename to tests/files/render/render_layer/eevee_renders/render_passes_normal.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_shadow.png b/tests/files/render/render_layer/eevee_renders/render_passes_shadow.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_shadow.png rename to tests/files/render/render_layer/eevee_renders/render_passes_shadow.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_specular_color.png b/tests/files/render/render_layer/eevee_renders/render_passes_specular_color.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_specular_color.png rename to tests/files/render/render_layer/eevee_renders/render_passes_specular_color.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_specular_direct.png b/tests/files/render/render_layer/eevee_renders/render_passes_specular_direct.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_specular_direct.png rename to tests/files/render/render_layer/eevee_renders/render_passes_specular_direct.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_specular_indirect.png b/tests/files/render/render_layer/eevee_renders/render_passes_specular_indirect.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_specular_indirect.png rename to tests/files/render/render_layer/eevee_renders/render_passes_specular_indirect.png diff --git a/tests/files/render/render_layer/eevee_next_renders/render_passes_thinfilm_color.png b/tests/files/render/render_layer/eevee_renders/render_passes_thinfilm_color.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/render_passes_thinfilm_color.png rename to tests/files/render/render_layer/eevee_renders/render_passes_thinfilm_color.png diff --git a/tests/files/render/render_layer/eevee_next_renders/rlayer_flags_01.png b/tests/files/render/render_layer/eevee_renders/rlayer_flags_01.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/rlayer_flags_01.png rename to tests/files/render/render_layer/eevee_renders/rlayer_flags_01.png diff --git a/tests/files/render/render_layer/eevee_next_renders/rlayer_flags_02.png b/tests/files/render/render_layer/eevee_renders/rlayer_flags_02.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/rlayer_flags_02.png rename to tests/files/render/render_layer/eevee_renders/rlayer_flags_02.png diff --git a/tests/files/render/render_layer/eevee_next_renders/rlayer_flags_03.png b/tests/files/render/render_layer/eevee_renders/rlayer_flags_03.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/rlayer_flags_03.png rename to tests/files/render/render_layer/eevee_renders/rlayer_flags_03.png diff --git a/tests/files/render/render_layer/eevee_next_renders/rlayer_flags_04.png b/tests/files/render/render_layer/eevee_renders/rlayer_flags_04.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/rlayer_flags_04.png rename to tests/files/render/render_layer/eevee_renders/rlayer_flags_04.png diff --git a/tests/files/render/render_layer/eevee_next_renders/shadow_catcher_ao_pass.png b/tests/files/render/render_layer/eevee_renders/shadow_catcher_ao_pass.png similarity index 100% rename from tests/files/render/render_layer/eevee_next_renders/shadow_catcher_ao_pass.png rename to tests/files/render/render_layer/eevee_renders/shadow_catcher_ao_pass.png diff --git a/tests/files/render/shader/eevee_next_renders/ambient_occlusion.png b/tests/files/render/shader/eevee_renders/ambient_occlusion.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/ambient_occlusion.png rename to tests/files/render/shader/eevee_renders/ambient_occlusion.png diff --git a/tests/files/render/shader/eevee_next_renders/ambient_occlusion_only_local.png b/tests/files/render/shader/eevee_renders/ambient_occlusion_only_local.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/ambient_occlusion_only_local.png rename to tests/files/render/shader/eevee_renders/ambient_occlusion_only_local.png diff --git a/tests/files/render/shader/eevee_next_renders/bevel.png b/tests/files/render/shader/eevee_renders/bevel.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/bevel.png rename to tests/files/render/shader/eevee_renders/bevel.png diff --git a/tests/files/render/shader/eevee_next_renders/bevel_mblur.png b/tests/files/render/shader/eevee_renders/bevel_mblur.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/bevel_mblur.png rename to tests/files/render/shader/eevee_renders/bevel_mblur.png diff --git a/tests/files/render/shader/eevee_next_renders/blackbody.png b/tests/files/render/shader/eevee_renders/blackbody.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/blackbody.png rename to tests/files/render/shader/eevee_renders/blackbody.png diff --git a/tests/files/render/shader/eevee_next_renders/camera_data_distance.png b/tests/files/render/shader/eevee_renders/camera_data_distance.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/camera_data_distance.png rename to tests/files/render/shader/eevee_renders/camera_data_distance.png diff --git a/tests/files/render/shader/eevee_next_renders/camera_data_vector.png b/tests/files/render/shader/eevee_renders/camera_data_vector.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/camera_data_vector.png rename to tests/files/render/shader/eevee_renders/camera_data_vector.png diff --git a/tests/files/render/shader/eevee_next_renders/constant_fold.png b/tests/files/render/shader/eevee_renders/constant_fold.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/constant_fold.png rename to tests/files/render/shader/eevee_renders/constant_fold.png diff --git a/tests/files/render/shader/eevee_next_renders/custom_normal_map.png b/tests/files/render/shader/eevee_renders/custom_normal_map.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/custom_normal_map.png rename to tests/files/render/shader/eevee_renders/custom_normal_map.png diff --git a/tests/files/render/shader/eevee_next_renders/diffuse_normal_map.png b/tests/files/render/shader/eevee_renders/diffuse_normal_map.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/diffuse_normal_map.png rename to tests/files/render/shader/eevee_renders/diffuse_normal_map.png diff --git a/tests/files/render/shader/eevee_next_renders/emission.png b/tests/files/render/shader/eevee_renders/emission.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/emission.png rename to tests/files/render/shader/eevee_renders/emission.png diff --git a/tests/files/render/shader/eevee_next_renders/float_math.png b/tests/files/render/shader/eevee_renders/float_math.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/float_math.png rename to tests/files/render/shader/eevee_renders/float_math.png diff --git a/tests/files/render/shader/eevee_next_renders/fresnel_layer_weight.png b/tests/files/render/shader/eevee_renders/fresnel_layer_weight.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/fresnel_layer_weight.png rename to tests/files/render/shader/eevee_renders/fresnel_layer_weight.png diff --git a/tests/files/render/shader/eevee_next_renders/glossy_normal_map.png b/tests/files/render/shader/eevee_renders/glossy_normal_map.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/glossy_normal_map.png rename to tests/files/render/shader/eevee_renders/glossy_normal_map.png diff --git a/tests/files/render/shader/eevee_next_renders/holdout.png b/tests/files/render/shader/eevee_renders/holdout.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/holdout.png rename to tests/files/render/shader/eevee_renders/holdout.png diff --git a/tests/files/render/shader/eevee_next_renders/hsv.png b/tests/files/render/shader/eevee_renders/hsv.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/hsv.png rename to tests/files/render/shader/eevee_renders/hsv.png diff --git a/tests/files/render/shader/eevee_next_renders/invert.png b/tests/files/render/shader/eevee_renders/invert.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/invert.png rename to tests/files/render/shader/eevee_renders/invert.png diff --git a/tests/files/render/shader/eevee_next_renders/mix_color.png b/tests/files/render/shader/eevee_renders/mix_color.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/mix_color.png rename to tests/files/render/shader/eevee_renders/mix_color.png diff --git a/tests/files/render/shader/eevee_next_renders/node_group_color.png b/tests/files/render/shader/eevee_renders/node_group_color.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/node_group_color.png rename to tests/files/render/shader/eevee_renders/node_group_color.png diff --git a/tests/files/render/shader/eevee_next_renders/node_group_float.png b/tests/files/render/shader/eevee_renders/node_group_float.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/node_group_float.png rename to tests/files/render/shader/eevee_renders/node_group_float.png diff --git a/tests/files/render/shader/eevee_next_renders/node_group_vector.png b/tests/files/render/shader/eevee_renders/node_group_vector.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/node_group_vector.png rename to tests/files/render/shader/eevee_renders/node_group_vector.png diff --git a/tests/files/render/shader/eevee_next_renders/normal.png b/tests/files/render/shader/eevee_renders/normal.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/normal.png rename to tests/files/render/shader/eevee_renders/normal.png diff --git a/tests/files/render/shader/eevee_next_renders/object_info.png b/tests/files/render/shader/eevee_renders/object_info.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/object_info.png rename to tests/files/render/shader/eevee_renders/object_info.png diff --git a/tests/files/render/shader/eevee_next_renders/rgb_curves_input_0.5.png b/tests/files/render/shader/eevee_renders/rgb_curves_input_0.5.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/rgb_curves_input_0.5.png rename to tests/files/render/shader/eevee_renders/rgb_curves_input_0.5.png diff --git a/tests/files/render/shader/eevee_next_renders/rgb_curves_input_1.2.png b/tests/files/render/shader/eevee_renders/rgb_curves_input_1.2.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/rgb_curves_input_1.2.png rename to tests/files/render/shader/eevee_renders/rgb_curves_input_1.2.png diff --git a/tests/files/render/shader/eevee_next_renders/rgb_curves_input_2.0_extrapolate.png b/tests/files/render/shader/eevee_renders/rgb_curves_input_2.0_extrapolate.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/rgb_curves_input_2.0_extrapolate.png rename to tests/files/render/shader/eevee_renders/rgb_curves_input_2.0_extrapolate.png diff --git a/tests/files/render/shader/eevee_next_renders/rgb_curves_input_neg_0.5.png b/tests/files/render/shader/eevee_renders/rgb_curves_input_neg_0.5.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/rgb_curves_input_neg_0.5.png rename to tests/files/render/shader/eevee_renders/rgb_curves_input_neg_0.5.png diff --git a/tests/files/render/shader/eevee_next_renders/rgb_curves_input_neg_1.2.png b/tests/files/render/shader/eevee_renders/rgb_curves_input_neg_1.2.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/rgb_curves_input_neg_1.2.png rename to tests/files/render/shader/eevee_renders/rgb_curves_input_neg_1.2.png diff --git a/tests/files/render/shader/eevee_next_renders/rgb_curves_input_neg_2.0_extrapolate.png b/tests/files/render/shader/eevee_renders/rgb_curves_input_neg_2.0_extrapolate.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/rgb_curves_input_neg_2.0_extrapolate.png rename to tests/files/render/shader/eevee_renders/rgb_curves_input_neg_2.0_extrapolate.png diff --git a/tests/files/render/shader/eevee_next_renders/tex_voronoi.png b/tests/files/render/shader/eevee_renders/tex_voronoi.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/tex_voronoi.png rename to tests/files/render/shader/eevee_renders/tex_voronoi.png diff --git a/tests/files/render/shader/eevee_next_renders/texture_coordinate_camera.png b/tests/files/render/shader/eevee_renders/texture_coordinate_camera.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/texture_coordinate_camera.png rename to tests/files/render/shader/eevee_renders/texture_coordinate_camera.png diff --git a/tests/files/render/shader/eevee_next_renders/texture_coordinate_generated.png b/tests/files/render/shader/eevee_renders/texture_coordinate_generated.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/texture_coordinate_generated.png rename to tests/files/render/shader/eevee_renders/texture_coordinate_generated.png diff --git a/tests/files/render/shader/eevee_next_renders/texture_coordinate_normal.png b/tests/files/render/shader/eevee_renders/texture_coordinate_normal.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/texture_coordinate_normal.png rename to tests/files/render/shader/eevee_renders/texture_coordinate_normal.png diff --git a/tests/files/render/shader/eevee_next_renders/texture_coordinate_object.png b/tests/files/render/shader/eevee_renders/texture_coordinate_object.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/texture_coordinate_object.png rename to tests/files/render/shader/eevee_renders/texture_coordinate_object.png diff --git a/tests/files/render/shader/eevee_next_renders/texture_coordinate_object_with_reference.png b/tests/files/render/shader/eevee_renders/texture_coordinate_object_with_reference.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/texture_coordinate_object_with_reference.png rename to tests/files/render/shader/eevee_renders/texture_coordinate_object_with_reference.png diff --git a/tests/files/render/shader/eevee_next_renders/texture_coordinate_reflection.png b/tests/files/render/shader/eevee_renders/texture_coordinate_reflection.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/texture_coordinate_reflection.png rename to tests/files/render/shader/eevee_renders/texture_coordinate_reflection.png diff --git a/tests/files/render/shader/eevee_next_renders/texture_coordinate_uv.png b/tests/files/render/shader/eevee_renders/texture_coordinate_uv.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/texture_coordinate_uv.png rename to tests/files/render/shader/eevee_renders/texture_coordinate_uv.png diff --git a/tests/files/render/shader/eevee_next_renders/texture_coordinate_window.png b/tests/files/render/shader/eevee_renders/texture_coordinate_window.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/texture_coordinate_window.png rename to tests/files/render/shader/eevee_renders/texture_coordinate_window.png diff --git a/tests/files/render/shader/eevee_next_renders/vector_math.png b/tests/files/render/shader/eevee_renders/vector_math.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/vector_math.png rename to tests/files/render/shader/eevee_renders/vector_math.png diff --git a/tests/files/render/shader/eevee_next_renders/wavelength.png b/tests/files/render/shader/eevee_renders/wavelength.png similarity index 100% rename from tests/files/render/shader/eevee_next_renders/wavelength.png rename to tests/files/render/shader/eevee_renders/wavelength.png diff --git a/tests/files/render/sss/eevee_next_renders/sss_concave_clamp.png b/tests/files/render/sss/eevee_renders/sss_concave_clamp.png similarity index 100% rename from tests/files/render/sss/eevee_next_renders/sss_concave_clamp.png rename to tests/files/render/sss/eevee_renders/sss_concave_clamp.png diff --git a/tests/files/render/sss/eevee_next_renders/sss_diffuse_mix_clamp.png b/tests/files/render/sss/eevee_renders/sss_diffuse_mix_clamp.png similarity index 100% rename from tests/files/render/sss/eevee_next_renders/sss_diffuse_mix_clamp.png rename to tests/files/render/sss/eevee_renders/sss_diffuse_mix_clamp.png diff --git a/tests/files/render/sss/eevee_next_renders/sss_hair.png b/tests/files/render/sss/eevee_renders/sss_hair.png similarity index 100% rename from tests/files/render/sss/eevee_next_renders/sss_hair.png rename to tests/files/render/sss/eevee_renders/sss_hair.png diff --git a/tests/files/render/sss/eevee_next_renders/sss_reflection_clamp.png b/tests/files/render/sss/eevee_renders/sss_reflection_clamp.png similarity index 100% rename from tests/files/render/sss/eevee_next_renders/sss_reflection_clamp.png rename to tests/files/render/sss/eevee_renders/sss_reflection_clamp.png diff --git a/tests/files/render/sss/eevee_next_renders/subsurface_base_color_mix.png b/tests/files/render/sss/eevee_renders/subsurface_base_color_mix.png similarity index 100% rename from tests/files/render/sss/eevee_next_renders/subsurface_base_color_mix.png rename to tests/files/render/sss/eevee_renders/subsurface_base_color_mix.png diff --git a/tests/files/render/sss/eevee_next_renders/subsurface_behind_glass.png b/tests/files/render/sss/eevee_renders/subsurface_behind_glass.png similarity index 100% rename from tests/files/render/sss/eevee_next_renders/subsurface_behind_glass.png rename to tests/files/render/sss/eevee_renders/subsurface_behind_glass.png diff --git a/tests/files/render/sss/eevee_next_renders/subsurface_burley.png b/tests/files/render/sss/eevee_renders/subsurface_burley.png similarity index 100% rename from tests/files/render/sss/eevee_next_renders/subsurface_burley.png rename to tests/files/render/sss/eevee_renders/subsurface_burley.png diff --git a/tests/files/render/sss/eevee_next_renders/subsurface_cubic.png b/tests/files/render/sss/eevee_renders/subsurface_cubic.png similarity index 100% rename from tests/files/render/sss/eevee_next_renders/subsurface_cubic.png rename to tests/files/render/sss/eevee_renders/subsurface_cubic.png diff --git a/tests/files/render/sss/eevee_next_renders/subsurface_gaussian.png b/tests/files/render/sss/eevee_renders/subsurface_gaussian.png similarity index 100% rename from tests/files/render/sss/eevee_next_renders/subsurface_gaussian.png rename to tests/files/render/sss/eevee_renders/subsurface_gaussian.png diff --git a/tests/files/render/sss/eevee_next_renders/subsurface_mix.png b/tests/files/render/sss/eevee_renders/subsurface_mix.png similarity index 100% rename from tests/files/render/sss/eevee_next_renders/subsurface_mix.png rename to tests/files/render/sss/eevee_renders/subsurface_mix.png diff --git a/tests/files/render/sss/eevee_next_renders/subsurface_random_walk.png b/tests/files/render/sss/eevee_renders/subsurface_random_walk.png similarity index 100% rename from tests/files/render/sss/eevee_next_renders/subsurface_random_walk.png rename to tests/files/render/sss/eevee_renders/subsurface_random_walk.png diff --git a/tests/files/render/sss/eevee_next_renders/subsurface_random_walk_thin.png b/tests/files/render/sss/eevee_renders/subsurface_random_walk_thin.png similarity index 100% rename from tests/files/render/sss/eevee_next_renders/subsurface_random_walk_thin.png rename to tests/files/render/sss/eevee_renders/subsurface_random_walk_thin.png diff --git a/tests/files/render/sss/eevee_next_renders/subsurface_small_radius.png b/tests/files/render/sss/eevee_renders/subsurface_small_radius.png similarity index 100% rename from tests/files/render/sss/eevee_next_renders/subsurface_small_radius.png rename to tests/files/render/sss/eevee_renders/subsurface_small_radius.png diff --git a/tests/files/render/texture/eevee_next_renders/brick.png b/tests/files/render/texture/eevee_renders/brick.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/brick.png rename to tests/files/render/texture/eevee_renders/brick.png diff --git a/tests/files/render/texture/eevee_next_renders/checker.png b/tests/files/render/texture/eevee_renders/checker.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/checker.png rename to tests/files/render/texture/eevee_renders/checker.png diff --git a/tests/files/render/texture/eevee_next_renders/environment_equiangular.png b/tests/files/render/texture/eevee_renders/environment_equiangular.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/environment_equiangular.png rename to tests/files/render/texture/eevee_renders/environment_equiangular.png diff --git a/tests/files/render/texture/eevee_next_renders/environment_mirror_ball.png b/tests/files/render/texture/eevee_renders/environment_mirror_ball.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/environment_mirror_ball.png rename to tests/files/render/texture/eevee_renders/environment_mirror_ball.png diff --git a/tests/files/render/texture/eevee_next_renders/garbor.png b/tests/files/render/texture/eevee_renders/garbor.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/garbor.png rename to tests/files/render/texture/eevee_renders/garbor.png diff --git a/tests/files/render/texture/eevee_next_renders/gradient.png b/tests/files/render/texture/eevee_renders/gradient.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/gradient.png rename to tests/files/render/texture/eevee_renders/gradient.png diff --git a/tests/files/render/texture/eevee_next_renders/image.png b/tests/files/render/texture/eevee_renders/image.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/image.png rename to tests/files/render/texture/eevee_renders/image.png diff --git a/tests/files/render/texture/eevee_next_renders/magic.png b/tests/files/render/texture/eevee_renders/magic.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/magic.png rename to tests/files/render/texture/eevee_renders/magic.png diff --git a/tests/files/render/texture/eevee_next_renders/musgrave_fbm_36.png b/tests/files/render/texture/eevee_renders/musgrave_fbm_36.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/musgrave_fbm_36.png rename to tests/files/render/texture/eevee_renders/musgrave_fbm_36.png diff --git a/tests/files/render/texture/eevee_next_renders/musgrave_hetero_terrain_36.png b/tests/files/render/texture/eevee_renders/musgrave_hetero_terrain_36.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/musgrave_hetero_terrain_36.png rename to tests/files/render/texture/eevee_renders/musgrave_hetero_terrain_36.png diff --git a/tests/files/render/texture/eevee_next_renders/musgrave_hybrid_multifractal_36.png b/tests/files/render/texture/eevee_renders/musgrave_hybrid_multifractal_36.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/musgrave_hybrid_multifractal_36.png rename to tests/files/render/texture/eevee_renders/musgrave_hybrid_multifractal_36.png diff --git a/tests/files/render/texture/eevee_next_renders/musgrave_multifractal_36.png b/tests/files/render/texture/eevee_renders/musgrave_multifractal_36.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/musgrave_multifractal_36.png rename to tests/files/render/texture/eevee_renders/musgrave_multifractal_36.png diff --git a/tests/files/render/texture/eevee_next_renders/musgrave_ridged_multifractal_36.png b/tests/files/render/texture/eevee_renders/musgrave_ridged_multifractal_36.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/musgrave_ridged_multifractal_36.png rename to tests/files/render/texture/eevee_renders/musgrave_ridged_multifractal_36.png diff --git a/tests/files/render/texture/eevee_next_renders/noise.png b/tests/files/render/texture/eevee_renders/noise.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/noise.png rename to tests/files/render/texture/eevee_renders/noise.png diff --git a/tests/files/render/texture/eevee_next_renders/noise_lacunarity.png b/tests/files/render/texture/eevee_renders/noise_lacunarity.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/noise_lacunarity.png rename to tests/files/render/texture/eevee_renders/noise_lacunarity.png diff --git a/tests/files/render/texture/eevee_next_renders/sky_hosek_wilkie.png b/tests/files/render/texture/eevee_renders/sky_hosek_wilkie.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/sky_hosek_wilkie.png rename to tests/files/render/texture/eevee_renders/sky_hosek_wilkie.png diff --git a/tests/files/render/texture/eevee_next_renders/sky_nishita_decreased_disk_increased_air_dust.png b/tests/files/render/texture/eevee_renders/sky_nishita_decreased_disk_increased_air_dust.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/sky_nishita_decreased_disk_increased_air_dust.png rename to tests/files/render/texture/eevee_renders/sky_nishita_decreased_disk_increased_air_dust.png diff --git a/tests/files/render/texture/eevee_next_renders/sky_nishita_default.png b/tests/files/render/texture/eevee_renders/sky_nishita_default.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/sky_nishita_default.png rename to tests/files/render/texture/eevee_renders/sky_nishita_default.png diff --git a/tests/files/render/texture/eevee_next_renders/sky_nishita_increased_disk_ozone.png b/tests/files/render/texture/eevee_renders/sky_nishita_increased_disk_ozone.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/sky_nishita_increased_disk_ozone.png rename to tests/files/render/texture/eevee_renders/sky_nishita_increased_disk_ozone.png diff --git a/tests/files/render/texture/eevee_next_renders/sky_nishita_no_disk_high_altitude.png b/tests/files/render/texture/eevee_renders/sky_nishita_no_disk_high_altitude.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/sky_nishita_no_disk_high_altitude.png rename to tests/files/render/texture/eevee_renders/sky_nishita_no_disk_high_altitude.png diff --git a/tests/files/render/texture/eevee_next_renders/sky_preetham.png b/tests/files/render/texture/eevee_renders/sky_preetham.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/sky_preetham.png rename to tests/files/render/texture/eevee_renders/sky_preetham.png diff --git a/tests/files/render/texture/eevee_next_renders/voronoi_distace_to_edge.png b/tests/files/render/texture/eevee_renders/voronoi_distace_to_edge.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/voronoi_distace_to_edge.png rename to tests/files/render/texture/eevee_renders/voronoi_distace_to_edge.png diff --git a/tests/files/render/texture/eevee_next_renders/voronoi_distace_to_edge_fractal.png b/tests/files/render/texture/eevee_renders/voronoi_distace_to_edge_fractal.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/voronoi_distace_to_edge_fractal.png rename to tests/files/render/texture/eevee_renders/voronoi_distace_to_edge_fractal.png diff --git a/tests/files/render/texture/eevee_next_renders/voronoi_f1.png b/tests/files/render/texture/eevee_renders/voronoi_f1.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/voronoi_f1.png rename to tests/files/render/texture/eevee_renders/voronoi_f1.png diff --git a/tests/files/render/texture/eevee_next_renders/voronoi_f1_fractal.png b/tests/files/render/texture/eevee_renders/voronoi_f1_fractal.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/voronoi_f1_fractal.png rename to tests/files/render/texture/eevee_renders/voronoi_f1_fractal.png diff --git a/tests/files/render/texture/eevee_next_renders/voronoi_f2.png b/tests/files/render/texture/eevee_renders/voronoi_f2.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/voronoi_f2.png rename to tests/files/render/texture/eevee_renders/voronoi_f2.png diff --git a/tests/files/render/texture/eevee_next_renders/voronoi_f2_fractal.png b/tests/files/render/texture/eevee_renders/voronoi_f2_fractal.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/voronoi_f2_fractal.png rename to tests/files/render/texture/eevee_renders/voronoi_f2_fractal.png diff --git a/tests/files/render/texture/eevee_next_renders/voronoi_n_sphere_radius.png b/tests/files/render/texture/eevee_renders/voronoi_n_sphere_radius.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/voronoi_n_sphere_radius.png rename to tests/files/render/texture/eevee_renders/voronoi_n_sphere_radius.png diff --git a/tests/files/render/texture/eevee_next_renders/voronoi_smooth_f1.png b/tests/files/render/texture/eevee_renders/voronoi_smooth_f1.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/voronoi_smooth_f1.png rename to tests/files/render/texture/eevee_renders/voronoi_smooth_f1.png diff --git a/tests/files/render/texture/eevee_next_renders/voronoi_smooth_f1_fractal.png b/tests/files/render/texture/eevee_renders/voronoi_smooth_f1_fractal.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/voronoi_smooth_f1_fractal.png rename to tests/files/render/texture/eevee_renders/voronoi_smooth_f1_fractal.png diff --git a/tests/files/render/texture/eevee_next_renders/wave_bands_saw.png b/tests/files/render/texture/eevee_renders/wave_bands_saw.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/wave_bands_saw.png rename to tests/files/render/texture/eevee_renders/wave_bands_saw.png diff --git a/tests/files/render/texture/eevee_next_renders/wave_bands_sine.png b/tests/files/render/texture/eevee_renders/wave_bands_sine.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/wave_bands_sine.png rename to tests/files/render/texture/eevee_renders/wave_bands_sine.png diff --git a/tests/files/render/texture/eevee_next_renders/wave_bands_triangle.png b/tests/files/render/texture/eevee_renders/wave_bands_triangle.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/wave_bands_triangle.png rename to tests/files/render/texture/eevee_renders/wave_bands_triangle.png diff --git a/tests/files/render/texture/eevee_next_renders/wave_rings_saw.png b/tests/files/render/texture/eevee_renders/wave_rings_saw.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/wave_rings_saw.png rename to tests/files/render/texture/eevee_renders/wave_rings_saw.png diff --git a/tests/files/render/texture/eevee_next_renders/wave_rings_sine.png b/tests/files/render/texture/eevee_renders/wave_rings_sine.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/wave_rings_sine.png rename to tests/files/render/texture/eevee_renders/wave_rings_sine.png diff --git a/tests/files/render/texture/eevee_next_renders/wave_rings_triangle.png b/tests/files/render/texture/eevee_renders/wave_rings_triangle.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/wave_rings_triangle.png rename to tests/files/render/texture/eevee_renders/wave_rings_triangle.png diff --git a/tests/files/render/texture/eevee_next_renders/white_noise_1spp.png b/tests/files/render/texture/eevee_renders/white_noise_1spp.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/white_noise_1spp.png rename to tests/files/render/texture/eevee_renders/white_noise_1spp.png diff --git a/tests/files/render/texture/eevee_next_renders/white_noise_256spp.png b/tests/files/render/texture/eevee_renders/white_noise_256spp.png similarity index 100% rename from tests/files/render/texture/eevee_next_renders/white_noise_256spp.png rename to tests/files/render/texture/eevee_renders/white_noise_256spp.png diff --git a/tests/files/render/volume/eevee_next_renders/camera_in_volume_camera_and_volume.png b/tests/files/render/volume/eevee_renders/camera_in_volume_camera_and_volume.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/camera_in_volume_camera_and_volume.png rename to tests/files/render/volume/eevee_renders/camera_in_volume_camera_and_volume.png diff --git a/tests/files/render/volume/eevee_next_renders/camera_in_volume_camera_only.png b/tests/files/render/volume/eevee_renders/camera_in_volume_camera_only.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/camera_in_volume_camera_only.png rename to tests/files/render/volume/eevee_renders/camera_in_volume_camera_only.png diff --git a/tests/files/render/volume/eevee_next_renders/camera_in_volume_nested.png b/tests/files/render/volume/eevee_renders/camera_in_volume_nested.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/camera_in_volume_nested.png rename to tests/files/render/volume/eevee_renders/camera_in_volume_nested.png diff --git a/tests/files/render/volume/eevee_next_renders/camera_in_volume_simple.png b/tests/files/render/volume/eevee_renders/camera_in_volume_simple.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/camera_in_volume_simple.png rename to tests/files/render/volume/eevee_renders/camera_in_volume_simple.png diff --git a/tests/files/render/volume/eevee_next_renders/implicit_volume.png b/tests/files/render/volume/eevee_renders/implicit_volume.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/implicit_volume.png rename to tests/files/render/volume/eevee_renders/implicit_volume.png diff --git a/tests/files/render/volume/eevee_next_renders/overlapping_different_anisotropy.png b/tests/files/render/volume/eevee_renders/overlapping_different_anisotropy.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/overlapping_different_anisotropy.png rename to tests/files/render/volume/eevee_renders/overlapping_different_anisotropy.png diff --git a/tests/files/render/volume/eevee_next_renders/principled_absorption.png b/tests/files/render/volume/eevee_renders/principled_absorption.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/principled_absorption.png rename to tests/files/render/volume/eevee_renders/principled_absorption.png diff --git a/tests/files/render/volume/eevee_next_renders/principled_bsdf_interior.png b/tests/files/render/volume/eevee_renders/principled_bsdf_interior.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/principled_bsdf_interior.png rename to tests/files/render/volume/eevee_renders/principled_bsdf_interior.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_absobtion.png b/tests/files/render/volume/eevee_renders/volume_absobtion.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_absobtion.png rename to tests/files/render/volume/eevee_renders/volume_absobtion.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_deep_stack.png b/tests/files/render/volume/eevee_renders/volume_deep_stack.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_deep_stack.png rename to tests/files/render/volume/eevee_renders/volume_deep_stack.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_edge_fireflies.png b/tests/files/render/volume/eevee_renders/volume_edge_fireflies.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_edge_fireflies.png rename to tests/files/render/volume/eevee_renders/volume_edge_fireflies.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_output_absorption.png b/tests/files/render/volume/eevee_renders/volume_output_absorption.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_output_absorption.png rename to tests/files/render/volume/eevee_renders/volume_output_absorption.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_output_mix_volume.png b/tests/files/render/volume/eevee_renders/volume_output_mix_volume.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_output_mix_volume.png rename to tests/files/render/volume/eevee_renders/volume_output_mix_volume.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_output_scatter.png b/tests/files/render/volume/eevee_renders/volume_output_scatter.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_output_scatter.png rename to tests/files/render/volume/eevee_renders/volume_output_scatter.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_output_surface.png b/tests/files/render/volume/eevee_renders/volume_output_surface.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_output_surface.png rename to tests/files/render/volume/eevee_renders/volume_output_surface.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_overlap.png b/tests/files/render/volume/eevee_renders/volume_overlap.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_overlap.png rename to tests/files/render/volume/eevee_renders/volume_overlap.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_scatter.png b/tests/files/render/volume/eevee_renders/volume_scatter.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_scatter.png rename to tests/files/render/volume/eevee_renders/volume_scatter.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_scatter_albedo.png b/tests/files/render/volume/eevee_renders/volume_scatter_albedo.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_scatter_albedo.png rename to tests/files/render/volume/eevee_renders/volume_scatter_albedo.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_scatter_draine.png b/tests/files/render/volume/eevee_renders/volume_scatter_draine.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_scatter_draine.png rename to tests/files/render/volume/eevee_renders/volume_scatter_draine.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_scatter_fournier-forand.png b/tests/files/render/volume/eevee_renders/volume_scatter_fournier-forand.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_scatter_fournier-forand.png rename to tests/files/render/volume/eevee_renders/volume_scatter_fournier-forand.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_scatter_mie.png b/tests/files/render/volume/eevee_renders/volume_scatter_mie.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_scatter_mie.png rename to tests/files/render/volume/eevee_renders/volume_scatter_mie.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_scatter_mie_small_particles.png b/tests/files/render/volume/eevee_renders/volume_scatter_mie_small_particles.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_scatter_mie_small_particles.png rename to tests/files/render/volume/eevee_renders/volume_scatter_mie_small_particles.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_scatter_rayleigh.png b/tests/files/render/volume/eevee_renders/volume_scatter_rayleigh.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_scatter_rayleigh.png rename to tests/files/render/volume/eevee_renders/volume_scatter_rayleigh.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_step_offset.png b/tests/files/render/volume/eevee_renders/volume_step_offset.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_step_offset.png rename to tests/files/render/volume/eevee_renders/volume_step_offset.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_transparent_shadow.png b/tests/files/render/volume/eevee_renders/volume_transparent_shadow.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_transparent_shadow.png rename to tests/files/render/volume/eevee_renders/volume_transparent_shadow.png diff --git a/tests/files/render/volume/eevee_next_renders/volume_zero_extinction_channel.png b/tests/files/render/volume/eevee_renders/volume_zero_extinction_channel.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/volume_zero_extinction_channel.png rename to tests/files/render/volume/eevee_renders/volume_zero_extinction_channel.png diff --git a/tests/files/render/volume/eevee_next_renders/world_volume.png b/tests/files/render/volume/eevee_renders/world_volume.png similarity index 100% rename from tests/files/render/volume/eevee_next_renders/world_volume.png rename to tests/files/render/volume/eevee_renders/world_volume.png diff --git a/tests/python/CMakeLists.txt b/tests/python/CMakeLists.txt index 87880e74cd9..44ff11f9b46 100644 --- a/tests/python/CMakeLists.txt +++ b/tests/python/CMakeLists.txt @@ -738,7 +738,7 @@ if((WITH_CYCLES OR WITH_GPU_RENDER_TESTS) AND TEST_SRC_DIR_EXISTS) set(_gpu_render_tests_arguments) - # Eevee Next + # EEVEE if(WITH_OPENGL_BACKEND) foreach(render_test ${gpu_render_tests}) add_render_test( diff --git a/tests/python/eevee_render_tests.py b/tests/python/eevee_render_tests.py index d07fd94bde1..8024d9bd8ad 100644 --- a/tests/python/eevee_render_tests.py +++ b/tests/python/eevee_render_tests.py @@ -73,7 +73,7 @@ def setup(): import bpy for scene in bpy.data.scenes: - scene.render.engine = 'BLENDER_EEVEE_NEXT' + scene.render.engine = 'BLENDER_EEVEE' # Enable Eevee features eevee = scene.eevee @@ -208,7 +208,7 @@ def get_arguments(filepath, output_filepath, gpu_backend): arguments.extend([ filepath, - "-E", "BLENDER_EEVEE_NEXT", + "-E", "BLENDER_EEVEE", "-P", os.path.realpath(__file__), "-o", output_filepath, @@ -238,7 +238,7 @@ def main(): gpu_device_type = get_gpu_device_type(args.blender) reference_override_dir = None if gpu_device_type == "AMD": - reference_override_dir = "eevee_next_renders/amd" + reference_override_dir = "eevee_renders/amd" blocklist = BLOCKLIST if args.gpu_backend == "metal": @@ -246,14 +246,14 @@ def main(): elif args.gpu_backend == "vulkan": blocklist += BLOCKLIST_VULKAN - report = EEVEEReport("Eevee Next", args.outdir, args.oiiotool, variation=args.gpu_backend, blocklist=blocklist) + report = EEVEEReport("EEVEE", args.outdir, args.oiiotool, variation=args.gpu_backend, blocklist=blocklist) if args.gpu_backend == "vulkan": - report.set_compare_engine('eevee_next', 'opengl') + report.set_compare_engine('eevee', 'opengl') else: report.set_compare_engine('cycles', 'CPU') report.set_pixelated(True) - report.set_reference_dir("eevee_next_renders") + report.set_reference_dir("eevee_renders") report.set_reference_override_dir(reference_override_dir) test_dir_name = Path(args.testdir).name diff --git a/tests/python/workbench_render_tests.py b/tests/python/workbench_render_tests.py index 4ef952356a0..15cebce5b60 100644 --- a/tests/python/workbench_render_tests.py +++ b/tests/python/workbench_render_tests.py @@ -94,7 +94,7 @@ def main(): if args.gpu_backend == "vulkan": report.set_compare_engine('workbench', 'opengl') else: - report.set_compare_engine('eevee_next', 'opengl') + report.set_compare_engine('eevee', 'opengl') report.set_pixelated(True) report.set_reference_dir("workbench_renders") diff --git a/tools/utils_doc/code_layout_diagram.py b/tools/utils_doc/code_layout_diagram.py index b7e8c175221..8073b9f7277 100644 --- a/tools/utils_doc/code_layout_diagram.py +++ b/tools/utils_doc/code_layout_diagram.py @@ -1094,7 +1094,7 @@ def main(): VFONT_FROM_STYLE["mono"] = bpy.data.fonts.load(FONT_FILE_MONO) scene = bpy.context.scene - scene.render.engine = 'BLENDER_EEVEE_NEXT' + scene.render.engine = 'BLENDER_EEVEE' # Without this, the whites are gray. scene.view_settings.view_transform = "Standard"