diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-10-18 13:45:21 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2013-10-18 13:45:21 +0400 |
commit | 9afddac7275843280cf820b665fd5a2d22e83958 (patch) | |
tree | 1c47e006a971a34887ccc57c655fc7231ef06e87 /source/blender/editors/render/render_shading.c | |
parent | bae2b9dea308ea50af24cbc47bd67ce6ea823c90 (diff) |
Fix for wrong active render layer after copying hr scene
Also fix crash for files which could have been saved with
wrong active render layer.
Diffstat (limited to 'source/blender/editors/render/render_shading.c')
-rw-r--r-- | source/blender/editors/render/render_shading.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 553a543390f..3ef1f0db647 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -739,6 +739,10 @@ static int freestyle_active_lineset_poll(bContext *C) Scene *scene = CTX_data_scene(C); SceneRenderLayer *srl = BLI_findlink(&scene->r.layers, scene->r.actlay); + if (!srl) { + return FALSE; + } + return BKE_freestyle_lineset_get_active(&srl->freestyleConfig) != NULL; } |