[Bf-blender-cvs] [c0c696b014e] blender2.8: Fix crash accessing line-style

Campbell Barton noreply at git.blender.org
Mon Nov 20 04:27:52 CET 2017


Commit: c0c696b014e3c21b923a2c21fb33a18839a3faa3
Author: Campbell Barton
Date:   Mon Nov 20 14:38:22 2017 +1100
Branches: blender2.8
https://developer.blender.org/rBc0c696b014e3c21b923a2c21fb33a18839a3faa3

Fix crash accessing line-style

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

M	source/blender/blenkernel/intern/linestyle.c

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

diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c
index 4ac7de2bb99..b9131e961b9 100644
--- a/source/blender/blenkernel/intern/linestyle.c
+++ b/source/blender/blenkernel/intern/linestyle.c
@@ -216,8 +216,8 @@ void BKE_linestyle_make_local(struct Main *bmain, FreestyleLineStyle *linestyle,
 FreestyleLineStyle *BKE_linestyle_active_from_scene(Scene *scene)
 {
 	SceneRenderLayer *actsrl = BLI_findlink(&scene->r.layers, scene->r.actlay);
-	FreestyleConfig *config = &actsrl->freestyleConfig;
-	if (config) {
+	if (actsrl) {
+		FreestyleConfig *config = &actsrl->freestyleConfig;
 		FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(config);
 		if (lineset) {
 			return lineset->linestyle;



More information about the Bf-blender-cvs mailing list