Workbench-Next: Enabled by default

Replace Workbench with Workbench Next.
The old Workbench code is still there for now,
but it should be unreachable.

Pull Request: https://projects.blender.org/blender/blender/pulls/111403

scripts/startup/bl_ui/space_userpref.py

@@ -2482,7 +2482,6 @@ class USERPREF_PT_experimental_prototypes(ExperimentalPanel, Panel):
                 ({"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": "enable_workbench_next"}, ("blender/blender/issues/101619", "#101619")),
                 ({"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")),

source/blender/draw/engines/workbench/workbench_engine.cc

@@ -826,7 +826,7 @@ RenderEngineType DRW_engine_viewport_workbench_next_type = {
     /*next*/ nullptr,
     /*prev*/ nullptr,
     /*idname*/ "BLENDER_WORKBENCH_NEXT",
-    /*name*/ N_("Workbench Next"),
+    /*name*/ N_("Workbench"),
     /*flag*/ RE_INTERNAL | RE_USE_STEREO_VIEWPORT | RE_USE_GPU_CONTEXT,
     /*update*/ nullptr,
     /*render*/ &DRW_render_to_image,

source/blender/draw/engines/workbench/workbench_engine_c.cc

@@ -40,6 +40,8 @@
 
 void workbench_engine_init(void *ved)
 {
+  BLI_assert_unreachable();
+
   GPU_render_begin();
   WORKBENCH_Data *vedata = static_cast<WORKBENCH_Data *>(ved);
   WORKBENCH_StorageList *stl = vedata->stl;

source/blender/draw/intern/draw_manager_c.cc

@@ -1173,12 +1173,7 @@ static void drw_engines_enable_from_engine(const RenderEngineType *engine_type,
   switch (drawtype) {
     case OB_WIRE:
     case OB_SOLID:
-      if (U.experimental.enable_workbench_next &&
+      use_drw_engine(DRW_engine_viewport_workbench_next_type.draw_engine);
-          STREQ(engine_type->idname, "BLENDER_WORKBENCH_NEXT")) {
-        use_drw_engine(DRW_engine_viewport_workbench_next_type.draw_engine);
-        break;
-      }
-      use_drw_engine(DRW_engine_viewport_workbench_type.draw_engine);
       break;
     case OB_MATERIAL:
     case OB_RENDER:
@@ -3050,15 +3045,12 @@ void DRW_engines_register_experimental()
   if (U.experimental.enable_eevee_next) {
     RE_engines_register(&DRW_engine_viewport_eevee_next_type);
   }
-  if (U.experimental.enable_workbench_next) {
-    RE_engines_register(&DRW_engine_viewport_workbench_next_type);
-  }
 }
 
 void DRW_engines_register()
 {
   RE_engines_register(&DRW_engine_viewport_eevee_type);
-  RE_engines_register(&DRW_engine_viewport_workbench_type);
+  RE_engines_register(&DRW_engine_viewport_workbench_next_type);
 
   DRW_engine_register(&draw_engine_gpencil_type);
   DRW_engine_register(&draw_engine_gpencil_next_type);

source/blender/makesdna/DNA_userdef_types.h

@@ -713,7 +713,6 @@ typedef struct UserDef_Experimental {
   char use_sculpt_texture_paint;
   char use_grease_pencil_version3;
   char enable_overlay_next;
-  char enable_workbench_next;
   char use_new_volume_nodes;
   char use_rotation_socket;
   char use_node_group_operators;

source/blender/makesrna/intern/rna_userdef.cc

@@ -6959,13 +6959,6 @@ static void rna_def_userdef_experimental(BlenderRNA *brna)
   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");
 
-  prop = RNA_def_property(srna, "enable_workbench_next", PROP_BOOLEAN, PROP_NONE);
-  RNA_def_property_boolean_sdna(prop, nullptr, "enable_workbench_next", 1);
-  RNA_def_property_ui_text(prop,
-                           "Workbench Next",
-                           "Enable the new Workbench codebase, requires "
-                           "restart");
-
   prop = RNA_def_property(srna, "use_viewport_debug", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_boolean_sdna(prop, nullptr, "use_viewport_debug", 1);
   RNA_def_property_ui_text(prop,