diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-11-20 06:35:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-20 06:35:41 +0300 |
| commit | 8ba6236c48a8fae3627e04f2df51f8f3851ba948 (patch) | |
| tree | 94ecb287c21d24dd2fd95b8c0dfb54735756d0c3 /source/blender/blenkernel/intern/linestyle.c | |
| parent | 14e5711d69548afaadadce198968b9c501e5f745 (diff) | |
Fix crash w/ NULL freestyle config
Diffstat (limited to 'source/blender/blenkernel/intern/linestyle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/linestyle.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index f07cb97d476..4ac7de2bb99 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -217,10 +217,11 @@ FreestyleLineStyle *BKE_linestyle_active_from_scene(Scene *scene) { SceneRenderLayer *actsrl = BLI_findlink(&scene->r.layers, scene->r.actlay); FreestyleConfig *config = &actsrl->freestyleConfig; - FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(config); - - if (lineset) { - return lineset->linestyle; + if (config) { + FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(config); + if (lineset) { + return lineset->linestyle; + } } return NULL; } |