[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60763] trunk/blender/source/blender/ editors/space_outliner/outliner_tree.c: A follow-up to Bug #37070: LineStyle appears in Outliner by default though Freestyle is not enabled.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Tue Oct 15 01:08:46 CEST 2013


Revision: 60763
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60763
Author:   kjym3
Date:     2013-10-14 23:08:45 +0000 (Mon, 14 Oct 2013)
Log Message:
-----------
A follow-up to Bug #37070: LineStyle appears in Outliner by default though Freestyle is not enabled.
Line style data blocks are shown in the outliner only when the Blender Internal is used.

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 21:41:03 UTC (rev 60762)
+++ trunk/blender/source/blender/editors/space_outliner/outliner_tree.c	2013-10-14 23:08:45 UTC (rev 60763)
@@ -428,8 +428,8 @@
 		outliner_add_element(soops, lb, sce, te, TSE_ANIM_DATA, 0);
 	
 	outliner_add_element(soops,  lb, sce->world, te, 0, 0);
-	
-	if (sce->r.mode & R_EDGE_FRS)
+
+	if (STREQ(sce->r.engine, "BLENDER_RENDER") && (sce->r.mode & R_EDGE_FRS))
 		outliner_add_line_styles(soops, lb, sce, te);
 }
 




More information about the Bf-blender-cvs mailing list