Orange:

- Sunday merger with bf-blender

- Foundations for new Node editor in Blender, generic framework that can
  be used for Material/Texture, Compositing, Logic or maybe even Sequencer.
  Note: this doesn't do anything yet, nor save! Is just to get this nice
  in CVS now. :)

1 files changed, 3 insertions, 1 deletions

diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c
index d05904c74a8..c2551bd265a 100644
--- a/source/blender/src/headerbuttons.c
+++ b/source/blender/src/headerbuttons.c
@@ -208,6 +208,7 @@ char *windowtype_pup(void)
 	strcat(string, "|User Preferences %x7"); //213
 	strcat(string, "|Outliner %x3"); //232
 	strcat(string, "|Buttons Window %x4"); //251
+	strcat(string, "|Node Editor %x16");
 
 	strcat(string, "|%l"); //254
 
@@ -1979,7 +1980,8 @@ void do_headerbuttons(short event)
 	else if(event<700) do_sound_buttons(event);
 	else if(event<750) do_action_buttons(event);
 	else if(event<800) do_time_buttons(curarea, event);
-	else if(event<900) do_nla_buttons(event);
+	else if(event<850) do_nla_buttons(event);
+	else if(event<900) do_node_buttons(curarea, event);
 	else if(event>=REDRAWVIEW3D) allqueue(event, 0);
 }