Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-02-15 18:25:37 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-02-15 20:00:55 +0300
commitad37ccbc32446fef542faf696a54a8135b2e3d26 (patch)
tree684342189b15896d612a96ff545eb99d40322983 /source/blender/blenkernel/intern/linestyle.c
parent4fd3f8db9d723305302600d0421505e2dc7bfb9e (diff)
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.
Diffstat (limited to 'source/blender/blenkernel/intern/linestyle.c')
-rw-r--r--source/blender/blenkernel/intern/linestyle.c4
1 files changed, 4 insertions, 0 deletions
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);