griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

EEVEE: Remove all remaining reference of EEVEE next

Browse Source 
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
This commit is contained in:
Clément Foucault
2025-06-13 12:36:14 +02:00
committed by Clément Foucault
parent f98462ff2e
commit 4fe75da973
557 changed files with 469 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/blenkernel/intern/scene.cc
View File

@@ -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)

8
source/blender/blenloader/intern/versioning_500.cc
View File

@@ -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.

2
source/blender/blenloader/intern/versioning_defaults.cc
View File

@@ -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;

2
source/blender/draw/engines/eevee/eevee_engine.cc
View File

@@ -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,

2
source/blender/draw/engines/overlay/overlay_instance.cc
View File

@@ -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.

4
source/blender/editors/render/render_preview.cc
View File

@@ -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) {

4
source/blender/editors/space_view3d/view3d_draw.cc
View File

@@ -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 &&

3
source/blender/makesdna/DNA_scene_types.h
View File

@@ -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;
/** \} */

2
source/blender/makesrna/intern/rna_scene.cc
View File

@@ -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},
};

2
source/blender/makesrna/intern/rna_space.cc
View File

@@ -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;

2
source/blender/nodes/shader/node_shader_util.cc
View File

@@ -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");
}
/* ****** */

2
source/blender/render/intern/engine.cc
View File

@@ -92,7 +92,7 @@ RenderEngineType *RE_engines_find(const char *idname)
BLI_findstring(&R_engines, idname, offsetof(RenderEngineType, idname)));
if (!type) {
type = static_cast<RenderEngineType *>(
BLI_findstring(&R_engines, "BLENDER_EEVEE_NEXT", offsetof(RenderEngineType, idname)));
BLI_findstring(&R_engines, "BLENDER_EEVEE", offsetof(RenderEngineType, idname)));
}
return type;

2
source/blender/render/intern/pipeline.cc
View File

@@ -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);

15
source/creator/creator_args.cc
View File

@@ -1966,7 +1966,9 @@ static int arg_handle_engine_set(int argc, const char **argv, void *data)
{
bContext *C = static_cast<bContext *>(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);
}
}