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>2014-07-16 17:25:37 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-08-12 05:10:27 +0400
commit722951ecebc24063bd6d8e59ded6a61e05bd4b46 (patch)
treeb4f96a0fb6c30f0be861f4b7eb7d87ab30bb2163 /source/blender/freestyle/intern
parent833353b25e56a36bd890b80e48a313d48f43d549 (diff)
Freestyle: Added "blend_type" and "use_clamp" options to the Output Line Style shader node.
Diffstat (limited to 'source/blender/freestyle/intern')
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 86bba6fd329..6587680ce5a 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -296,6 +296,9 @@ Material* BlenderStrokeRenderer::GetStrokeShader(bContext *C, Main *bmain, Frees
bNodeSocket *outsock;
bNodeLink *link;
+ color_mix_rgb->custom1 = output_linestyle->custom1; // blend_type
+ color_mix_rgb->custom2 = output_linestyle->custom2; // use_clamp
+
outsock = (bNodeSocket *)BLI_findlink(&output_linestyle->inputs, 0); // Color
tosock = (bNodeSocket *)BLI_findlink(&color_mix_rgb->inputs, 2); // Color2
link = (bNodeLink *)BLI_findptr(&ntree->links, outsock, offsetof(bNodeLink, tosock));