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:
authorThomas Dinges <blender@dingto.org>2014-01-27 22:58:54 +0400
committerThomas Dinges <blender@dingto.org>2014-01-27 22:59:06 +0400
commite983ed6aaa4d32326163ffc281d7ad4ade617674 (patch)
tree69e65eb5a7b1797bbece55c40648ccef4c824286 /release
parent15e08394a0650ff1837124eea303340cc87d7879 (diff)
Revert the removal of Blender Internal Edge rendering, after artist feedback.
This reverts commit fb91a602c756f3ee5a122efa1862b8be7604186b.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_render.py7
-rw-r--r--release/scripts/startup/bl_ui/properties_render_layer.py1
2 files changed, 8 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index 5c2e3e5d0c7..41516a74c9f 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -317,6 +317,13 @@ class RENDER_PT_post_processing(RenderButtonsPanel, Panel):
sub.row().prop(rd, "field_order", expand=True)
sub.prop(rd, "use_fields_still", text="Still")
+ col = split.column()
+ col.prop(rd, "use_edge_enhance")
+ sub = col.column()
+ sub.active = rd.use_edge_enhance
+ sub.prop(rd, "edge_threshold", text="Threshold", slider=True)
+ sub.prop(rd, "edge_color", text="")
+
class RENDER_PT_stamp(RenderButtonsPanel, Panel):
bl_label = "Stamp"
diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_render_layer.py
index 133b4f986aa..4444d8728eb 100644
--- a/release/scripts/startup/bl_ui/properties_render_layer.py
+++ b/release/scripts/startup/bl_ui/properties_render_layer.py
@@ -109,6 +109,7 @@ class RENDERLAYER_PT_layer_options(RenderLayerButtonsPanel, Panel):
col = split.column()
col.prop(rl, "use_sky")
+ col.prop(rl, "use_edge_enhance")
col.prop(rl, "use_strand")
if bpy.app.build_options.freestyle:
row = col.row()