diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-01-05 20:20:40 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-01-05 20:20:40 +0300 |
| commit | 3aae2de7734e13c8e98e7dc85483d1ba8c461f50 (patch) | |
| tree | 86e0b5f7ee6132f35e84348f3b6cba0cbebbb923 /source/blender/blenkernel/intern/texture.c | |
| parent | 42a006629fe9f16180dfec78acbdc45472ad21b0 (diff) | |
2.5
Cleanup:
- Makefile was using confused link order, now all intern and
and extern libs are put after blender and editor libs
- Old stubs.c in editors/screen removed. The leftover python
stubs calls were moved to python module.
Diffstat (limited to 'source/blender/blenkernel/intern/texture.c')
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index cdbd2afb421..70ced6e59d6 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -732,7 +732,9 @@ void make_local_texture(Tex *tex) void autotexname(Tex *tex) { - extern char texstr[20][12]; /* buttons.c */ + char texstr[20][12]= {"None" , "Clouds" , "Wood", "Marble", "Magic" , "Blend", + "Stucci", "Noise" , "Image", "Plugin", "EnvMap" , "Musgrave", + "Voronoi", "DistNoise", "", "", "", "", "", ""}; Image *ima; char di[FILE_MAXDIR], fi[FILE_MAXFILE]; |