[Bf-blender-cvs] [ad37ccbc324] master: Fix crash reading deg_point_cache_transform.blend test, saved with 2.8.

Brecht Van Lommel noreply at git.blender.org
Thu Feb 15 18:03:28 CET 2018


Commit: ad37ccbc32446fef542faf696a54a8135b2e3d26
Author: Brecht Van Lommel
Date:   Thu Feb 15 16:25:37 2018 +0100
Branches: master
https://developer.blender.org/rBad37ccbc32446fef542faf696a54a8135b2e3d26

Fix crash reading deg_point_cache_transform.blend test, saved with 2.8.

In general 2.8 files may not be readable in master, but might as well fix
this case so all the lib/tests can be opened still.

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

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

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

diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c
index 0465c5d54f7..878f38256b4 100644
--- a/source/blender/blenkernel/intern/linestyle.c
+++ b/source/blender/blenkernel/intern/linestyle.c
@@ -216,6 +216,10 @@ 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);
+	if (!actsrl) {
+		return NULL;
+	}
+
 	FreestyleConfig *config = &actsrl->freestyleConfig;
 	FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(config);



More information about the Bf-blender-cvs mailing list