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

Overlay-Next: Enable by default and add option to enable legacy code

Browse Source 
The legacy option is turned off by default and will be removed
in the following weeks. It is only there to check for
regression for a short period of time. Afterward checking
for regression will require to use 4.3 as a reference.

Rel #102179

Pull Request: https://projects.blender.org/blender/blender/pulls/130683
This commit is contained in:
Clément Foucault
2024-11-21 18:55:39 +01:00
committed by Clément Foucault
parent d724ba1f24
commit 409012956f
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/startup/bl_ui/space_userpref.py
View File

@@ -2898,7 +2898,7 @@ class USERPREF_PT_experimental_prototypes(ExperimentalPanel, Panel):
({"property": "use_new_curves_tools"}, ("blender/blender/issues/68981", "#68981")),
({"property": "use_new_point_cloud_type"}, ("blender/blender/issues/75717", "#75717")),
({"property": "use_sculpt_texture_paint"}, ("blender/blender/issues/96225", "#96225")),
({"property": "enable_overlay_next"}, ("blender/blender/issues/102179", "#102179")),
({"property": "enable_overlay_legacy"}, ("blender/blender/issues/102179", "#102179")),
({"property": "enable_new_cpu_compositor"}, ("/blender/blender/issues/125968", "#125968")),
),
)

18
source/blender/draw/intern/draw_manager_c.cc
View File

@@ -1195,8 +1195,8 @@ static void drw_engines_enable_from_engine(const RenderEngineType *engine_type,
static void drw_engines_enable_overlays()
{
use_drw_engine((U.experimental.enable_overlay_next) ? &draw_engine_overlay_next_type :
&draw_engine_overlay_type);
use_drw_engine((U.experimental.enable_overlay_legacy) ? &draw_engine_overlay_type :
&draw_engine_overlay_next_type);
}
/**
* Use for select and depth-drawing.
@@ -1215,8 +1215,8 @@ static void drw_engine_enable_image_editor()
use_drw_engine(&draw_engine_image_type);
}
use_drw_engine((U.experimental.enable_overlay_next) ? &draw_engine_overlay_next_type :
&draw_engine_overlay_type);
use_drw_engine((U.experimental.enable_overlay_legacy) ? &draw_engine_overlay_type :
&draw_engine_overlay_next_type);
}
static void drw_engines_enable_editors()
@@ -1234,8 +1234,8 @@ static void drw_engines_enable_editors()
SpaceNode *snode = (SpaceNode *)space_data;
if ((snode->flag & SNODE_BACKDRAW) != 0) {
use_drw_engine(&draw_engine_image_type);
use_drw_engine((U.experimental.enable_overlay_next) ? &draw_engine_overlay_next_type :
&draw_engine_overlay_type);
use_drw_engine((U.experimental.enable_overlay_legacy) ? &draw_engine_overlay_type :
&draw_engine_overlay_next_type);
}
}
}
@@ -2489,7 +2489,7 @@ void DRW_draw_select_loop(Depsgraph *depsgraph,
DST.options.is_material_select = do_material_sub_selection;
drw_task_graph_init();
/* Get list of enabled engines */
if (U.experimental.enable_overlay_next) {
if (!U.experimental.enable_overlay_legacy) {
use_drw_engine(&draw_engine_select_next_type);
}
else if (use_obedit) {
@@ -2616,13 +2616,13 @@ void DRW_draw_select_loop(Depsgraph *depsgraph,
if (!select_pass_fn(DRW_SELECT_PASS_PRE, select_pass_user_data)) {
break;
}
if (!U.experimental.enable_overlay_next) {
if (U.experimental.enable_overlay_legacy) {
DRW_state_lock(DRW_STATE_WRITE_DEPTH | DRW_STATE_DEPTH_TEST_ENABLED);
}
drw_engines_draw_scene();
if (!U.experimental.enable_overlay_next) {
if (U.experimental.enable_overlay_legacy) {
DRW_state_lock(DRWState(0));
}

2
source/blender/gpu/intern/gpu_select.cc
View File

@@ -136,7 +136,7 @@ void GPU_select_begin_next(GPUSelectBuffer *buffer,
eGPUSelectMode mode,
int oldhits)
{
gpu_select_begin_ex(buffer, input, mode, oldhits, U.experimental.enable_overlay_next);
gpu_select_begin_ex(buffer, input, mode, oldhits, !U.experimental.enable_overlay_legacy);
}
void GPU_select_begin(GPUSelectBuffer *buffer, const rcti *input, eGPUSelectMode mode, int oldhits)

2
source/blender/makesdna/DNA_userdef_types.h
View File

@@ -755,7 +755,7 @@ typedef struct UserDef_Experimental {
char use_sculpt_tools_tilt;
char use_extended_asset_browser;
char use_sculpt_texture_paint;
char enable_overlay_next;
char enable_overlay_legacy;
char use_new_volume_nodes;
char use_new_file_import_nodes;
char use_shader_node_previews;

6
source/blender/makesrna/intern/rna_userdef.cc
View File

@@ -7562,10 +7562,10 @@ static void rna_def_userdef_experimental(BlenderRNA *brna)
"pop-over");
RNA_def_property_update(prop, 0, "rna_userdef_ui_update");
prop = RNA_def_property(srna, "enable_overlay_next", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "enable_overlay_next", 1);
prop = RNA_def_property(srna, "enable_overlay_legacy", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "enable_overlay_legacy", 1);
RNA_def_property_ui_text(
prop, "Overlay Next", "Enable the new Overlay codebase, requires restart");
prop, "Overlay Legacy", "Enable the legacy Overlay codebase, requires restart");
prop = RNA_def_property(srna, "enable_new_cpu_compositor", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, nullptr, "enable_new_cpu_compositor", 1);