Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGermano Cavalcante <germano.costa@ig.com.br>2020-10-08 15:45:45 +0300
committerGermano Cavalcante <germano.costa@ig.com.br>2020-10-08 19:39:41 +0300
commit043ddcf3ad3bdcba2c980af76202bc6f177f4b0d (patch)
treed9ebf082f18edf58eceff6dbae99833845bc578a /source/blender/editors/transform/transform.c
parent196d6166e51dc9496a8a678c329758134988eee3 (diff)
Cleanup: Simplify use of 'Snapping Gears'
This commit removes `t->snap[0]` and `t->snap_spatial[0]`. They were not actually being used, and could add overhead for transformation without snap.
Diffstat (limited to 'source/blender/editors/transform/transform.c')
-rw-r--r--source/blender/editors/transform/transform.c28
1 files changed, 11 insertions, 17 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index a0374d733ea..921b6a24312 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1622,40 +1622,34 @@ void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
}
}
-static void initSnapSpatial(TransInfo *t, float r_snap[3])
+static void initSnapSpatial(TransInfo *t, float r_snap[2])
{
if (t->spacetype == SPACE_VIEW3D) {
RegionView3D *rv3d = t->region->regiondata;
if (rv3d) {
View3D *v3d = t->area->spacedata.first;
- r_snap[0] = 0.0f;
- r_snap[1] = ED_view3d_grid_view_scale(t->scene, v3d, rv3d, NULL) * 1.0f;
- r_snap[2] = r_snap[1] * 0.1f;
+ r_snap[0] = ED_view3d_grid_view_scale(t->scene, v3d, rv3d, NULL) * 1.0f;
+ r_snap[1] = r_snap[0] * 0.1f;
}
}
else if (t->spacetype == SPACE_IMAGE) {
- r_snap[0] = 0.0f;
- r_snap[1] = 0.0625f;
- r_snap[2] = 0.03125f;
+ r_snap[0] = 0.0625f;
+ r_snap[1] = 0.03125f;
}
else if (t->spacetype == SPACE_CLIP) {
- r_snap[0] = 0.0f;
- r_snap[1] = 0.125f;
- r_snap[2] = 0.0625f;
+ r_snap[0] = 0.125f;
+ r_snap[1] = 0.0625f;
}
else if (t->spacetype == SPACE_NODE) {
- r_snap[0] = 0.0f;
- r_snap[1] = r_snap[2] = ED_node_grid_size();
+ r_snap[0] = r_snap[1] = ED_node_grid_size();
}
else if (t->spacetype == SPACE_GRAPH) {
- r_snap[0] = 0.0f;
- r_snap[1] = 1.0;
- r_snap[2] = 0.1f;
+ r_snap[0] = 1.0;
+ r_snap[1] = 0.1f;
}
else {
- r_snap[0] = 0.0f;
- r_snap[1] = r_snap[2] = 1.0f;
+ r_snap[0] = r_snap[1] = 1.0f;
}
}