[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60606] trunk/blender/source/blender: remove toolsettings (unused for a long time).

[Campbell Barton]

Revision: 60606
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60606
Author:   campbellbarton
Date:     2013-10-08 13:07:09 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
remove toolsettings (unused for a long time).

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/scene.c
    trunk/blender/source/blender/blenloader/intern/versioning_legacy.c
    trunk/blender/source/blender/makesdna/DNA_scene_types.h

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2013-10-08 12:52:01 UTC (rev 60605)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2013-10-08 13:07:09 UTC (rev 60606)
@@ -493,23 +493,10 @@
 	sce->r.border.ymax = 1.0f;
 	
 	sce->toolsettings = MEM_callocN(sizeof(struct ToolSettings), "Tool Settings Struct");
-	sce->toolsettings->cornertype = 1;
-	sce->toolsettings->degr = 90; 
-	sce->toolsettings->step = 9;
-	sce->toolsettings->turn = 1;
-	sce->toolsettings->extr_offs = 1; 
 	sce->toolsettings->doublimit = 0.001;
-	sce->toolsettings->segments = 32;
-	sce->toolsettings->rings = 32;
-	sce->toolsettings->vertices = 32;
-	sce->toolsettings->uvcalc_radius = 1.0f;
-	sce->toolsettings->uvcalc_cubesize = 1.0f;
-	sce->toolsettings->uvcalc_mapdir = 1;
-	sce->toolsettings->uvcalc_mapalign = 1;
 	sce->toolsettings->uvcalc_margin = 0.001f;
 	sce->toolsettings->unwrapper = 1;
 	sce->toolsettings->select_thresh = 0.01f;
-	sce->toolsettings->jointrilimit = 0.8f;
 
 	sce->toolsettings->selectmode = SCE_SELECT_VERTEX;
 	sce->toolsettings->uv_selectmode = UV_SELECT_VERTEX;

Modified: trunk/blender/source/blender/blenloader/intern/versioning_legacy.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/versioning_legacy.c	2013-10-08 12:52:01 UTC (rev 60605)
+++ trunk/blender/source/blender/blenloader/intern/versioning_legacy.c	2013-10-08 13:07:09 UTC (rev 60606)
@@ -1994,15 +1994,7 @@
 		while (sce) {
 			if (sce->toolsettings == NULL) {
 				sce->toolsettings = MEM_callocN(sizeof(struct ToolSettings), "Tool Settings Struct");
-				sce->toolsettings->cornertype =0;
-				sce->toolsettings->degr = 90;
-				sce->toolsettings->step = 9;
-				sce->toolsettings->turn = 1;
-				sce->toolsettings->extr_offs = 1;
 				sce->toolsettings->doublimit = 0.001f;
-				sce->toolsettings->segments = 32;
-				sce->toolsettings->rings = 32;
-				sce->toolsettings->vertices = 32;
 			}
 			sce = sce->id.next;
 		}
@@ -2149,9 +2141,6 @@
 		}
 
 		for (; sce; sce = sce->id.next) {
-			/* make 'innervert' the default subdivide type, for backwards compat */
-			sce->toolsettings->cornertype = 1;
-
 			if (sce->r.scemode & R_PASSEPARTOUT) {
 				set_passepartout = 1;
 				sce->r.scemode &= ~R_PASSEPARTOUT;
@@ -2238,11 +2227,7 @@
 				ntree_version_241(sce->nodetree);
 
 			/* uv calculation options moved to toolsettings */
-			if (sce->toolsettings->uvcalc_radius == 0.0f) {
-				sce->toolsettings->uvcalc_radius = 1.0f;
-				sce->toolsettings->uvcalc_cubesize = 1.0f;
-				sce->toolsettings->uvcalc_mapdir = 1;
-				sce->toolsettings->uvcalc_mapalign = 1;
+			if (sce->toolsettings->unwrapper == 0) {
 				sce->toolsettings->uvcalc_flag = UVCALC_FILLHOLES;
 				sce->toolsettings->unwrapper = 1;
 			}
@@ -2343,8 +2328,6 @@
 		for (sce = main->scene.first; sce; sce = sce->id.next) {
 			if (sce->toolsettings->select_thresh == 0.0f)
 				sce->toolsettings->select_thresh = 0.01f;
-			if (sce->toolsettings->clean_thresh == 0.0f)
-				sce->toolsettings->clean_thresh = 0.1f;
 
 			if (sce->r.threads == 0) {
 				if (sce->r.mode & R_THREADS)
@@ -2554,14 +2537,6 @@
 				sce->r.bake_flag = R_BAKE_CLEAR;
 			}
 		}
-
-		if (main->subversionfile < 5) {
-			for (sce = main->scene.first; sce; sce = sce->id.next) {
-				/* improved triangle to quad conversion settings */
-				if (sce->toolsettings->jointrilimit == 0.0f)
-					sce->toolsettings->jointrilimit = 0.8f;
-			}
-		}
 	}
 
 	if (main->versionfile <= 243) {

Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h	2013-10-08 12:52:01 UTC (rev 60605)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h	2013-10-08 13:07:09 UTC (rev 60606)
@@ -981,17 +981,6 @@
 	 * paint */
 	float vgroup_weight;
 
-	/* Subdivide Settings */
-	short cornertype;
-	short pad1;
-	/*Triangle to Quad conversion threshold*/
-	float jointrilimit;
-	/* Editmode Tools */
-	float degr; 
-	short step;
-	short turn; 
-	
-	float extr_offs; 	/* extrude offset */
 	float doublimit;	/* remove doubles limit */
 	float normalsize;	/* size of normals */
 	short automerge;
@@ -999,31 +988,22 @@
 	/* Selection Mode for Mesh */
 	short selectmode;
 
-	/* Primitive Settings */
-	/* UV Sphere */
-	short segments;
-	short rings;
-	
-	/* Cylinder - Tube - Circle */
-	short vertices;
-
 	/* UV Calculation */
-	short unwrapper;
-	float uvcalc_radius;
-	float uvcalc_cubesize;
+	char unwrapper;
+	char uvcalc_flag;
+	char uv_flag;
+	char uv_selectmode;
+
 	float uvcalc_margin;
-	short uvcalc_mapdir;
-	short uvcalc_mapalign;
-	short uvcalc_flag;
-	short uv_flag, uv_selectmode;
-	short pad2;
-	
-	/* Grease Pencil */
-	short gpencil_flags;
-	
+
 	/* Auto-IK */
-	short autoik_chainlen;
+	short autoik_chainlen;  /* runtime only */
 
+	/* Grease Pencil */
+	char gpencil_flags;
+
+	char pad[5];
+
 	/* Image Paint (8 byttse aligned please!) */
 	struct ImagePaintSettings imapaint;
 
@@ -1035,16 +1015,13 @@
 
 	/* Select Group Threshold */
 	float select_thresh;
-	
-	/* Graph Editor */
-	float clean_thresh;
 
 	/* Auto-Keying Mode */
 	short autokey_mode, autokey_flag;	/* defines in DNA_userdef_types.h */
 
 	/* Multires */
 	char multires_subdiv_type;
-	char pad3[5];
+	char pad3[1];
 
 	/* Skeleton generation */
 	short skgen_resolution;