[Bf-blender-cvs] [043ddcf3ad3] master: Cleanup: Simplify use of 'Snapping Gears'
Germano Cavalcante
noreply at git.blender.org
Thu Oct 8 18:39:49 CEST 2020
Commit: 043ddcf3ad3bdcba2c980af76202bc6f177f4b0d
Author: Germano Cavalcante
Date: Thu Oct 8 09:45:45 2020 -0300
Branches: master
https://developer.blender.org/rB043ddcf3ad3bdcba2c980af76202bc6f177f4b0d
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.
===================================================================
M source/blender/editors/transform/transform.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_gizmo_3d.c
M source/blender/editors/transform/transform_mode_baketime.c
M source/blender/editors/transform/transform_mode_bbone_resize.c
M source/blender/editors/transform/transform_mode_bend.c
M source/blender/editors/transform/transform_mode_boneenvelope.c
M source/blender/editors/transform/transform_mode_boneroll.c
M source/blender/editors/transform/transform_mode_curveshrinkfatten.c
M source/blender/editors/transform/transform_mode_edge_bevelweight.c
M source/blender/editors/transform/transform_mode_edge_crease.c
M source/blender/editors/transform/transform_mode_edge_rotate_normal.c
M source/blender/editors/transform/transform_mode_edge_seq_slide.c
M source/blender/editors/transform/transform_mode_edge_slide.c
M source/blender/editors/transform/transform_mode_gpopacity.c
M source/blender/editors/transform/transform_mode_gpshrinkfatten.c
M source/blender/editors/transform/transform_mode_maskshrinkfatten.c
M source/blender/editors/transform/transform_mode_push_pull.c
M source/blender/editors/transform/transform_mode_resize.c
M source/blender/editors/transform/transform_mode_rotate.c
M source/blender/editors/transform/transform_mode_shear.c
M source/blender/editors/transform/transform_mode_shrink_fatten.c
M source/blender/editors/transform/transform_mode_skin_resize.c
M source/blender/editors/transform/transform_mode_tilt.c
M source/blender/editors/transform/transform_mode_timescale.c
M source/blender/editors/transform/transform_mode_timeslide.c
M source/blender/editors/transform/transform_mode_timetranslate.c
M source/blender/editors/transform/transform_mode_tosphere.c
M source/blender/editors/transform/transform_mode_trackball.c
M source/blender/editors/transform/transform_mode_translate.c
M source/blender/editors/transform/transform_mode_vert_slide.c
M source/blender/editors/transform/transform_snap.c
===================================================================
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;
}
}
diff --git a/source/blender/editors/transform/transform.h b/source/blender/editors/transform/transform.h
index 0c4aae9e2d1..ed4a2945de6 100644
--- a/source/blender/editors/transform/transform.h
+++ b/source/blender/editors/transform/transform.h
@@ -316,9 +316,9 @@ typedef struct TransInfo {
/** maximum index on the input vector. */
short idx_max;
/** Snapping Gears. */
- float snap[3];
+ float snap[2];
/** Spatial snapping gears(even when rotating, scaling... etc). */
- float snap_spatial[3];
+ float snap_spatial[2];
/** Mouse side of the current frame, 'L', 'R' or 'B' */
char frame_side;
diff --git a/source/blender/editors/transform/transform_gizmo_3d.c b/source/blender/editors/transform/transform_gizmo_3d.c
index b8aa16c0a59..017cccdee15 100644
--- a/source/blender/editors/transform/transform_gizmo_3d.c
+++ b/source/blender/editors/transform/transform_gizmo_3d.c
@@ -1280,7 +1280,7 @@ void drawDial3d(const TransInfo *t)
float mat_basis[4][4];
float mat_final[4][4];
float color[4];
- float increment;
+ float increment = 0.0f;
float line_with = GIZMO_AXIS_LINE_WIDTH + 1.0f;
float scale = UI_DPI_FAC * U.gizmo_size;
@@ -1335,10 +1335,7 @@ void drawDial3d(const TransInfo *t)
if (activeSnap(t) && (!transformModeUseSnap(t) ||
(t->tsnap.mode & (SCE_SNAP_MODE_INCREMENT | SCE_SNAP_MODE_GRID)))) {
- increment = (t->modifiers & MOD_PRECISION) ? t->snap[2] : t->snap[1];
- }
- else {
- increment = t->snap[0];
+ increment = (t->modifiers & MOD_PRECISION) ? t->snap[1] : t->snap[0];
}
BLI_assert(axis_idx >= MAN_AXIS_RANGE_ROT_START && axis_idx < MAN_AXIS_RANGE_ROT_END);
diff --git a/source/blender/editors/transform/transform_mode_baketime.c b/source/blender/editors/transform/transform_mode_baketime.c
index 235b04b1858..6470776e1a2 100644
--- a/source/blender/editors/transform/transform_mode_baketime.c
+++ b/source/blender/editors/transform/transform_mode_baketime.c
@@ -125,11 +125,10 @@ void initBakeTime(TransInfo *t)
t->idx_max = 0;
t->num.idx_max = 0;
- t->snap[0] = 0.0f;
- t->snap[1] = 1.0f;
- t->snap[2] = t->snap[1] * 0.1f;
+ t->snap[0] = 1.0f;
+ t->snap[1] = t->snap[0] * 0.1f;
- copy_v3_fl(t->num.val_inc, t->snap[1]);
+ copy_v3_fl(t->num.val_inc, t->snap[0]);
t->num.unit_sys = t->scene->unit.system;
t->num.unit_type[0] = B_UNIT_NONE; /* Don't think this uses units? */
}
diff --git a/source/blender/editors/transform/transform_mode_bbone_resize.c b/source/blender/editors/transform/transform_mode_bbone_resize.c
index d067c9df418..05c4bbedcb4 100644
--- a/source/blender/editors/transform/transform_mode_bbone_resize.c
+++ b/source/blender/editors/transform/transform_mode_bbone_resize.c
@@ -175,11 +175,10 @@ void initBoneSize(TransInfo *t)
t->num.val_flag[1] |= NUM_NULL_ONE;
t->num.val_flag[2] |= NUM_NULL_ONE;
t->num.flag |= NUM_AFFECT_ALL;
- t->snap[0] = 0.0f;
- t->snap[1] = 0.1f;
- t->snap[2] = t->snap[1] * 0.1f;
+ t->snap[0] = 0.1f;
+ t->snap[1] = t->snap[0] * 0.1f;
- copy_v3_fl(t->num.val_inc, t->snap[1]);
+ copy_v3_fl(t->num.val_inc, t->snap[0]);
t->num.unit_sys = t->scene->unit.system;
t->num.unit_type[0] = B_UNIT_NONE;
t->num.unit_type[1] = B_UNIT_NONE;
diff --git a/source/blender/editors/transform/transform_mode_bend.c b/source/blender/editors/transform/transform_mode_bend.c
index 86de40448b7..ca22263712c 100644
--- a/source/blender/editors/transform/transform_mode_bend.c
+++ b/source/blender/editors/transform/transform_mode_bend.c
@@ -102,7 +102,7 @@ static void Bend(TransInfo *t, const int UNUSED(mval[2]))
* this isnt essential but nicer to give reasonable snapping values for radius */
if (t->tsnap.mode & SCE_SNAP_MODE_INCREMENT) {
const float radius_snap = 0.1f;
- const float snap_hack = (t->snap[1] * data->warp_init_dist) / radius_snap;
+ const float snap_hack = (t->snap[0] * data->warp_init_dist) / radius_snap;
values.scale *= snap_hack;
transform_snap_increment(t, values.vector);
values.scale /= snap_hack;
@@ -261,11 +261,10 @@ void initBend(TransInfo *t)
t->idx_max = 1;
t->num.idx_max = 1;
- t->snap[0] = 0.0f;
- t->snap[1] = SNAP_INCREMENTAL_ANGLE;
- t->snap[2] = t->snap[1] * 0.2;
+ t->snap[0] = SNAP_INCREMENTAL_ANGLE;
+ t->snap[1] = t->snap[0] * 0.2;
- copy_v3_fl(t->num.val_inc, t->snap[1]);
+ copy_v3_fl(t->num.val_inc, t->snap[0]);
t->num.unit_sys = t->scene->unit.system;
t->num.unit_use_radians = (t->scene->unit.system_rotation == USER_UNIT_ROT_RADIANS);
t->num.unit_type[0] = B_UNIT_ROTATION;
diff --git a/source/blender/editors/transform/transform_mode_boneenvelope.c b/source/blender/editors/transform/transform_mode_boneenvelope.c
index 7f5a8fedeef..1a25ee50543 100644
--- a/source/blender/editors/transform/transform_mode_boneenvelope.c
+++ b/source/blender/editors/transform/transform_mode_boneenvelope.c
@@ -102,11 +102,10 @@ void initBoneEnvelope(TransInfo *t)
t->idx_max = 0;
t->num.idx_max = 0;
- t->snap[0] = 0.0f;
- t->snap[1] = 0.1f;
- t->snap[2] = t->snap[1] * 0.1f;
+ t->snap[0] = 0.1f;
+ t->snap[1] = t->snap[0] * 0.1f;
- copy_v3_fl(t->num.val_inc, t->snap[1]);
+ copy_v3_fl(t->num.val_inc, t->snap[0]);
t->num.unit_sys = t->scene->unit.system;
t->num.unit_type[0] = B_UNIT_NONE;
diff --git a/source/blender/editors/transform/transform_mode_boneroll.c b/source/blender/editors/transform/transform_mode_boneroll.c
index 8805d54e1f8..cd277517d6b 100644
--- a/source/blender/editors/transform/transform_mode_boneroll.c
+++ b/source/blender/editors/transform/transform_mode_boneroll.c
@@ -97,11 +97,10 @@ void initBoneRoll(TransInfo *t)
t->idx_max = 0;
t->num.idx_max = 0;
- t->snap[0] = 0.0f;
- t->snap[1] = DEG2RAD(5.0);
- t->snap[2] = DEG2RAD(1.0);
+ t->snap[0] = DEG2RAD(5.0);
+ t->snap[1] = DEG2RAD(1.0);
- copy_v3_fl(t->num.val_inc, t->snap[1]);
+ copy_v3_fl(t->num.val_inc, t->snap[0]);
t->num.unit_sys = t->scene->unit.system;
t->num.unit_use_radians = (t->scene->unit.system_rotation == USER_UNIT_ROT_RADIANS);
t->num.unit_type[0] = B_UNIT_ROTATION;
diff --git a/source/blender/editors/transform/transform_mode_curveshrinkfatten.c b/source/blender/editors/transform/transform_mode_curveshrinkfatten.c
index fd65b019fe0..1935264d6d0 100644
--- a/source/blender/editors/transform/transform_mode_curveshrinkfatten.c
+++ b/source/blender/editors/transform/transform_mode_curveshrinkfatten.c
@@ -102,11 +102,10 @@ void initCurveShrinkFatten(TransInfo *t)
t->idx_max = 0;
t->num.idx_max = 0;
- t->snap[0] = 0.0f;
- t->snap[1] = 0.1f;
- t->snap[2] = t->snap[1] * 0.1f;
+ t->snap[0] = 0.1f;
+ t->snap[1] = t->snap[0] * 0.1f;
- copy_v3_fl(t->num.val_inc, t->snap[1]);
+ copy_v3_fl(t->num.val_inc, t->snap[0]);
t->num.unit_sys = t->scene->unit.system;
t->num.unit_type[0] = B_UNIT_NONE;
diff --git a/source/blender/editors/transform/transform_mode_edge_bevelweight.c b/source/blender/editors/transform/transform_mode_edge_bevelweight.c
index 4d6e25dbe34..2f7707cdee4 100644
--- a/source/blender/editors/transform/transform_mode_edge_bevelweight.c
+++ b/source/blender/editors/transform/transform_mode_edge_bevelweight.c
@@ -113,11 +113,10 @@ void initBevelWeight(TransInfo *t)
t->idx_max = 0;
t->num.idx_max = 0;
- t->snap[0] = 0.0f;
- t->snap[1] = 0.1f;
- t->snap[2] = t->snap[1] * 0.1f;
+ t->snap[0] = 0.1f;
+ t->snap[1] = t->snap[0] * 0.1f;
- copy_v3_fl(t->num.val_inc, t->snap[1]);
+ copy_v3_fl(t->num.val_inc, t->snap[0]);
t->num.unit_sys = t->scene->unit.system;
t->num.unit_type[0] = B_UNIT_NONE;
diff --git a/source/blender/editors/transform/transform_mode_edge_crease.c b/source/blender/editors/transform/transform_mode_edge_crease.c
index a1822d99ff9..e2e0afc0a8f 100644
--- a/source/blender/editors/transform/transform_mode_edge_crease.c
+++ b/source/blender/editors/transform/transform_mode_edge_crease.c
@@ -117,11 +117,10 @@ void initCrease(TransInfo *t)
t->idx_max = 0;
t->num.idx_max = 0;
- t->snap[0] = 0.0f;
- t->snap[1] = 0.1f;
- t->snap[2] = t->snap[1] * 0.1f;
+ t->snap[0] = 0.1f;
+ t->snap[1] = t->snap[0] * 0.1f;
- copy_v3_fl(t->num.val_inc, t->snap[1]);
+ copy_v3_fl(t->num.val_inc, t->snap[0]);
t->num.unit_sys = t->scene->unit.system;
t->num.unit_type[0] = B_UNIT_NONE;
diff --git a/source/blender/editors/transform/transform_mode_edge_rotate_normal.c b/source/blender/editors/transform/transform_mode_edge_rotate_normal.c
index 5b929c39915..4b083a0529f 100644
--- a/source/blende
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list