From 8ba6236c48a8fae3627e04f2df51f8f3851ba948 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 20 Nov 2017 14:35:41 +1100
Subject: Fix crash w/ NULL freestyle config

---
 source/blender/blenkernel/intern/linestyle.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'source/blender/blenkernel/intern/linestyle.c')

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;
 }
-- 
cgit v1.2.3