Scons build system. MSVC 7.1 in a moment.

14 files changed, 42 insertions, 15 deletions

diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c b/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
index 5bf193b604c..c12f61f76ca 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_alphaOver.c
@@ -130,4 +130,6 @@ bNodeType cmp_node_alphaover= {
 	/* execfunc    */	node_composit_exec_alphaover,
    /* butfunc     */ node_composit_buts_alphaover
 	
-};
\ No newline at end of file
+};
+
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_blur.c b/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
index 200262501d1..64ac956c917 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_blur.c
@@ -660,4 +660,6 @@ bNodeType cmp_node_blur= {
    /* execfunc    */	node_composit_exec_blur,
    /* butfunc     */ node_composit_buts_blur,
                      node_composit_init_blur
-};
\ No newline at end of file
+};
+
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c b/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
index 662c62a9a59..7109b8733d5 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_chromaMatte.c
@@ -213,4 +213,6 @@ bNodeType cmp_node_chroma={
    /* execfunc    */       node_composit_exec_chroma_matte,
    /* butfunc     */       node_composit_buts_chroma_matte,
                            node_composit_init_chroma_matte
-};
\ No newline at end of file
+};
+
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_flip.c b/source/blender/nodes/intern/CMP_nodes/CMP_flip.c
index b80983de5e7..d9f752158db 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_flip.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_flip.c
@@ -109,4 +109,6 @@ bNodeType cmp_node_flip= {
 	/* storage     */	"",
 	/* execfunc    */	node_composit_exec_flip,
    /* butfunc     */ node_composit_buts_flip
-};
\ No newline at end of file
+};
+
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_image.c b/source/blender/nodes/intern/CMP_nodes/CMP_image.c
index 563643a66f8..e96fe6479a2 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_image.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_image.c
@@ -636,4 +636,6 @@ bNodeType cmp_node_rlayers= {
    /* butfunc     */ node_composit_buts_renderlayers,
                      NULL
 
-};
\ No newline at end of file
+};
+
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c b/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
index 6963260abb2..65d3653e36d 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_outputFile.c
@@ -169,4 +169,6 @@ bNodeType cmp_node_output_file= {
    /* butfunc     */ node_composit_buts_output_file,
                      node_composit_init_output_file
 	
-};
\ No newline at end of file
+};
+
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c b/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
index 89972119abf..3a1a9183ba9 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_sepcombYCCA.c
@@ -182,4 +182,6 @@ bNodeType cmp_node_combycca= {
 	/* storage     */	"",
 	/* execfunc    */	node_composit_exec_combycca,
    /* butfunc     */ NULL
-};
\ No newline at end of file
+};
+
+
diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c b/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
index ef96f357f2f..b2658619d50 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_vecBlur.c
@@ -125,5 +125,6 @@ bNodeType cmp_node_vecblur= {
 	/* output sock */	cmp_node_vecblur_out,
 	/* storage     */	"NodeBlurData",
    /* execfunc    */	node_composit_exec_vecblur,
-   /* butfunc     */ node_composit_buts_vecblur	
+   /* butfunc     */ node_composit_buts_vecblur,
+                     node_composit_init_vecblur	
 };
diff --git a/source/blender/nodes/intern/CMP_util.c b/source/blender/nodes/intern/CMP_util.c
index 3423513e466..e60b9ddcce3 100644
--- a/source/blender/nodes/intern/CMP_util.c
+++ b/source/blender/nodes/intern/CMP_util.c
@@ -29,6 +29,9 @@
 
 #include "CMP_util.h"
 
+
+
+
 CompBuf *alloc_compbuf(int sizex, int sizey, int type, int alloc)
 {
 	CompBuf *cbuf= MEM_callocN(sizeof(CompBuf), "compbuf");
@@ -573,4 +576,4 @@ void gamma_correct_compbuf(CompBuf *img, int inversed)
          if(drect[2]>0.0f) drect[2]*= drect[2]; else drect[2]= 0.0f;
       }
    }
-}
\ No newline at end of file
+}
diff --git a/source/blender/nodes/intern/CMP_util.h b/source/blender/nodes/intern/CMP_util.h
index e277ef68b6a..fd132ab7d49 100644
--- a/source/blender/nodes/intern/CMP_util.h
+++ b/source/blender/nodes/intern/CMP_util.h
@@ -59,8 +59,9 @@
 #include "BKE_material.h"
 #include "BKE_texture.h"
 #include "BKE_utildefines.h"
+#include "BKE_library.h"
 
-#include "..\CMP_node.h"
+#include "../CMP_node.h"
 
 
 #include "BIF_gl.h"
@@ -88,6 +89,7 @@
 
 #include "RE_pipeline.h"
 #include "RE_shader_ext.h"
+#include "RE_render_ext.h"
 
 #include "butspace.h"
 #include "blendef.h"
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_camera.c b/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
index 1e494f5cd30..5f547b346e6 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
@@ -27,7 +27,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#include "..\SHD_util.h"
+#include "../SHD_util.h"
 
 /* **************** CAMERA INFO  ******************** */
 static bNodeSocketType sh_node_camera_out[]= {
diff --git a/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c b/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
index 1ebeb4de20b..1a21f08ee55 100644
--- a/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
+++ b/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
@@ -28,7 +28,7 @@
  */
 
 
-#include "..\SHD_util.h"
+#include "../SHD_util.h"
 
 
 /* **************** VECTOR MATH ******************** */ 
diff --git a/source/blender/nodes/intern/SHD_util.c b/source/blender/nodes/intern/SHD_util.c
index 177a0eed3f3..8401c302386 100644
--- a/source/blender/nodes/intern/SHD_util.c
+++ b/source/blender/nodes/intern/SHD_util.c
@@ -30,6 +30,9 @@
 #include "SHD_util.h"
 
 
+
+
+
 /* ****** */
 
 void nodestack_get_vec(float *in, short type_in, bNodeStack *ns)
diff --git a/source/blender/nodes/intern/SHD_util.h b/source/blender/nodes/intern/SHD_util.h
index f07302ad27d..5ab7e3a7031 100644
--- a/source/blender/nodes/intern/SHD_util.h
+++ b/source/blender/nodes/intern/SHD_util.h
@@ -30,6 +30,9 @@
 #ifndef SHD_NODE_UTIL_H_
 #define SHD_NODE_UTIL_H_
 
+#include <math.h>
+#include <string.h>
+
 #include "MEM_guardedalloc.h"
 
 #include "DNA_action_types.h"
@@ -54,8 +57,9 @@
 #include "BKE_material.h"
 #include "BKE_texture.h"
 #include "BKE_utildefines.h"
+#include "BKE_library.h"
 
-#include "..\SHD_node.h"
+#include "../SHD_node.h"
 
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
@@ -112,6 +116,6 @@ typedef struct ShaderCallData {
 
 
 extern void node_ID_title_cb(void *node_v, void *unused_v);
+void nodestack_get_vec(float *in, short type_in, bNodeStack *ns);
 
-
-#endif
\ No newline at end of file
+#endif