diff options
Diffstat (limited to 'source')
32 files changed, 103 insertions, 136 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; } } 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/blender/editors/transform/transform_mode_edge_rotate_normal.c +++ b/source/blender/editors/transform/transform_mode_edge_rotate_normal.c @@ -134,11 +134,10 @@ void initNormalRotation(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[2]); + copy_v3_fl(t->num.val_inc, t->snap[1]); 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_edge_seq_slide.c b/source/blender/editors/transform/transform_mode_edge_seq_slide.c index befd54c3636..5222d4d4e5a 100644 --- a/source/blender/editors/transform/transform_mode_edge_seq_slide.c +++ b/source/blender/editors/transform/transform_mode_edge_seq_slide.c @@ -135,11 +135,10 @@ void initSeqSlide(TransInfo *t) t->num.flag = 0; t->num.idx_max = t->idx_max; - t->snap[0] = 0.0f; - t->snap[1] = floorf(t->scene->r.frs_sec / t->scene->r.frs_sec_base); - t->snap[2] = 10.0f; + t->snap[0] = floorf(t->scene->r.frs_sec / t->scene->r.frs_sec_base); + t->snap[1] = 10.0f; - 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; /* Would be nice to have a time handling in units as well * (supporting frames in addition to "natural" time...). */ diff --git a/source/blender/editors/transform/transform_mode_edge_slide.c b/source/blender/editors/transform/transform_mode_edge_slide.c index 0c38ba588c1..c887b69c792 100644 --- a/source/blender/editors/transform/transform_mode_edge_slide.c +++ b/source/blender/editors/transform/transform_mode_edge_slide.c @@ -1555,11 +1555,10 @@ void initEdgeSlide_ex( 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_gpopacity.c b/source/blender/editors/transform/transform_mode_gpopacity.c index 11c63be156c..5eb390d7cbd 100644 --- a/source/blender/editors/transform/transform_mode_gpopacity.c +++ b/source/blender/editors/transform/transform_mode_gpopacity.c @@ -98,11 +98,10 @@ void initGPOpacity(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_gpshrinkfatten.c b/source/blender/editors/transform/transform_mode_gpshrinkfatten.c index c025dbcaccb..2d886b55a04 100644 --- a/source/blender/editors/transform/transform_mode_gpshrinkfatten.c +++ b/source/blender/editors/transform/transform_mode_gpshrinkfatten.c @@ -100,11 +100,10 @@ void initGPShrinkFatten(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_maskshrinkfatten.c b/source/blender/editors/transform/transform_mode_maskshrinkfatten.c index 3ac35ae7780..1c5b5000f5c 100644 --- a/source/blender/editors/transform/transform_mode_maskshrinkfatten.c +++ b/source/blender/editors/transform/transform_mode_maskshrinkfatten.c @@ -128,11 +128,10 @@ void initMaskShrinkFatten(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_push_pull.c b/source/blender/editors/transform/transform_mode_push_pull.c index 2b17f208e79..860dd51da94 100644 --- a/source/blender/editors/transform/transform_mode_push_pull.c +++ b/source/blender/editors/transform/transform_mode_push_pull.c @@ -122,11 +122,10 @@ void initPushPull(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_LENGTH; } diff --git a/source/blender/editors/transform/transform_mode_resize.c b/source/blender/editors/transform/transform_mode_resize.c index b4245abcc12..06d61dd9ec8 100644 --- a/source/blender/editors/transform/transform_mode_resize.c +++ b/source/blender/editors/transform/transform_mode_resize.c @@ -188,11 +188,10 @@ void initResize(TransInfo *t) t->idx_max = 2; t->num.idx_max = 2; - 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_rotate.c b/source/blender/editors/transform/transform_mode_rotate.c index 37b68877b08..943410e009d 100644 --- a/source/blender/editors/transform/transform_mode_rotate.c +++ b/source/blender/editors/transform/transform_mode_rotate.c @@ -244,11 +244,10 @@ void initRotation(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[2]); + copy_v3_fl(t->num.val_inc, t->snap[1]); 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_shear.c b/source/blender/editors/transform/transform_mode_shear.c index 18968494395..dfc6f69b341 100644 --- a/source/blender/editors/transform/transform_mode_shear.c +++ b/source/blender/editors/transform/transform_mode_shear.c @@ -226,11 +226,10 @@ void initShear(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; /* Don't think we have any unit here? */ diff --git a/source/blender/editors/transform/transform_mode_shrink_fatten.c b/source/blender/editors/transform/transform_mode_shrink_fatten.c index 2f221181d12..679584cbfee 100644 --- a/source/blender/editors/transform/transform_mode_shrink_fatten.c +++ b/source/blender/editors/transform/transform_mode_shrink_fatten.c @@ -128,11 +128,10 @@ void initShrinkFatten(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_LENGTH; diff --git a/source/blender/editors/transform/transform_mode_skin_resize.c b/source/blender/editors/transform/transform_mode_skin_resize.c index 665c616bc2b..a1a6f0ce8f8 100644 --- a/source/blender/editors/transform/transform_mode_skin_resize.c +++ b/source/blender/editors/transform/transform_mode_skin_resize.c @@ -123,11 +123,10 @@ void initSkinResize(TransInfo *t) t->idx_max = 2; t->num.idx_max = 2; - 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_tilt.c b/source/blender/editors/transform/transform_mode_tilt.c index 5ab23000039..07e0e156803 100644 --- a/source/blender/editors/transform/transform_mode_tilt.c +++ b/source/blender/editors/transform/transform_mode_tilt.c @@ -101,11 +101,10 @@ void initTilt(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[2]); + copy_v3_fl(t->num.val_inc, t->snap[1]); 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_timescale.c b/source/blender/editors/transform/transform_mode_timescale.c index ce46cc36276..dbe06a6f1f6 100644 --- a/source/blender/editors/transform/transform_mode_timescale.c +++ b/source/blender/editors/transform/transform_mode_timescale.c @@ -148,10 +148,9 @@ void initTimeScale(TransInfo *t) t->num.idx_max = t->idx_max; /* initialize snap like for everything else */ - t->snap[0] = 0.0f; - t->snap[1] = t->snap[2] = 1.0f; + t->snap[0] = t->snap[1] = 1.0f; - 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_timeslide.c b/source/blender/editors/transform/transform_mode_timeslide.c index 43e14a26930..9d112013398 100644 --- a/source/blender/editors/transform/transform_mode_timeslide.c +++ b/source/blender/editors/transform/transform_mode_timeslide.c @@ -225,10 +225,9 @@ void initTimeSlide(TransInfo *t) t->num.idx_max = t->idx_max; /* initialize snap like for everything else */ - t->snap[0] = 0.0f; - t->snap[1] = t->snap[2] = 1.0f; + t->snap[0] = t->snap[1] = 1.0f; - 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; /* No time unit supporting frames currently... */ t->num.unit_type[0] = B_UNIT_NONE; diff --git a/source/blender/editors/transform/transform_mode_timetranslate.c b/source/blender/editors/transform/transform_mode_timetranslate.c index 28eaff8c136..226e8a377ea 100644 --- a/source/blender/editors/transform/transform_mode_timetranslate.c +++ b/source/blender/editors/transform/transform_mode_timetranslate.c @@ -155,10 +155,9 @@ void initTimeTranslate(TransInfo *t) t->num.idx_max = t->idx_max; /* initialize snap like for everything else */ - t->snap[0] = 0.0f; - t->snap[1] = t->snap[2] = 1.0f; + t->snap[0] = t->snap[1] = 1.0f; - 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; /* No time unit supporting frames currently... */ t->num.unit_type[0] = B_UNIT_NONE; diff --git a/source/blender/editors/transform/transform_mode_tosphere.c b/source/blender/editors/transform/transform_mode_tosphere.c index e747f0e75d0..de85d586550 100644 --- a/source/blender/editors/transform/transform_mode_tosphere.c +++ b/source/blender/editors/transform/transform_mode_tosphere.c @@ -111,11 +111,10 @@ void initToSphere(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_trackball.c b/source/blender/editors/transform/transform_mode_trackball.c index 2656411e8ab..a0d3bbac8e3 100644 --- a/source/blender/editors/transform/transform_mode_trackball.c +++ b/source/blender/editors/transform/transform_mode_trackball.c @@ -151,11 +151,10 @@ void initTrackball(TransInfo *t) t->idx_max = 1; t->num.idx_max = 1; - 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[2]); + copy_v3_fl(t->num.val_inc, t->snap[1]); 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_translate.c b/source/blender/editors/transform/transform_mode_translate.c index c17e6e596e0..d4748e7933b 100644 --- a/source/blender/editors/transform/transform_mode_translate.c +++ b/source/blender/editors/transform/transform_mode_translate.c @@ -449,9 +449,9 @@ void initTranslation(TransInfo *t) t->num.flag = 0; t->num.idx_max = t->idx_max; - copy_v3_v3(t->snap, t->snap_spatial); + copy_v2_v2(t->snap, t->snap_spatial); - 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; if (t->spacetype == SPACE_VIEW3D) { /* Handling units makes only sense in 3Dview... See T38877. */ diff --git a/source/blender/editors/transform/transform_mode_vert_slide.c b/source/blender/editors/transform/transform_mode_vert_slide.c index 75b973b6b14..289ed76c731 100644 --- a/source/blender/editors/transform/transform_mode_vert_slide.c +++ b/source/blender/editors/transform/transform_mode_vert_slide.c @@ -675,11 +675,10 @@ void initVertSlide_ex(TransInfo *t, bool use_even, bool flipped, bool use_clamp) 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_snap.c b/source/blender/editors/transform/transform_snap.c index a546aabd095..1ab81ada398 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -384,7 +384,7 @@ void applyGridAbsolute(TransInfo *t) return; } - float grid_size = (t->modifiers & MOD_PRECISION) ? t->snap_spatial[2] : t->snap_spatial[1]; + float grid_size = (t->modifiers & MOD_PRECISION) ? t->snap_spatial[1] : t->snap_spatial[0]; /* early exit on unusable grid size */ if (grid_size == 0.0f) { @@ -1462,7 +1462,7 @@ bool transform_snap_grid(TransInfo *t, float *val) return false; } - float grid_dist = (t->modifiers & MOD_PRECISION) ? t->snap[2] : t->snap[1]; + float grid_dist = (t->modifiers & MOD_PRECISION) ? t->snap[1] : t->snap[0]; /* Early bailing out if no need to snap */ if (grid_dist == 0.0f) { @@ -1523,6 +1523,10 @@ static void snap_increment_apply(TransInfo *t, bool transform_snap_increment(TransInfo *t, float *val) { + if (!activeSnap(t)) { + return false; + } + if (!(t->tsnap.mode & SCE_SNAP_MODE_INCREMENT) && !doForceIncrementSnap(t)) { return false; } @@ -1533,8 +1537,7 @@ bool transform_snap_increment(TransInfo *t, float *val) return false; } - float increment_dist = activeSnap(t) ? (t->modifiers & MOD_PRECISION) ? t->snap[2] : t->snap[1] : - t->snap[0]; + float increment_dist = (t->modifiers & MOD_PRECISION) ? t->snap[1] : t->snap[0]; snap_increment_apply(t, t->idx_max, increment_dist, val); return true; |