diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-07-21 13:45:39 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-08-12 05:10:46 +0400 |
| commit | 7dd605e3612b2ce454fb9deec2529a6432190494 (patch) | |
| tree | b458d6c05cae84b613cf4808c65994ae663588e2 /source/blender/freestyle/intern | |
| parent | 7852fc8bcd8c8b010aea56fc680d5c8372383b73 (diff) | |
Fix for SCENE_OT_freestyle_stroke_material_create not respecting "use_nodes" line style prop.
Diffstat (limited to 'source/blender/freestyle/intern')
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index bba4f58b922..3c24bb7051c 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -737,7 +737,8 @@ void FRS_move_active_lineset_down(FreestyleConfig *config) Material *FRS_create_stroke_material(bContext *C, Main *bmain, struct FreestyleLineStyle *linestyle) { - Material *ma = BlenderStrokeRenderer::GetStrokeShader(C, bmain, linestyle->nodetree, true); + bNodeTree *nt = (linestyle->use_nodes) ? linestyle->nodetree : NULL; + Material *ma = BlenderStrokeRenderer::GetStrokeShader(C, bmain, nt, true); ma->id.us = 0; return ma; } |