diff options
author | Ton Roosendaal <ton@blender.org> | 2007-01-28 15:20:07 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2007-01-28 15:20:07 +0300 |
commit | c7718d2bcd644286c7f9ceed0a60118a9cd81589 (patch) | |
tree | f8762401bb14b70858a12be1f011662ed636f3b1 /source/blender/src/sculptmode.c | |
parent | c45e05706200a39c08519bd5b86392cc5ddbc699 (diff) |
- 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
Diffstat (limited to 'source/blender/src/sculptmode.c')
-rw-r--r-- | source/blender/src/sculptmode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/src/sculptmode.c b/source/blender/src/sculptmode.c index b0559b8fbe7..97d47b079ca 100644 --- a/source/blender/src/sculptmode.c +++ b/source/blender/src/sculptmode.c @@ -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); |