[Bf-blender-cvs] [8ba6236c48a] blender2.8: Fix crash w/ NULL freestyle config

[Campbell Barton]

Commit: 8ba6236c48a8fae3627e04f2df51f8f3851ba948
Author: Campbell Barton
Date:   Mon Nov 20 14:35:41 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB8ba6236c48a8fae3627e04f2df51f8f3851ba948

Fix crash w/ NULL freestyle config

===================================================================

M	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;
 }