Xylvier/blender
0
0
Fork 0
forked from blender/blender
Code Pull Requests Activity

main sync #3

Merged
Patrick Busch merged 318 commits from blender/blender:main into main 2023-03-17 15:52:21 +01:00
Conversation 0 Commits 318 Files Changed 1069 +35 -57
1 changed files with 35 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f6c70755d1 - Show all commits

64
source/blender/editors/space_view3d/view3d_gizmo_ruler.c
View File

@ -329,12 +329,8 @@ static bool view3d_ruler_item_mousemove(const bContext *C,
RulerInfo *ruler_info, RulerInfo *ruler_info,
RulerItem *ruler_item, RulerItem *ruler_item,
const int mval[2], const int mval[2],
const bool do_thickness const bool do_thickness,
#ifndef USE_SNAP_DETECT_FROM_KEYMAP_HACK const bool do_snap)
,
const bool do_snap
#endif
)
{ {
wmGizmo *snap_gizmo = ruler_info->snap_data.gizmo; wmGizmo *snap_gizmo = ruler_info->snap_data.gizmo;
const float eps_bias = 0.0002f; const float eps_bias = 0.0002f;
@ -389,13 +385,11 @@ static bool view3d_ruler_item_mousemove(const bContext *C,
NULL); NULL);
} }
} }
else else {
#ifndef USE_SNAP_DETECT_FROM_KEYMAP_HACK
if (do_snap)
#endif
{
View3D *v3d = ruler_info->area->spacedata.first; View3D *v3d = ruler_info->area->spacedata.first;
if (do_snap) {
float *prev_point = NULL; float *prev_point = NULL;
BLI_assert(ED_gizmotypes_snap_3d_is_enabled(snap_gizmo));
if (inter->co_index != 1) { if (inter->co_index != 1) {
if (ruler_item->flag & RULERITEM_USE_ANGLE) { if (ruler_item->flag & RULERITEM_USE_ANGLE) {
@ -413,7 +407,6 @@ static bool view3d_ruler_item_mousemove(const bContext *C,
snap_gizmo->ptr, ruler_info->snap_data.prop_prevpoint, prev_point); snap_gizmo->ptr, ruler_info->snap_data.prop_prevpoint, prev_point);
} }
if (ED_gizmotypes_snap_3d_is_enabled(snap_gizmo)) {
ED_gizmotypes_snap_3d_data_get(C, snap_gizmo, co, NULL, NULL, NULL); ED_gizmotypes_snap_3d_data_get(C, snap_gizmo, co, NULL, NULL, NULL);
} }
@ -1041,7 +1034,12 @@ static int gizmo_ruler_modal(bContext *C,
#ifndef USE_SNAP_DETECT_FROM_KEYMAP_HACK #ifndef USE_SNAP_DETECT_FROM_KEYMAP_HACK
const bool do_snap = !(tweak_flag & WM_GIZMO_TWEAK_SNAP); const bool do_snap = !(tweak_flag & WM_GIZMO_TWEAK_SNAP);
#else
/* Ensure snap is up to date. */
ED_gizmotypes_snap_3d_data_get(C, ruler_info->snap_data.gizmo, NULL, NULL, NULL, NULL);
const bool do_snap = ED_gizmotypes_snap_3d_is_enabled(ruler_info->snap_data.gizmo);
#endif #endif
const bool do_thickness = tweak_flag & WM_GIZMO_TWEAK_PRECISE; const bool do_thickness = tweak_flag & WM_GIZMO_TWEAK_PRECISE;
if (ruler_info->drag_state_prev.do_thickness != do_thickness) { if (ruler_info->drag_state_prev.do_thickness != do_thickness) {
do_cursor_update = true; do_cursor_update = true;
@ -1050,17 +1048,8 @@ static int gizmo_ruler_modal(bContext *C,
if (do_cursor_update) { if (do_cursor_update) {
if (ruler_info->state == RULER_STATE_DRAG) { if (ruler_info->state == RULER_STATE_DRAG) {
struct Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); struct Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
if (view3d_ruler_item_mousemove(C, if (view3d_ruler_item_mousemove(
depsgraph, C, depsgraph, ruler_info, ruler_item, event->mval, do_thickness, do_snap)) {
ruler_info,
ruler_item,
event->mval,
do_thickness
#ifndef USE_SNAP_DETECT_FROM_KEYMAP_HACK
,
do_snap
#endif
)) {
do_draw = true; do_draw = true;
} }
} }
@ -1119,17 +1108,8 @@ static int gizmo_ruler_invoke(bContext *C, wmGizmo *gz, const wmEvent *event)
/* update the new location */ /* update the new location */
struct Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); struct Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
view3d_ruler_item_mousemove(C, view3d_ruler_item_mousemove(
depsgraph, C, depsgraph, ruler_info, ruler_item_pick, event->mval, false, false);
ruler_info,
ruler_item_pick,
event->mval,
false
#ifndef USE_SNAP_DETECT_FROM_KEYMAP_HACK
,
false
#endif
);
} }
} }
else { else {
@ -1324,17 +1304,15 @@ static int view3d_ruler_add_invoke(bContext *C, wmOperator *op, const wmEvent *e
RulerInteraction *inter = ruler_item->gz.interaction_data; RulerInteraction *inter = ruler_item->gz.interaction_data;
struct Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C); struct Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
inter->co_index = 0; inter->co_index = 0;
view3d_ruler_item_mousemove(C,
depsgraph,
ruler_info,
ruler_item,
mval,
false
#ifndef USE_SNAP_DETECT_FROM_KEYMAP_HACK #ifndef USE_SNAP_DETECT_FROM_KEYMAP_HACK
, /* Snap the first point added, not essential but handy. */
true const bool do_snap = true;
#else
const bool do_snap = ED_gizmotypes_snap_3d_is_enabled(ruler_info->snap_data.gizmo);
#endif #endif
);
view3d_ruler_item_mousemove(C, depsgraph, ruler_info, ruler_item, mval, false, do_snap);
copy_v3_v3(inter->drag_start_co, ruler_item->co[inter->co_index]); copy_v3_v3(inter->drag_start_co, ruler_item->co[inter->co_index]);
RNA_property_float_set_array(ruler_info->snap_data.gizmo->ptr, RNA_property_float_set_array(ruler_info->snap_data.gizmo->ptr,
ruler_info->snap_data.prop_prevpoint, ruler_info->snap_data.prop_prevpoint,