[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40303] branches/cycles/source/blender/ makesrna/intern/rna_nodetree.c: Cycles:

[Thomas Dinges]

Revision: 40303
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40303
Author:   dingto
Date:     2011-09-17 15:27:52 +0000 (Sat, 17 Sep 2011)
Log Message:
-----------
Cycles:
* Fix node tree identifier. MATERIAL > SHADER.
This fixes some of the node buttons not showing up after recent merge. 

Modified Paths:
--------------
    branches/cycles/source/blender/makesrna/intern/rna_nodetree.c

Modified: branches/cycles/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- branches/cycles/source/blender/makesrna/intern/rna_nodetree.c	2011-09-17 15:17:12 UTC (rev 40302)
+++ branches/cycles/source/blender/makesrna/intern/rna_nodetree.c	2011-09-17 15:27:52 UTC (rev 40303)
@@ -58,7 +58,7 @@
 #include "MEM_guardedalloc.h"
 
 EnumPropertyItem nodetree_type_items[] = {
-	{NTREE_SHADER,		"MATERIAL",		ICON_MATERIAL,		"Material",		"Material nodes"	},
+	{NTREE_SHADER,		"SHADER",		ICON_MATERIAL,		"Shader",		"Shader nodes"	},
 	{NTREE_TEXTURE,		"TEXTURE",		ICON_TEXTURE,		"Texture",		"Texture nodes"		},
 	{NTREE_COMPOSIT,	"COMPOSITING",	ICON_RENDERLAYERS,	"Compositing",	"Compositing nodes"	},
 	{0, NULL, 0, NULL, NULL}