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/blenkernel/intern/node.c | |
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/blenkernel/intern/node.c')
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index db65e8c30d4..38dd36b9e6a 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -44,6 +44,7 @@ #include "DNA_scene_types.h" #include "DNA_texture_types.h" #include "DNA_world_types.h" +#include "DNA_linestyle_types.h" #include "BLI_string.h" #include "BLI_math.h" @@ -1866,6 +1867,7 @@ bNodeTree *ntreeFromID(ID *id) case ID_WO: return ((World *)id)->nodetree; case ID_TE: return ((Tex *)id)->nodetree; case ID_SCE: return ((Scene *)id)->nodetree; + case ID_LS: return ((FreestyleLineStyle *)id)->nodetree; default: return NULL; } } @@ -3661,6 +3663,7 @@ void BKE_node_tree_iter_init(struct NodeTreeIterStore *ntreeiter, struct Main *b ntreeiter->tex = bmain->tex.first; ntreeiter->lamp = bmain->lamp.first; ntreeiter->world = bmain->world.first; + ntreeiter->linestyle = bmain->linestyle.first; } bool BKE_node_tree_iter_step(struct NodeTreeIterStore *ntreeiter, bNodeTree **r_nodetree, struct ID **r_id) @@ -3695,6 +3698,11 @@ bool BKE_node_tree_iter_step(struct NodeTreeIterStore *ntreeiter, *r_id = (ID *)ntreeiter->world; ntreeiter->world = ntreeiter->world->id.next; } + else if (ntreeiter->linestyle) { + *r_nodetree = ntreeiter->linestyle->nodetree; + *r_id = (ID *)ntreeiter->linestyle; + ntreeiter->linestyle = ntreeiter->linestyle->id.next; + } else { return false; } |