diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-07-23 16:45:28 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-23 16:45:28 +0400 |
commit | a5bc02194345de1eb21f843b73ce24799677aea1 (patch) | |
tree | e1e62bf23e5b407dfa92c32ff264c58400ad7f1f /source/blender/blenkernel/intern/material.c | |
parent | 769c566672aa820c40a57f77cb250885458b2e70 (diff) |
code cleanup: remove unused material/texture naming functions.
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
-rw-r--r-- | source/blender/blenkernel/intern/material.c | 49 |
1 files changed, 0 insertions, 49 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index e14b51975c8..300beae1078 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1148,55 +1148,6 @@ void material_drivers_update(Scene *scene, Material *ma, float ctime) 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) { |