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

GPU: Remove use_select_pick_depth option

Browse Source 
This option does nothing since 4.4. This commit
just remove it from the API, and clear the bit inside the DNA.

Pull Request: https://projects.blender.org/blender/blender/pulls/140338
This commit is contained in:
Clément Foucault
2025-06-13 15:38:15 +02:00
committed by Clément Foucault
parent 1c29a2e2e5
commit a353fb3527
4 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_blender_version.h
View File

@@ -27,7 +27,7 @@
/* Blender file format version. */
#define BLENDER_FILE_VERSION BLENDER_VERSION
#define BLENDER_FILE_SUBVERSION 10
#define BLENDER_FILE_SUBVERSION 11
/* Minimum Blender version that supports reading file written with the current
* version. Older Blender versions will test this and cancel loading the file, showing a warning to

4
source/blender/blenloader/intern/versioning_userdef.cc
View File

@@ -1559,6 +1559,10 @@ void blo_do_versions_userdef(UserDef *userdef)
}
}
if (!USER_VERSION_ATLEAST(500, 11)) {
userdef->gpu_flag &= ~USER_GPU_FLAG_UNUSED_0;
}
/**
* Always bump subversion in BKE_blender_version.h when adding versioning
* code here, and wrap it inside a USER_VERSION_ATLEAST check.

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

@@ -806,7 +806,7 @@ typedef enum eUserpref_UI_Flag2 {
/** #UserDef.gpu_flag */
typedef enum eUserpref_GPU_Flag {
USER_GPU_FLAG_NO_DEPT_PICK = (1 << 0), /* Unused. To be removed. */
USER_GPU_FLAG_UNUSED_0 = (1 << 0), /* Unused. To be removed. */
USER_GPU_FLAG_NO_EDIT_MODE_SMOOTH_WIRE = (1 << 1),
USER_GPU_FLAG_OVERLAY_SMOOTH_WIRE = (1 << 2),
USER_GPU_FLAG_SUBDIVISION_EVALUATION = (1 << 3),

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

@@ -6273,15 +6273,6 @@ static void rna_def_userdef_system(BlenderRNA *brna)
"VBO Collection Rate",
"Number of seconds between each run of the GL vertex buffer object garbage collector");
/* Select */
prop = RNA_def_property(srna, "use_select_pick_depth", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, nullptr, "gpu_flag", USER_GPU_FLAG_NO_DEPT_PICK);
RNA_def_property_ui_text(prop,
"GPU Depth Picking",
"When making a selection in 3D View, use the GPU depth buffer to "
"ensure the frontmost object is selected first");
/* GPU subdivision evaluation. */
prop = RNA_def_property(srna, "use_gpu_subdivision", PROP_BOOLEAN, PROP_NONE);