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
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-10-15 03:08:45 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2013-10-15 03:08:45 +0400
commitf9f2e2073952cb8abed2eb10bae0d367f7e51e0a (patch)
treef89deed95088dd3820f0f2b99734f6c7a2ff5a0d /source/blender/editors/space_outliner
parent913a542468d21ce2fecd1159c8261829c0fc3fad (diff)
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.
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r--source/blender/editors/space_outliner/outliner_tree.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index de97230362b..a93ed2dc6b0 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -428,8 +428,8 @@ static void outliner_add_scene_contents(SpaceOops *soops, ListBase *lb, Scene *s
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);
}