diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2006-11-10 20:21:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2006-11-10 20:21:46 +0300 |
| commit | f314a00be16f9b3352425f86cc5a197fb2197367 (patch) | |
| tree | 35b6ee63cade31de3f5bf95e6bdbcdcaa31de7de /source/blender/src/imagepaint.c | |
| parent | 2a0ef5454d36637a7a76b99580ed1ec9eab6b968 (diff) | |
Bugfix for image painting crash on windows as reported on bf-committers.
Diffstat (limited to 'source/blender/src/imagepaint.c')
| -rw-r--r-- | source/blender/src/imagepaint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/imagepaint.c b/source/blender/src/imagepaint.c index f2266d9ac4a..a6b5f1654ef 100644 --- a/source/blender/src/imagepaint.c +++ b/source/blender/src/imagepaint.c @@ -654,7 +654,7 @@ void imagepaint_paint(short mousebutton, short texpaint) time= PIL_check_seconds_timer(); prevmval[0]= mval[0]; prevmval[1]= mval[1]; - s.blend = (td->Active == 2)? BRUSH_BLEND_ERASE_ALPHA: s.brush->blend; + s.blend = (td && td->Active == 2)? BRUSH_BLEND_ERASE_ALPHA: s.brush->blend; imapaint_paint_stroke(&s, painter, texpaint, prevmval, mval, time, pressure); @@ -664,7 +664,7 @@ void imagepaint_paint(short mousebutton, short texpaint) if(td) { td= get_tablet_data(); pressure= (td)? td->Pressure: 1.0f; - s.blend = (td->Active == 2)? BRUSH_BLEND_ERASE_ALPHA: s.brush->blend; + s.blend = (td && td->Active == 2)? BRUSH_BLEND_ERASE_ALPHA: s.brush->blend; } time= PIL_check_seconds_timer(); |