[Bf-blender-cvs] [bebcd4d] master: Freestyle: hide line styles from a scene in the Outliner when WITH_FREESTYLE build flag is off.

[Tamito Kajiyama]

Commit: bebcd4d5c57af3df76da837c5f2c6f4fb180cd93
Author: Tamito Kajiyama
Date:   Thu May 8 10:00:49 2014 +0900
https://developer.blender.org/rBbebcd4d5c57af3df76da837c5f2c6f4fb180cd93

Freestyle: hide line styles from a scene in the Outliner when WITH_FREESTYLE build flag is off.

The Datablocks display mode still shows line style ID datablocks to keep track of line styles
hidden from user interactions in the Properties window.

===================================================================

M	source/blender/editors/space_outliner/outliner_tree.c

===================================================================

diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index fa1130c..520cd9a 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -379,6 +379,7 @@ static bool outliner_animdata_test(AnimData *adt)
 	return false;
 }
 
+#ifdef WITH_FREESTYLE
 static void outliner_add_line_styles(SpaceOops *soops, ListBase *lb, Scene *sce, TreeElement *te)
 {
 	SceneRenderLayer *srl;
@@ -404,6 +405,7 @@ static void outliner_add_line_styles(SpaceOops *soops, ListBase *lb, Scene *sce,
 		}
 	}
 }
+#endif
 
 static void outliner_add_scene_contents(SpaceOops *soops, ListBase *lb, Scene *sce, TreeElement *te)
 {
@@ -431,8 +433,10 @@ static void outliner_add_scene_contents(SpaceOops *soops, ListBase *lb, Scene *s
 	
 	outliner_add_element(soops,  lb, sce->world, te, 0, 0);
 
+#ifdef WITH_FREESTYLE
 	if (STREQ(sce->r.engine, "BLENDER_RENDER") && (sce->r.mode & R_EDGE_FRS))
 		outliner_add_line_styles(soops, lb, sce, te);
+#endif
 }
 
 // can be inlined if necessary