[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60756] trunk/blender/source/blender/ editors/space_outliner/outliner_tree.c: Fix for #37070: LineStyle appears in Outliner by default though Freestyle is not enabled.

[Tamito Kajiyama]

Revision: 60756
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60756
Author:   kjym3
Date:     2013-10-14 19:57:16 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
Fix for #37070: LineStyle appears in Outliner by default though Freestyle is not enabled.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_outliner/outliner_tree.c

Modified: trunk/blender/source/blender/editors/space_outliner/outliner_tree.c
===================================================================
--- trunk/blender/source/blender/editors/space_outliner/outliner_tree.c	2013-10-14 19:53:28 UTC (rev 60755)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tree.c	2013-10-14 19:57:16 UTC (rev 60756)
@@ -429,7 +429,8 @@
 	
 	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