blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Cleanup: Set default snap cursor values during build time

This commit is contained in:
Germano Cavalcante 2021-10-20 19:57:03 -03:00
parent 6b761c59d2
commit 15e71f3d97
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,27 @@ typedef struct SnapCursorDataIntern {
bool is_initiated;
} SnapCursorDataIntern;
static SnapCursorDataIntern g_data_intern = {{0}};
static void v3d_cursor_snap_state_init(V3DSnapCursorState *state)
{
state->prevpoint = NULL;
state->snap_elem_force = (SCE_SNAP_MODE_VERTEX | SCE_SNAP_MODE_EDGE | SCE_SNAP_MODE_FACE |
SCE_SNAP_MODE_EDGE_PERPENDICULAR | SCE_SNAP_MODE_EDGE_MIDPOINT);
state->plane_axis = 2;
rgba_uchar_args_set(state->color_point, 255, 255, 255, 255);
rgba_uchar_args_set(state->color_line, 255, 255, 255, 128);
state->draw_point = true;
state->draw_plane = false;
}
static SnapCursorDataIntern g_data_intern = {
.state_default = {.prevpoint = NULL,
.snap_elem_force = (SCE_SNAP_MODE_VERTEX | SCE_SNAP_MODE_EDGE |
SCE_SNAP_MODE_FACE | SCE_SNAP_MODE_EDGE_PERPENDICULAR |
SCE_SNAP_MODE_EDGE_MIDPOINT),
.plane_axis = 2,
.color_point = {255, 255, 255, 255},
.color_line = {255, 255, 255, 128},
.draw_point = true,
.draw_plane = false}};
/**
* Calculate a 3x3 orientation matrix from the surface under the cursor.
@ -828,22 +848,10 @@ V3DSnapCursorState *ED_view3d_cursor_snap_state_get(void)
return (V3DSnapCursorState *)&g_data_intern.state_intern[g_data_intern.state_active];
}
static void v3d_cursor_snap_state_init(V3DSnapCursorState *state)
{
state->prevpoint = NULL;
state->snap_elem_force = (SCE_SNAP_MODE_VERTEX | SCE_SNAP_MODE_EDGE | SCE_SNAP_MODE_FACE |
SCE_SNAP_MODE_EDGE_PERPENDICULAR | SCE_SNAP_MODE_EDGE_MIDPOINT);
state->plane_axis = 2;
rgba_uchar_args_set(state->color_point, 255, 255, 255, 255);
UI_GetThemeColor3ubv(TH_TRANSFORM, state->color_line);
state->color_line[3] = 128;
state->draw_point = true;
state->draw_plane = false;
}
static void v3d_cursor_snap_activate(void)
{
SnapCursorDataIntern *data_intern = &g_data_intern;
if (!data_intern->handle) {
if (!data_intern->is_initiated) {
/* Only initiate intern data once.
@ -855,9 +863,6 @@ static void v3d_cursor_snap_activate(void)
data_intern->keymap = WM_modalkeymap_find(keyconf, "Generic Gizmo Tweak Modal Map");
RNA_enum_value_from_id(data_intern->keymap->modal_items, "SNAP_ON", &data_intern->snap_on);
#endif
V3DSnapCursorState *state_default = &data_intern->state_default;
v3d_cursor_snap_state_init(state_default);
data_intern->is_initiated = true;
}