From 7e64342f4399214ecb86e362cd9990ea527364c9 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Mon, 14 Oct 2013 19:57:16 +0000 Subject: Fix for #37070: LineStyle appears in Outliner by default though Freestyle is not enabled. --- source/blender/editors/space_outliner/outliner_tree.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/space_outliner') diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c index 10890a305fb..de97230362b 100644 --- a/source/blender/editors/space_outliner/outliner_tree.c +++ b/source/blender/editors/space_outliner/outliner_tree.c @@ -429,7 +429,8 @@ static void outliner_add_scene_contents(SpaceOops *soops, ListBase *lb, Scene *s outliner_add_element(soops, lb, sce->world, te, 0, 0); - outliner_add_line_styles(soops, lb, sce, te); + if (sce->r.mode & R_EDGE_FRS) + outliner_add_line_styles(soops, lb, sce, te); } // can be inlined if necessary -- cgit v1.2.3