From 7dd605e3612b2ce454fb9deec2529a6432190494 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Mon, 21 Jul 2014 18:45:39 +0900 Subject: Fix for SCENE_OT_freestyle_stroke_material_create not respecting "use_nodes" line style prop. --- source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/freestyle') 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; } -- cgit v1.2.3