blender
/
blender
136
406
Fork 590
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Cleanup: move snap with projection check into a function

This commit is contained in:
Campbell Barton 2021-06-26 16:57:03 +10:00
parent a287c8d3c1
commit c1fe582446
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source/blender/editors/transform/transform_snap.c
View File

@ -61,6 +61,8 @@
#include "transform_convert.h"
#include "transform_snap.h"
static bool doForceIncrementSnap(const TransInfo *t);
/* this should be passed as an arg for use in snap functions */
#undef BASACT
@ -133,6 +135,23 @@ bool activeSnap(const TransInfo *t)
((t->modifiers & (MOD_SNAP | MOD_SNAP_INVERT)) == MOD_SNAP_INVERT);
}
bool activeSnap_with_project(const TransInfo *t)
{
if (!t->tsnap.project) {
return false;
}
if (!activeSnap(t) || (t->flag & T_NO_PROJECT)) {
return false;
}
if (doForceIncrementSnap(t)) {
return false;
}
return true;
}
bool transformModeUseSnap(const TransInfo *t)
{
ToolSettings *ts = t->settings;
@ -299,15 +318,7 @@ eRedrawFlag handleSnapping(TransInfo *t, const wmEvent *event)
void applyProject(TransInfo *t)
{
if (!t->tsnap.project) {
return;
}
if (!activeSnap(t) || (t->flag & T_NO_PROJECT)) {
return;
}
if (doForceIncrementSnap(t)) {
if (!activeSnap_with_project(t)) {
return;
}

2
source/blender/editors/transform/transform_snap.h
View File

@ -61,6 +61,8 @@ bool transform_snap_grid(TransInfo *t, float *val);
void snapSequenceBounds(TransInfo *t, const int mval[2]);
bool activeSnap(const TransInfo *t);
bool activeSnap_with_project(const TransInfo *t);
bool validSnap(const TransInfo *t);
void initSnapping(struct TransInfo *t, struct wmOperator *op);