blender/blender
166
521
Fork 793
Code Issues 6.8k Pull Requests 962 Projects 21 Wiki Activity

EEVEE-Next: Rename engines and set it default in startup file #121592

Merged
Weizhen Huang merged 1 commits from fclem/blender:eevee-set-default into main 2024-05-08 20:57:13 +02:00
Conversation 1 Commits 1 Files Changed 5 +5 -5
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,7 +333,7 @@ void BLO_update_defaults_workspace(WorkSpace *workspace, const char *app_templat
static void blo_update_defaults_scene(Main *bmain, Scene *scene) static void blo_update_defaults_scene(Main *bmain, Scene *scene)
{ {
STRNCPY(scene->r.engine, RE_engine_id_BLENDER_EEVEE); STRNCPY(scene->r.engine, RE_engine_id_BLENDER_EEVEE_NEXT);
scene->r.cfra = 1.0f; scene->r.cfra = 1.0f;

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

@ -668,7 +668,7 @@ RenderEngineType DRW_engine_viewport_eevee_type = {
/*next*/ nullptr, /*next*/ nullptr,
/*prev*/ nullptr, /*prev*/ nullptr,
/*idname*/ EEVEE_ENGINE, /*idname*/ EEVEE_ENGINE,
/*name*/ N_("EEVEE"), /*name*/ N_("EEVEE (Legacy)"),
/*flag*/ RE_INTERNAL | RE_USE_PREVIEW | RE_USE_STEREO_VIEWPORT | RE_USE_GPU_CONTEXT, /*flag*/ RE_INTERNAL | RE_USE_PREVIEW | RE_USE_STEREO_VIEWPORT | RE_USE_GPU_CONTEXT,
/*update*/ nullptr, /*update*/ nullptr,
/*render*/ &DRW_render_to_image, /*render*/ &DRW_render_to_image,

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

@ -212,7 +212,7 @@ RenderEngineType DRW_engine_viewport_eevee_next_type = {
/*next*/ nullptr, /*next*/ nullptr,
/*prev*/ nullptr, /*prev*/ nullptr,
/*idname*/ "BLENDER_EEVEE_NEXT", /*idname*/ "BLENDER_EEVEE_NEXT",
/*name*/ N_("EEVEE-Next"), /*name*/ N_("EEVEE"),
/*flag*/ RE_INTERNAL | RE_USE_PREVIEW | RE_USE_STEREO_VIEWPORT | RE_USE_GPU_CONTEXT, /*flag*/ RE_INTERNAL | RE_USE_PREVIEW | RE_USE_STEREO_VIEWPORT | RE_USE_GPU_CONTEXT,
/*update*/ nullptr, /*update*/ nullptr,
/*render*/ &DRW_render_to_image, /*render*/ &DRW_render_to_image,

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

@ -6636,7 +6636,7 @@ static void rna_def_scene_render_data(BlenderRNA *brna)
}; };
static const EnumPropertyItem engine_items[] = { static const EnumPropertyItem engine_items[] = {
{0, "BLENDER_EEVEE", 0, "EEVEE", ""}, {0, "BLENDER_EEVEE_NEXT", 0, "EEVEE", ""},
{0, nullptr, 0, nullptr, nullptr}, {0, nullptr, 0, nullptr, nullptr},
}; };

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

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