blender
/
blender
128
395
Fork 567
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Transform: use snap-to-grid behavior from D910 

Excuse the trashing here, but seems users prefer this most (though both can be useful).

Note that the UI remains the same,
so this is an option for 'Incremental' snapping instead of a new snapping mode.
This commit is contained in:
Campbell Barton 2015-07-02 02:13:15 +10:00
parent 19da2d4124
commit 5edff01920
Notes: blender-bot 2023-02-14 08:57:59 +01:00 
Referenced by issue #45212, Absolute Grid Snapping Corner Cases
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/editors/transform/transform_generics.c
View File

@ -709,12 +709,6 @@ static void recalcData_objects(TransInfo *t)
{
Base *base = t->scene->basact;
if (t->state != TRANS_CANCEL) {
if (ELEM(t->tsnap.mode, SCE_SNAP_MODE_INCREMENT, SCE_SNAP_MODE_GRID) && t->tsnap.snap_spatial_grid) {
applyGridAbsolute(t);
}
}
if (t->obedit) {
if (ELEM(t->obedit->type, OB_CURVE, OB_SURF)) {
Curve *cu = t->obedit->data;

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

@ -2469,7 +2469,7 @@ static void applyGridIncrement(TransInfo *t, float *val, int max_index, const fl
}
/* absolute snapping on grid based on global center */
if ((t->tsnap.mode == SCE_SNAP_MODE_GRID) && (t->mode == TFM_TRANSLATION)) {
if ((t->tsnap.snap_spatial_grid) && (t->mode == TFM_TRANSLATION)) {
for (i = 0; i <= max_index; i++) {
/* do not let unconstrained axis jump to absolute grid increments */
if (!(t->con.mode & CON_APPLY) || t->con.mode & (CON_AXIS0 << i)) {

3
source/blender/makesrna/intern/rna_scene.c
View File

@ -2217,7 +2217,8 @@ static void rna_def_tool_settings(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_snap_grid_absolute", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "snap_flag", SCE_SNAP_ABS_GRID);
RNA_def_property_ui_text(prop, "Absolute Grid Snap", "Grid align vertices during transform");
RNA_def_property_ui_text(prop, "Absolute Grid Snap",
"Absolute grid alignment while translating (based on the pivot center)");
RNA_def_property_ui_icon(prop, ICON_SNAP_INCREMENT, 0);
RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */