[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58541] trunk/blender/source/blender/ blenkernel/intern: code cleanup: remove unused material/ texture naming functions.

[Campbell Barton]

Revision: 58541
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58541
Author:   campbellbarton
Date:     2013-07-23 12:45:28 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
code cleanup: remove unused material/texture naming functions.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/material.c
    trunk/blender/source/blender/blenkernel/intern/texture.c

Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c	2013-07-23 12:18:12 UTC (rev 58540)
+++ trunk/blender/source/blender/blenkernel/intern/material.c	2013-07-23 12:45:28 UTC (rev 58541)
@@ -1148,56 +1148,7 @@
 
 	ma->id.flag &= ~LIB_DOIT;
 }
-	
-/* ****************** */
-#if 0 /* UNUSED */
-static char colname_array[125][20] = {
-"Black", "DarkRed", "HalfRed", "Red", "Red",
-"DarkGreen", "DarkOlive", "Brown", "Chocolate", "OrangeRed",
-"HalfGreen", "GreenOlive", "DryOlive", "Goldenrod", "DarkOrange",
-"LightGreen", "Chartreuse", "YellowGreen", "Yellow", "Gold",
-"Green", "LawnGreen", "GreenYellow", "LightOlive", "Yellow",
-"DarkBlue", "DarkPurple", "HotPink", "VioletPink", "RedPink",
-"SlateGray", "DarkGray", "PalePurple", "IndianRed", "Tomato",
-"SeaGreen", "PaleGreen", "GreenKhaki", "LightBrown", "LightSalmon",
-"SpringGreen", "PaleGreen", "MediumOlive", "YellowBrown", "LightGold",
-"LightGreen", "LightGreen", "LightGreen", "GreenYellow", "PaleYellow",
-"HalfBlue", "DarkSky", "HalfMagenta", "VioletRed", "DeepPink",
-"SteelBlue", "SkyBlue", "Orchid", "LightHotPink", "HotPink",
-"SeaGreen", "SlateGray", "MediumGray", "Burlywood", "LightPink",
-"SpringGreen", "Aquamarine", "PaleGreen", "Khaki", "PaleOrange",
-"SpringGreen", "SeaGreen", "PaleGreen", "PaleWhite", "YellowWhite",
-"LightBlue", "Purple", "MediumOrchid", "Magenta", "Magenta",
-"RoyalBlue", "SlateBlue", "MediumOrchid", "Orchid", "Magenta",
-"DeepSkyBlue", "LightSteelBlue", "LightSkyBlue", "Violet", "LightPink",
-"Cyan", "DarkTurquoise", "SkyBlue", "Gray", "Snow",
-"Mint", "Mint", "Aquamarine", "MintCream", "Ivory",
-"Blue", "Blue", "DarkMagenta", "DarkOrchid", "Magenta",
-"SkyBlue", "RoyalBlue", "LightSlateBlue", "MediumOrchid", "Magenta",
-"DodgerBlue", "SteelBlue", "MediumPurple", "PalePurple", "Plum",
-"DeepSkyBlue", "PaleBlue", "LightSkyBlue", "PalePurple", "Thistle",
-"Cyan", "ColdBlue", "PaleTurquoise", "GhostWhite", "White"
-};
 
-void automatname(Material *ma)
-{
-	int nr, r, g, b;
-	float ref;
-	
-	if (ma == NULL) return;
-	if (ma->mode & MA_SHLESS) ref = 1.0;
-	else ref = ma->ref;
-
-	r = (int)(4.99f * (ref * ma->r));
-	g = (int)(4.99f * (ref * ma->g));
-	b = (int)(4.99f * (ref * ma->b));
-	nr = r + 5 * g + 25 * b;
-	if (nr > 124) nr = 124;
-	new_id(&G.main->mat, (ID *)ma, colname_array[nr]);
-	
-}
-#endif
-
 int object_remove_material_slot(Object *ob)
 {
 	Material *mao, ***matarar;

Modified: trunk/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/texture.c	2013-07-23 12:18:12 UTC (rev 58540)
+++ trunk/blender/source/blender/blenkernel/intern/texture.c	2013-07-23 12:45:28 UTC (rev 58541)
@@ -906,42 +906,6 @@
 	}
 }
 
-/* ------------------------------------------------------------------------- */
-#if 0 /* UNUSED */
-void autotexname(Tex *tex)
-{
-	Main *bmain = G.main;
-	char texstr[20][15] = {"None", "Clouds", "Wood", "Marble", "Magic", "Blend",
-		                   "Stucci", "Noise", "Image", "EnvMap", "Musgrave",
-		                   "Voronoi", "DistNoise", "Point Density", "Voxel Data", "Ocean", "", "", ""};
-	Image *ima;
-	char di[FILE_MAXDIR], fi[FILE_MAXFILE];
-	
-	if (tex) {
-		if (tex->use_nodes) {
-			new_id(&bmain->tex, (ID *)tex, "Noddy");
-		}
-		else if (tex->type == TEX_IMAGE) {
-			ima = tex->ima;
-			if (ima) {
-				BLI_split_file_part(ima->name, fi, sizeof(fi));
-				strcpy(di, "I.");
-				strcat(di, fi);
-				new_id(&bmain->tex, (ID *)tex, di);
-			}
-			else {
-				new_id(&bmain->tex, (ID *)tex, texstr[tex->type]);
-			}
-		}
-		else {
-			new_id(&bmain->tex, (ID *)tex, texstr[tex->type]);
-		}
-	}
-}
-#endif
-
-/* ------------------------------------------------------------------------- */
-
 Tex *give_current_object_texture(Object *ob)
 {
 	Material *ma, *node_ma;