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. :)

7 files changed, 53 insertions, 7 deletions

diff --git a/source/blender/include/BIF_interface.h b/source/blender/include/BIF_interface.h
index aa3b873abd2..bae8bfd685b 100644
--- a/source/blender/include/BIF_interface.h
+++ b/source/blender/include/BIF_interface.h
@@ -300,6 +300,9 @@ extern int uiAlignPanelStep(struct ScrArea *sa, float fac);
 extern void uiPanelControl(int);
 extern void uiSetPanelHandler(int);
 
+extern void uiDrawBoxShadow(unsigned char alpha, float minx, float miny, float maxx, float maxy);
+extern void *uiSetCurFont_ext(float aspect);
+
 void shade_buttons_change_3d(void);
 
 #endif /*  BIF_INTERFACE_H */
diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h
index b9b1d1f63bf..d026d61b16f 100644
--- a/source/blender/include/BIF_resources.h
+++ b/source/blender/include/BIF_resources.h
@@ -50,7 +50,7 @@ typedef enum {
 	ICON_NLA,
 	ICON_SCRIPTWIN,
 	ICON_TIME,
-	ICON_SPACE1,
+	ICON_NODE,
 	ICON_SPACE2,
 	ICON_SPACE3,
 	ICON_SPACE4,
@@ -91,7 +91,7 @@ typedef enum {
 	ICON_MAYBE_ITS_A_LASSO,
 	ICON_BLANK1,	/* ATTENTION, someone decided to use this throughout blender
 	                   and didn't care to neither rename it nor update the PNG */
-	ICON_BLANK2,
+	ICON_VERSE,
 	ICON_MOD_BOOLEAN,
 	ICON_ARMATURE,
 	ICON_PAUSE,
diff --git a/source/blender/include/BIF_spacetypes.h b/source/blender/include/BIF_spacetypes.h
index 0b07be60129..e825acf676f 100644
--- a/source/blender/include/BIF_spacetypes.h
+++ b/source/blender/include/BIF_spacetypes.h
@@ -62,4 +62,5 @@ SpaceType *spacetext_get_type		(void);
 SpaceType *spacescript_get_type		(void);
 SpaceType *spaceview3d_get_type		(void);
 SpaceType *spacetime_get_type		(void);
+SpaceType *spacenode_get_type		(void);
 
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);
 
diff --git a/source/blender/include/BSE_node.h b/source/blender/include/BSE_node.h
new file mode 100644
index 00000000000..cd159f9e448
--- /dev/null
+++ b/source/blender/include/BSE_node.h
@@ -0,0 +1,36 @@
+/**
+ * $Id:
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your opt ion) any later version. 
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2005 Blender Foundation.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * ***** END GPL BLOCK *****
+ */
+
+#ifndef BSE_NODE_H
+#define BSE_NODE_H
+
+
+
+#endif
+
diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h
index c79370513fa..5963d5e3e14 100644
--- a/source/blender/include/blendef.h
+++ b/source/blender/include/blendef.h
@@ -370,10 +370,13 @@
 #define B_TL_NEXTKEY	755
 #define B_TL_STOP		756
 
-/* NLA: 801-900 */
+/* NLA: 801-850 */
 #define B_NLAHOME		801
 
-/* FREE 900 - 999 */
+/* NODE: 851-900 */
+#define B_NODEHOME		851
+
+/* FREE 901 - 999 */
 
 
 #define B_NOTHING		-1
diff --git a/source/blender/include/mydevice.h b/source/blender/include/mydevice.h
index bc0ed319ed7..8db7d7ce194 100644
--- a/source/blender/include/mydevice.h
+++ b/source/blender/include/mydevice.h
@@ -251,6 +251,7 @@
 #define ONLOAD_SCRIPT		0x4035
 #define SCREEN_HANDLER		0x4036
 #define REDRAWANIM			0x4037
+#define REDRAWNODE			0x4038
 
 #endif	/* !__MYDEVICE_H__ */