diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-04-29 19:56:26 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-04-29 19:56:26 +0400 |
| commit | d6eeceb83d06a82f14301b8204e320cb396b6db5 (patch) | |
| tree | 9e2b27431019e7a98c8dded199b64703b837bd49 /source | |
| parent | 813352d6774394305e711664ceafcaff13b18d77 (diff) | |
Fix #1205
Array with 'auto' names for textures didn't have the new names yet
(musgrave, voronoi, distnoise)
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/BKE_bad_level_calls.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/bad_level_call_stubs/stubs.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 2 | ||||
| -rw-r--r-- | source/blender/src/butspace.c | 6 |
4 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/blenkernel/BKE_bad_level_calls.h b/source/blender/blenkernel/BKE_bad_level_calls.h index 8f893a67afb..45d590487c6 100644 --- a/source/blender/blenkernel/BKE_bad_level_calls.h +++ b/source/blender/blenkernel/BKE_bad_level_calls.h @@ -133,7 +133,7 @@ struct EnvMap *RE_copy_envmap(struct EnvMap *env); void RE_free_envmapdata(struct EnvMap *env); int RE_envmaptex(struct Tex *tex, float *texvec, float *dxt, float *dyt); void RE_calc_R_ref(void); -extern char texstr[15][8]; /* buttons.c */ +extern char texstr[20][12]; /* buttons.c */ /* memory for O is declared in the render module... */ #include "BKE_osa_types.h" diff --git a/source/blender/blenkernel/bad_level_call_stubs/stubs.c b/source/blender/blenkernel/bad_level_call_stubs/stubs.c index 7e695109dba..b095f87cb7e 100644 --- a/source/blender/blenkernel/bad_level_call_stubs/stubs.c +++ b/source/blender/blenkernel/bad_level_call_stubs/stubs.c @@ -204,7 +204,7 @@ int RE_envmaptex(struct Tex *tex, float *texvec, float *dxt, float *dyt){ } void RE_calc_R_ref(void){} -char texstr[15][8]; /* buttons.c */ +char texstr[20][12]; /* buttons.c */ Osa O; /* editsca.c */ diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index a1dc9dec3d0..44e16684f15 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -584,7 +584,7 @@ void make_local_texture(Tex *tex) void autotexname(Tex *tex) { -/* extern char texstr[15][8]; *//* buttons.c, already in bad lev calls*/ +/* extern char texstr[20][12]; *//* buttons.c, already in bad lev calls*/ Image *ima; char di[FILE_MAXDIR], fi[FILE_MAXFILE]; diff --git a/source/blender/src/butspace.c b/source/blender/src/butspace.c index 625c6330da0..9edf5c60abe 100644 --- a/source/blender/src/butspace.c +++ b/source/blender/src/butspace.c @@ -84,9 +84,9 @@ short bgpicmode=0, near=1000, far=1000; MTex emptytex; MTex mtexcopybuf; -char texstr[15][8]= {"None" , "Clouds" , "Wood", "Marble", "Magic" , "Blend", - "Stucci", "Noise" , "Image", "Plugin", "EnvMap" , "", - "" , "" , ""}; +char texstr[20][12]= {"None" , "Clouds" , "Wood", "Marble", "Magic" , "Blend", + "Stucci", "Noise" , "Image", "Plugin", "EnvMap" , "Musgrave", + "Voronoi", "DistNoise", "", "", "", "", "", ""}; /* ---------------------------------------------------------------------- */ void test_idbutton_cb(void *namev, void *arg2_unused) |