2.5: remove user preferences to always snap for translate/rotate/scale,

with new behavior of the snap setting in the 3d view these are no longer
necessary.

3 files changed, 4 insertions, 30 deletions

diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index 9d8057caea6..bfa9c0c1e2c 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -1897,26 +1897,13 @@ void snapGridAction(TransInfo *t, float *val, GearsType action) {
 
 
 void snapGrid(TransInfo *t, float *val) {
-	int invert;
 	GearsType action;
 
 	// Only do something if using Snap to Grid
 	if (t->tsnap.mode != SCE_SNAP_MODE_INCREMENT)
 		return;
 
-	if(t->mode==TFM_ROTATION || t->mode==TFM_WARP || t->mode==TFM_TILT || t->mode==TFM_TRACKBALL || t->mode==TFM_BONE_ROLL)
-		invert = U.flag & USER_AUTOROTGRID;
-	else if(t->mode==TFM_RESIZE || t->mode==TFM_SHEAR || t->mode==TFM_BONESIZE || t->mode==TFM_SHRINKFATTEN || t->mode==TFM_CURVE_SHRINKFATTEN)
-		invert = U.flag & USER_AUTOSIZEGRID;
-	else
-		invert = U.flag & USER_AUTOGRABGRID;
-
-	if(invert) {
-		action = activeSnap(t) ? NO_GEARS: BIG_GEARS;
-	}
-	else {
-		action = activeSnap(t) ? BIG_GEARS : NO_GEARS;
-	}
+	action = activeSnap(t) ? BIG_GEARS : NO_GEARS;
 
 	if (action == BIG_GEARS && (t->modifiers & MOD_PRECISION)) {
 		action = SMALL_GEARS;
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h
index 80e240d703c..b6e52699340 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -390,9 +390,9 @@ extern UserDef U; /* from blenkernel blender.c */
 
 /* flag */
 #define USER_AUTOSAVE			(1 << 0)
-#define USER_AUTOGRABGRID		(1 << 1)
-#define USER_AUTOROTGRID		(1 << 2)
-#define USER_AUTOSIZEGRID		(1 << 3)
+#define USER_AUTOGRABGRID		(1 << 1)	/* deprecated */
+#define USER_AUTOROTGRID		(1 << 2)	/* deprecated */
+#define USER_AUTOSIZEGRID		(1 << 3)	/* deprecated */
 #define USER_SCENEGLOBAL		(1 << 4)
 #define USER_TRACKBALL			(1 << 5)
 #define USER_DUPLILINK			(1 << 6)
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 4f44ebbce42..d6aec37d6fb 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -2124,19 +2124,6 @@ static void rna_def_userdef_edit(BlenderRNA *brna)
 	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_GLOBALUNDO);
 	RNA_def_property_ui_text(prop, "Global Undo", "Global undo works by keeping a full copy of the file itself in memory, so takes extra memory");
 
-	/* snapping */
-	prop= RNA_def_property(srna, "snap_translate", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_AUTOGRABGRID);
-	RNA_def_property_ui_text(prop, "Enable Translation Snap", "Snap objects and sub-objects to grid units when moving");
-
-	prop= RNA_def_property(srna, "snap_rotate", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_AUTOROTGRID);
-	RNA_def_property_ui_text(prop, "Enable Rotation Snap", "Snap objects and sub-objects to grid units when rotating");
-
-	prop= RNA_def_property(srna, "snap_scale", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_AUTOSIZEGRID);
-	RNA_def_property_ui_text(prop, "Enable Scaling Snap", "Snap objects and sub-objects to grid units when scaling");
-	
 	/* auto keyframing */	
 	prop= RNA_def_property(srna, "use_auto_keying", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "autokey_mode", AUTOKEY_ON);