diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-12-14 13:48:12 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-12-14 13:48:12 +0400 |
| commit | 01fc7a687a19ef2dc8dac43ed9db69da35e3a55a (patch) | |
| tree | dad6bc578350d2bc471a16f69e45ee998af29489 /source/blender/blenkernel/intern/material.c | |
| parent | dda37dbc5c91d109777e396e7c1a819474f19f05 (diff) | |
Code cleanup: Remove "TexFace to Material Convert", from the file menu. This was used for conversion from older 2.5x files. The do_version() code is still there and functioning though.
Diffstat (limited to 'source/blender/blenkernel/intern/material.c')
| -rw-r--r-- | source/blender/blenkernel/intern/material.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index f3dc64a7279..a38fce9da6c 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -1919,7 +1919,7 @@ static void convert_tfacematerial(Main *main, Material *ma) #define MAT_BGE_DISPUTED -99999 -int do_version_tface(Main *main, int fileload) +int do_version_tface(Main *main) { Mesh *me; Material *ma; @@ -1929,6 +1929,9 @@ int do_version_tface(Main *main, int fileload) int a; int flag; int index; + + /* Operator in help menu has been removed for 2.7x */ + int fileload = 1; /* sometimes mesh has no materials but will need a new one. In those * cases we need to ignore the mf->mat_nr and only look at the face @@ -2072,7 +2075,7 @@ int do_version_tface(Main *main, int fileload) if (ma->game.flag == MAT_BGE_DISPUTED) { ma->game.flag = 0; if (fileload) { - printf("Warning: material \"%s\" skipped - to convert old game texface to material go to the Help menu.\n", ma->id.name + 2); + printf("Warning: material \"%s\" skipped.\n", ma->id.name + 2); nowarning = 0; } else { |