- bugfix in Sculpt (irc reported): using a Texture Brush, and then unlink

the texture (in texture buttons) crashed painting. Reason was reading
  a NULL pointer.

- fix for bufix: commit by Ken Hughes accidentally deleted a bugfix
  (yafray render doesn't support bake, and should return)

- tooltip fix
This commit is contained in:
2007-01-28 12:20:07 +00:00
parent c45e057062
commit c7718d2bcd
3 changed files with 11 additions and 5 deletions

View File

@@ -1052,7 +1052,8 @@ float tex_strength(EditData *e, float *point, const float len,const unsigned vin
else if(ss->texrndr) {
const short bsize= sculptmode_brush()->size * 2;
const short half= sculptmode_brush()->size;
const float rot= to_rad(*get_tex_angle());
const float *ang= get_tex_angle();
const float rot= ang?to_rad(*ang):0.0f;
int px, py;
unsigned i, *p;
RenderInfo *ri= ss->texrndr;
@@ -1512,8 +1513,9 @@ void sculptmode_propset_header()
val= sculptmode_brush()->strength;
}
else if(pd->mode == PropsetTexRot) {
float *ang= get_tex_angle();
name= "Texture Angle";
val= *get_tex_angle();
val= ang?*get_tex_angle():0.0f;
}
sprintf(str, "Brush %s: %d", name, val);
headerprint(str);