diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-18 17:41:44 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-18 17:41:44 +0400 |
| commit | 687c4b7ee35a6eeca75cbcc64c80436d89b6bedf (patch) | |
| tree | bf81c160ac76007eece2a5ba47f81bff8864f530 /source/blender/editors/sculpt_paint/paint_cursor.c | |
| parent | f00d43ba7fe58cabb7aa889340440cef8e02e4fc (diff) | |
svn merge ^/trunk/blender -c56892 -c56896 -c56898
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_cursor.c')
| -rw-r--r-- | source/blender/editors/sculpt_paint/paint_cursor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c index 8574d6b8a8f..107ff9668f0 100644 --- a/source/blender/editors/sculpt_paint/paint_cursor.c +++ b/source/blender/editors/sculpt_paint/paint_cursor.c @@ -809,7 +809,7 @@ static void paint_draw_cursor(bContext *C, int x, int y, void *UNUSED(unused)) /* TODO: as sculpt and other paint modes are unified, this * special mode of drawing will go away */ - if (vc.obact->sculpt) { + if (vc.obact && vc.obact->sculpt) { float location[3]; int pixel_radius, hit; |