diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-10-14 23:57:16 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-10-14 23:57:16 +0400 |
| commit | 7e64342f4399214ecb86e362cd9990ea527364c9 (patch) | |
| tree | 7ba82eef3789e76843e0f145429cf835728ff0a7 /source/blender/editors/space_outliner/outliner_tree.c | |
| parent | 46b807b2318ee03f7a261c6f53d2ad965bf58028 (diff) | |
Fix for #37070: LineStyle appears in Outliner by default though Freestyle is not enabled.
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tree.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_tree.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 |