Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-05-08 05:00:49 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-05-08 05:02:50 +0400
commitbebcd4d5c57af3df76da837c5f2c6f4fb180cd93 (patch)
tree588693fbf1f129f0c2baa68c0aba7ae022e0ea25 /source
parentd964bad67b37b64746d42ca01c03f4e404008dde (diff)
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.
Diffstat (limited to 'source')
-rw-r--r--source/blender/editors/space_outliner/outliner_tree.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index fa1130cd9d7..520cd9a544d 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