blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Cleanup/Refactor: remove unused 'SNAP_ONLY_ACTIVE' enum parameter 

`SNAP_ONLY_ACTIVE` was implemented in order to be used in the Knife tool,
but the project did not go ahead.
This commit is contained in:
Germano Cavalcante 2022-03-28 13:49:31 -03:00
parent 39df927b4a
commit 854af0cd09
4 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/include/ED_transform_snap_object_context.h
View File

@ -30,8 +30,7 @@ typedef enum {
SNAP_NOT_SELECTED = 1,
SNAP_NOT_ACTIVE = 2,
SNAP_NOT_EDITED = 3,
SNAP_ONLY_ACTIVE = 4,
SNAP_SELECTABLE = 5,
SNAP_SELECTABLE = 4,
} eSnapSelect;
typedef enum {

5
source/blender/editors/include/ED_view3d.h
View File

@ -273,9 +273,8 @@ typedef enum {
V3D_SNAPCURSOR_TOGGLE_ALWAYS_TRUE = 1 << 0,
V3D_SNAPCURSOR_OCCLUSION_ALWAYS_TRUE = 1 << 1,
V3D_SNAPCURSOR_OCCLUSION_ALWAYS_FALSE = 1 << 2, /* TODO. */
V3D_SNAPCURSOR_SNAP_ONLY_ACTIVE = 1 << 3,
V3D_SNAPCURSOR_SNAP_EDIT_GEOM_FINAL = 1 << 4,
V3D_SNAPCURSOR_SNAP_EDIT_GEOM_CAGE = 1 << 5,
V3D_SNAPCURSOR_SNAP_EDIT_GEOM_FINAL = 1 << 3,
V3D_SNAPCURSOR_SNAP_EDIT_GEOM_CAGE = 1 << 4,
} eV3DSnapCursor;
typedef enum {

5
source/blender/editors/space_view3d/view3d_cursor_snap.c
View File

@ -620,9 +620,6 @@ static void v3d_cursor_snap_update(V3DSnapCursorState *state,
snap_elements &= ~SCE_SNAP_MODE_EDGE_PERPENDICULAR;
}
eSnapSelect snap_select = (state->flag & V3D_SNAPCURSOR_SNAP_ONLY_ACTIVE) ? SNAP_ONLY_ACTIVE :
SNAP_ALL;
eSnapEditType edit_mode_type = (state->flag & V3D_SNAPCURSOR_SNAP_EDIT_GEOM_FINAL) ?
SNAP_GEOM_FINAL :
(state->flag & V3D_SNAPCURSOR_SNAP_EDIT_GEOM_CAGE) ?
@ -640,7 +637,7 @@ static void v3d_cursor_snap_update(V3DSnapCursorState *state,
v3d,
snap_elements,
&(const struct SnapObjectParams){
.snap_select = snap_select,
.snap_select = SNAP_ALL,
.edit_mode_type = edit_mode_type,
.use_occlusion_test = use_occlusion_test,
},

6
source/blender/editors/transform/transform_snap_object.c
View File

@ -494,12 +494,6 @@ static void iter_snap_objects(SnapObjectContext *sctx,
const eSnapSelect snap_select = params->snap_select;
Base *base_act = view_layer->basact;
if (snap_select == SNAP_ONLY_ACTIVE) {
Object *obj_eval = DEG_get_evaluated_object(sctx->runtime.depsgraph, base_act->object);
sob_callback(sctx, params, obj_eval, obj_eval->obmat, true, data);
return;
}
const bool is_in_object_mode = !base_act || base_act->object->mode == OB_MODE_OBJECT;
for (Base *base = view_layer->object_bases.first; base != NULL; base = base->next) {
if (!snap_object_is_snappable(sctx, snap_select, base_act, base, is_in_object_mode)) {