sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #1205

Browse Source 
Array with 'auto' names for textures didn't have the new names yet
(musgrave, voronoi, distnoise)
This commit is contained in:
Ton Roosendaal 2004-04-29 15:56:26 +00:00
parent 813352d677
commit d6eeceb83d
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_bad_level_calls.h
View File

@ -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"

2
source/blender/blenkernel/bad_level_call_stubs/stubs.c
View File

@ -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 */

2
source/blender/blenkernel/intern/texture.c
View File

@ -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];

6
source/blender/src/butspace.c
View File

@ -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)