diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-05-03 13:51:53 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-05-03 13:54:59 +0400 |
| commit | b7f085d9c128f31d576c732c6439b5a71e8922ee (patch) | |
| tree | 8a1fdc2e95470f61d9121b18b125dc272e87d536 /source/blender/nodes | |
| parent | 6ec2d72eca618be05e9bf0723886b10e6d5efa46 (diff) | |
Patch D246: Texture Marks for freestyle strokes, written and contributed by Paolo Acampora.
Reviewers: brecht, kjym3, #freestyle
Reviewed By: brecht, kjym3
Differential Revision: https://developer.blender.org/D246
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/texture/node_texture_tree.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c index 7e9360b271c..882c843f317 100644 --- a/source/blender/nodes/texture/node_texture_tree.c +++ b/source/blender/nodes/texture/node_texture_tree.c @@ -92,7 +92,7 @@ static void texture_get_from_context(const bContext *C, bNodeTreeType *UNUSED(tr } } } - else { + else if (snode->texfrom == SNODE_TEX_BRUSH) { struct Brush *brush = NULL; if (ob && (ob->mode & OB_MODE_SCULPT)) @@ -109,6 +109,17 @@ static void texture_get_from_context(const bContext *C, bNodeTreeType *UNUSED(tr } } } + else if (snode->texfrom == SNODE_TEX_LINESTYLE) { + FreestyleLineStyle *linestyle = CTX_data_linestyle_from_scene(scene); + if (linestyle) { + *r_from = (ID *)linestyle; + tx = give_current_linestyle_texture(linestyle); + if (tx) { + *r_id = &tx->id; + *r_ntree = tx->nodetree; + } + } + } } static void foreach_nodeclass(Scene *UNUSED(scene), void *calldata, bNodeClassCallback func) |