diff options
author | Hans Goudey <h.goudey@me.com> | 2022-09-05 19:31:39 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2022-09-05 19:31:39 +0300 |
commit | 4380e1f9006f8487e12af6601142c81633f0f476 (patch) | |
tree | c3792de5d298ea04432681db56a15b04c89cbe17 /source/blender/freestyle/intern | |
parent | 456177d8be9ea28d1c5565fbe538435095f5b503 (diff) | |
parent | 63cfc8f9f6d623f33b50c5c07976af2b22845713 (diff) |
Merge branch 'master' into refactor-mesh-remove-pointersrefactor-mesh-remove-pointers
Diffstat (limited to 'source/blender/freestyle/intern')
-rw-r--r-- | source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp index fb51bdab172..0b035a08433 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp @@ -218,12 +218,12 @@ Material *BlenderStrokeRenderer::GetStrokeShader(Main *bmain, break; } } + ma->nodetree = ntree; } else { - ntree = ntreeAddTree(nullptr, "stroke_shader", "ShaderNodeTree"); + ntree = ntreeAddTreeEmbedded(nullptr, &ma->id, "stroke_shader", "ShaderNodeTree"); } - ma->nodetree = ntree; - ma->use_nodes = 1; + ma->use_nodes = true; ma->blend_method = MA_BM_HASHED; bNode *input_attr_color = nodeAddStaticNode(nullptr, ntree, SH_NODE_ATTRIBUTE); |