[Bf-blender-cvs] [05cb63e] master: Fix for line style shader/texture types showing up in the node editor when Freestyle is disabled at compile time.
Tamito Kajiyama
noreply at git.blender.org
Mon Aug 18 09:58:00 CEST 2014
Commit: 05cb63ecf75095444c8ce2bc11b3067bb207d8bf
Author: Tamito Kajiyama
Date: Mon Aug 18 16:54:26 2014 +0900
Branches: master
https://developer.blender.org/rB05cb63ecf75095444c8ce2bc11b3067bb207d8bf
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!
===================================================================
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 1bc6cff..5ca38aa 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}
};
More information about the Bf-blender-cvs
mailing list