diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-08-18 11:54:26 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-08-18 11:57:17 +0400 |
commit | 05cb63ecf75095444c8ce2bc11b3067bb207d8bf (patch) | |
tree | 3f15576b5d73f07660b73ce5f16b9ba5070cce99 /source/blender/makesrna | |
parent | 8986883de1d64262ee6ea9250ad392726b75307a (diff) |
Fix for line style shader/texture types showing up in the node editor when Freestyle is disabled at compile time.
Problem report by Thomas Dinges on IRC, thanks!
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 1bc6cff2e8b..5ca38aae9bc 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -3411,14 +3411,18 @@ static void rna_def_space_node(BlenderRNA *brna) {SNODE_TEX_OBJECT, "OBJECT", ICON_OBJECT_DATA, "Object", "Edit texture nodes from Object"}, {SNODE_TEX_WORLD, "WORLD", ICON_WORLD_DATA, "World", "Edit texture nodes from World"}, {SNODE_TEX_BRUSH, "BRUSH", ICON_BRUSH_DATA, "Brush", "Edit texture nodes from Brush"}, +#ifdef WITH_FREESTYLE {SNODE_TEX_LINESTYLE, "LINESTYLE", ICON_LINE_DATA, "Line Style", "Edit texture nodes from Line Style"}, +#endif {0, NULL, 0, NULL, NULL} }; static EnumPropertyItem shader_type_items[] = { {SNODE_SHADER_OBJECT, "OBJECT", ICON_OBJECT_DATA, "Object", "Edit shader nodes from Object"}, {SNODE_SHADER_WORLD, "WORLD", ICON_WORLD_DATA, "World", "Edit shader nodes from World"}, +#ifdef WITH_FREESTYLE {SNODE_SHADER_LINESTYLE, "LINESTYLE", ICON_LINE_DATA, "Line Style", "Edit shader nodes from Line Style"}, +#endif {0, NULL, 0, NULL, NULL} }; |