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, 5 insertions, 3 deletions

diff --git a/source/blender/include/BSE_headerbuttons.h b/source/blender/include/BSE_headerbuttons.h
index 4f2179cca28..d5369692638 100644
--- a/source/blender/include/BSE_headerbuttons.h
+++ b/source/blender/include/BSE_headerbuttons.h
@@ -40,7 +40,7 @@ struct SpaceIpo;
 struct Ipo;
 
 /* these used to be in blender/src/headerbuttons.c: */
-#define SPACEICONMAX  15 /* See release/datafiles/blenderbuttons */
+#define SPACEICONMAX  16 /* See release/datafiles/blenderbuttons */
 #define XIC 20
 #define YIC 20
 
@@ -89,8 +89,9 @@ void seq_buttons(void);
 void sound_buttons(void);
 void text_buttons(void);
 void script_buttons(void);
-void time_buttons(struct ScrArea *sa);
 void view3d_buttons(void);
+void time_buttons(struct ScrArea *sa);
+void node_buttons(struct ScrArea *sa);
 
 void do_global_buttons(unsigned short event);
 void do_global_buttons2(short event);
@@ -108,9 +109,10 @@ void do_oops_buttons(short event);
 void do_seq_buttons(short event);
 void do_sound_buttons(unsigned short event);
 void do_text_buttons(unsigned short event);
-void do_time_buttons(struct ScrArea *sa, unsigned short event);
 void do_script_buttons(unsigned short event);
 void do_view3d_buttons(short event); 
+void do_time_buttons(struct ScrArea *sa, unsigned short event);
+void do_node_buttons(struct ScrArea *sa, unsigned short event); 
 
 void do_headerbuttons(short event);