Fix for #37070: LineStyle appears in Outliner by default though Freestyle is not enabled.

2013-10-14 19:57:16 +00:00
parent 46b807b231
commit 7e64342f43
1 changed files with 2 additions and 1 deletions
--- 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