diff --git a/scripts/startup/bl_ui/space_userpref.py b/scripts/startup/bl_ui/space_userpref.py index c8d68bf9779..71559ca44f7 100644 --- a/scripts/startup/bl_ui/space_userpref.py +++ b/scripts/startup/bl_ui/space_userpref.py @@ -2556,7 +2556,6 @@ class USERPREF_PT_experimental_prototypes(ExperimentalPanel, Panel): ({"property": "use_new_point_cloud_type"}, ("blender/blender/issues/75717", "#75717")), ({"property": "use_sculpt_texture_paint"}, ("blender/blender/issues/96225", "#96225")), ({"property": "use_experimental_compositors"}, ("blender/blender/issues/88150", "#88150")), - ({"property": "enable_eevee_next"}, ("blender/blender/issues/93220", "#93220")), ({"property": "use_grease_pencil_version3"}, ("blender/blender/projects/6", "Grease Pencil 3.0")), ({"property": "enable_overlay_next"}, ("blender/blender/issues/102179", "#102179")), ({"property": "use_extension_repos"}, ("/blender/blender/issues/106254", "#106254")), diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h index 2059d86cb10..bfe59ba267d 100644 --- a/source/blender/draw/DRW_engine.h +++ b/source/blender/draw/DRW_engine.h @@ -42,7 +42,6 @@ struct bContext; struct rcti; void DRW_engines_register(void); -void DRW_engines_register_experimental(void); void DRW_engines_free(void); bool DRW_engine_render_support(struct DrawEngineType *draw_engine_type); diff --git a/source/blender/draw/intern/draw_manager_c.cc b/source/blender/draw/intern/draw_manager_c.cc index 7e5eb849024..9bc6108c80f 100644 --- a/source/blender/draw/intern/draw_manager_c.cc +++ b/source/blender/draw/intern/draw_manager_c.cc @@ -3036,33 +3036,6 @@ void DRW_engine_register(DrawEngineType *draw_engine_type) g_registered_engines.len = BLI_listbase_count(&g_registered_engines.engines); } -void DRW_engines_register_experimental() -{ - if (!U.experimental.enable_eevee_next) { - /** Since EEVEE Next is always registered in `DRW_engines_register`, - * Here we just have to unregister if it's not actually enabled. */ - for (auto *type = static_cast(R_engines.first); type; type = type->next) { - if (type == &DRW_engine_viewport_eevee_next_type) { - BLI_remlink(&R_engines, type); - break; - } - } - - for (auto *type = static_cast(g_registered_engines.engines.first); - type != nullptr; - type = static_cast(type->next)) - { - if (type->draw_engine == DRW_engine_viewport_eevee_next_type.draw_engine) { - BLI_remlink(&g_registered_engines.engines, type); - type->draw_engine->engine_free(); - g_registered_engines.len--; - MEM_freeN(type); - break; - } - } - } -} - void DRW_engines_register() { RE_engines_register(&DRW_engine_viewport_eevee_type); diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 416e6168132..9cfb29e66e8 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -704,7 +704,6 @@ typedef struct UserDef_Experimental { char use_sculpt_tools_tilt; char use_extended_asset_browser; char use_override_templates; - char enable_eevee_next; char use_sculpt_texture_paint; char use_grease_pencil_version3; char enable_overlay_next; @@ -712,7 +711,7 @@ typedef struct UserDef_Experimental { char use_shader_node_previews; char use_extension_repos; - char _pad[2]; + char _pad[3]; /** `makesdna` does not allow empty structs. */ } UserDef_Experimental; diff --git a/source/blender/makesrna/intern/rna_userdef.cc b/source/blender/makesrna/intern/rna_userdef.cc index 73bf041c43b..f481f5671d5 100644 --- a/source/blender/makesrna/intern/rna_userdef.cc +++ b/source/blender/makesrna/intern/rna_userdef.cc @@ -7044,10 +7044,6 @@ static void rna_def_userdef_experimental(BlenderRNA *brna) RNA_def_property_ui_text( prop, "Override Templates", "Enable library override template in the Python API"); - prop = RNA_def_property(srna, "enable_eevee_next", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, nullptr, "enable_eevee_next", 1); - RNA_def_property_ui_text(prop, "EEVEE Next", "Enable the new EEVEE codebase, requires restart"); - prop = RNA_def_property(srna, "use_grease_pencil_version3", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, nullptr, "use_grease_pencil_version3", 1); RNA_def_property_ui_text(prop, "Grease Pencil 3.0", "Enable the new grease pencil 3.0 codebase"); diff --git a/source/blender/render/RE_engine.h b/source/blender/render/RE_engine.h index 4d837c0451d..5a8303f52ad 100644 --- a/source/blender/render/RE_engine.h +++ b/source/blender/render/RE_engine.h @@ -275,7 +275,6 @@ void RE_engine_gpu_context_unlock(struct RenderEngine *engine); /* Engine Types */ void RE_engines_init(void); -void RE_engines_init_experimental(void); void RE_engines_exit(void); void RE_engines_register(RenderEngineType *render_type); diff --git a/source/blender/render/intern/engine.cc b/source/blender/render/intern/engine.cc index b8ab59b4597..e426246a096 100644 --- a/source/blender/render/intern/engine.cc +++ b/source/blender/render/intern/engine.cc @@ -66,11 +66,6 @@ void RE_engines_init() DRW_engines_register(); } -void RE_engines_init_experimental() -{ - DRW_engines_register_experimental(); -} - void RE_engines_exit() { RenderEngineType *type, *next; diff --git a/source/creator/creator.cc b/source/creator/creator.cc index 3d0f96c1992..6b1f8114479 100644 --- a/source/creator/creator.cc +++ b/source/creator/creator.cc @@ -554,10 +554,6 @@ int main(int argc, BLI_args_parse(ba, ARG_PASS_FINAL, main_args_handle_load_file, C); #endif - /* Need to be after WM init so that userpref are loaded, - * and after ars_parse, in case and experimental engine is enabled there. */ - RE_engines_init_experimental(); - /* Explicitly free data allocated for argument parsing: * - 'ba' * - 'argv' on WIN32. diff --git a/source/creator/creator_args.cc b/source/creator/creator_args.cc index ae501cf3402..e6d4cd7201b 100644 --- a/source/creator/creator_args.cc +++ b/source/creator/creator_args.cc @@ -1611,12 +1611,6 @@ static int arg_handle_engine_set(int argc, const char **argv, void *data) exit(0); } else { - if (strcmp(argv[1], RE_engine_id_BLENDER_EEVEE_NEXT) == 0) { - /** NOTE: Temp workaround to support EEVEE Next tests. - * This ensures the engine is not unregistered in `DRW_engines_register_experimental` - * when using --factory-startup. */ - U.experimental.enable_eevee_next = true; - } Scene *scene = CTX_data_scene(C); if (scene) { if (BLI_findstring(&R_engines, argv[1], offsetof(RenderEngineType, idname))) {