blender
/
blender
136
405
Fork 587
Code Issues 6.2k Pull Requests 754 Projects 19 Wiki Activity

Cleanup: deduplicate conditions in transform code 

The `t->spacetype` check is already done in `setSnappingCallback`.
This commit is contained in:
Germano Cavalcante 2023-01-10 09:35:59 -03:00
parent 6f38ce5a40
commit c6b4bd407e
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/transform/transform_snap.cc
View File

@ -741,12 +741,7 @@ static void initSnappingMode(TransInfo *t)
t->tsnap.project = false;
}
if (ELEM(t->spacetype, SPACE_VIEW3D, SPACE_IMAGE, SPACE_NODE, SPACE_SEQ)) {
/* Not with camera selected in camera view. */
if (!(t->options & CTX_CAMERA)) {
setSnappingCallback(t);
}
}
setSnappingCallback(t);
if (t->spacetype == SPACE_VIEW3D) {
if (t->tsnap.object_context == nullptr) {
@ -903,6 +898,10 @@ void freeSnapping(TransInfo *t)
static void setSnappingCallback(TransInfo *t)
{
if (t->spacetype == SPACE_VIEW3D) {
if (t->options & CTX_CAMERA) {
/* Not with camera selected in camera view. */
return;
}
t->tsnap.calcSnap = snap_calc_view3d_fn;
}
else if (t->spacetype == SPACE_IMAGE) {
@ -924,6 +923,9 @@ static void setSnappingCallback(TransInfo *t)
/* The target is calculated along with the snap point. */
return;
}
else {
return;
}
switch (t->tsnap.source_select) {
case SCE_SNAP_SOURCE_CLOSEST: