[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60877] tags/blender-2.69-release/blender/ source/blender/editors/space_outliner: svm merge ^/trunk/ blender -c60756 -c60763

[Brecht Van Lommel]

Revision: 60877
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60877
Author:   blendix
Date:     2013-10-21 13:31:48 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
svm merge ^/trunk/blender -c60756 -c60763

Fix for freestyle line styles showing in the outliner when it's disabled.

Modified Paths:
--------------
    tags/blender-2.69-release/blender/source/blender/editors/space_outliner/outliner_tree.c

Property Changed:
----------------
    tags/blender-2.69-release/blender/source/blender/editors/space_outliner/


Property changes on: tags/blender-2.69-release/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,60105
/trunk/blender/source/blender/editors/space_outliner:60592-60596
   + /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260,60105
/trunk/blender/source/blender/editors/space_outliner:60592-60596,60756,60763

Modified: tags/blender-2.69-release/blender/source/blender/editors/space_outliner/outliner_tree.c
===================================================================
--- tags/blender-2.69-release/blender/source/blender/editors/space_outliner/outliner_tree.c	2013-10-21 11:13:39 UTC (rev 60876)
+++ tags/blender-2.69-release/blender/source/blender/editors/space_outliner/outliner_tree.c	2013-10-21 13:31:48 UTC (rev 60877)
@@ -428,8 +428,9 @@
 		outliner_add_element(soops, lb, sce, te, TSE_ANIM_DATA, 0);
 	
 	outliner_add_element(soops,  lb, sce->world, te, 0, 0);
-	
-	outliner_add_line_styles(soops, lb, sce, te);
+
+	if (STREQ(sce->r.engine, "BLENDER_RENDER") && (sce->r.mode & R_EDGE_FRS))
+		outliner_add_line_styles(soops, lb, sce, te);
 }
 
 // can be inlined if necessary