Fix some of Stealth Apprent's warnings/errors and some extra little stuff.

here is a quick summary...

Kent

intern/bsp/intern/BSP_CSGMesh_CFIterator.h
removed tri_index (unused variable)

intern/bsp/intern/CSG_BooleanOps.cpp
removed extra ;

intern/string/intern/STR_String.cpp
added <ctype.h>

source/blender/blenkernel/BKE_writeavi.h
moved things around so not doing forward declarations

source/blender/renderconverter/intern/convertBlenderScene.c
changed render.h to render_types.h

source/blender/src/blenderbuttons.c
source/blender/src/editgroup.c
source/blender/src/meshtools.c
added newline

source/gameengine/Ketsji/KX_KetsjiEngine.cpp
commented out include "PIL_time.h" code that requires it is commented out

reading blender/src/writeavicodec.c
(struct keyword to a couple of lines that needed it)
and added:
extern struct Render R;

blender/renderconverter/intern/convertBlenderScene.c
added extern Render R;
added #include "rendercore.h" to get rid of undeclared shade_material_loop
        (Not sure if this is right but it fixes it.
Did not fix this problem, is it alright to just pass NULL here or should we chan
ge it to something else:
        init_render_materials' : too few

gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
removed argument to dHashSpaceCreate
commented out dWorldQuickStep since it does not exist

11 files changed, 25 insertions, 42 deletions

diff --git a/intern/bsp/intern/BSP_CSGMesh_CFIterator.h b/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
index 453e6e20ea7..77ba076885f 100755
--- a/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
+++ b/intern/bsp/intern/BSP_CSGMesh_CFIterator.h
@@ -178,7 +178,6 @@ BSP_CSGMesh_FaceIt_Fill(
 	// assume CSG_IteratorPtr is of the correct type.
 	BSP_CSGMesh_FaceIt * face_it = (BSP_CSGMesh_FaceIt *)it;		
 	// essentially iterating through a triangle fan here.
-	const int tri_index = face_it->face_triangle;
 
 	if (face_it->pos->m_verts.size()>3) {
 		// QUAD
diff --git a/intern/bsp/intern/CSG_BooleanOps.cpp b/intern/bsp/intern/CSG_BooleanOps.cpp
index 6c9fecd88e1..a0b4dc0078d 100755
--- a/intern/bsp/intern/CSG_BooleanOps.cpp
+++ b/intern/bsp/intern/CSG_BooleanOps.cpp
@@ -47,7 +47,8 @@
 #include "../../boolop/extern/BOP_Interface.h"
 #include <iostream>
 using namespace std;
-#include "BSP_MeshPrimitives.h";
+
+#include "BSP_MeshPrimitives.h"
 
 struct BSP_MeshInfo {
 	BSP_CSGMesh *output_mesh;
diff --git a/intern/string/intern/STR_String.cpp b/intern/string/intern/STR_String.cpp
index 0586907d7c5..c243bc28224 100644
--- a/intern/string/intern/STR_String.cpp
+++ b/intern/string/intern/STR_String.cpp
@@ -40,12 +40,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h> 
+#include <ctype.h>
 #include "STR_String.h"
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 /*-------------------------------------------------------------------------------------------------
 	Construction / destruction
 -------------------------------------------------------------------------------------------------*/
diff --git a/source/blender/blenkernel/BKE_writeavi.h b/source/blender/blenkernel/BKE_writeavi.h
index af442600c6b..43036612339 100644
--- a/source/blender/blenkernel/BKE_writeavi.h
+++ b/source/blender/blenkernel/BKE_writeavi.h
@@ -39,24 +39,19 @@ extern "C" {
 
 /* generic blender movie support, could move to own module */
 
-typedef struct bMovieHandle {
-	void (*start_movie)(RenderData *rd, int rectx, int recty);
-	void (*append_movie)(int frame, int *pixels, int rectx, int recty);
-	void (*end_movie)(void);
-} bMovieHandle;
-
-bMovieHandle *BKE_get_movie_handle(int imtype);
-
-
-/* ************** */	
-
 struct RenderData;	
 void start_avi(struct RenderData *rd, int rectx, int recty);
 void end_avi(void);
 void append_avi(int frame, int *pixels, int rectx, int recty);
 void makeavistring (struct RenderData *rd, char *string);
 
+typedef struct bMovieHandle {
+	void (*start_movie)(struct RenderData *rd, int rectx, int recty);
+	void (*append_movie)(int frame, int *pixels, int rectx, int recty);
+	void (*end_movie)(void);
+} bMovieHandle;
 
+bMovieHandle *BKE_get_movie_handle(int imtype);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c
index b11fa7439d8..fae6176983c 100644
--- a/source/blender/renderconverter/intern/convertBlenderScene.c
+++ b/source/blender/renderconverter/intern/convertBlenderScene.c
@@ -90,8 +90,8 @@
 #include "BKE_utildefines.h"
 #include "BKE_world.h"
 
-#include "render.h"
-
+#include "render_types.h"
+#include "rendercore.h"
 #include "RE_renderconverter.h"
 
 #include "BIF_space.h"
@@ -109,6 +109,7 @@
 #include "radio.h"
 #include "YafRay_Api.h"
 
+extern Render R;
 extern void error (char *fmt, ...);  /* defined in BIF_toolbox.h, but we dont need to include the rest */ 
 
 /* yafray: Identity transform 'hack' removed, exporter now transforms vertices back to world.
diff --git a/source/blender/src/blenderbuttons.c b/source/blender/src/blenderbuttons.c
index 78ec3eb4508..806293d2d7b 100644
--- a/source/blender/src/blenderbuttons.c
+++ b/source/blender/src/blenderbuttons.c
@@ -1903,3 +1903,4 @@ char datatoc_blenderbuttons[]= {
  28,156,104, 42, 49, 49,145,240,167,138,  7, 15, 30, 60,120,240,248,117,129,230, 79,  1, 15, 30, 60,120,240,224,193, 11,  0, 30,
  60,120,240,224,193,131,199,175,  0,255,127,  0, 59, 53, 64,122, 27,196,134,227,  0,  0,  0,  0, 73, 69, 78, 68,174, 66, 96,130,
 };
+
diff --git a/source/blender/src/editgroup.c b/source/blender/src/editgroup.c
index 67d6701b13e..b1ae44477f0 100644
--- a/source/blender/src/editgroup.c
+++ b/source/blender/src/editgroup.c
@@ -128,4 +128,5 @@ void group_operation_with_menu(void)
 		if(mode==1 || mode==3) add_selected_to_group(group);
 		else if(mode==2) rem_selected_from_group();
 	}
-}
\ No newline at end of file
+}
+
diff --git a/source/blender/src/meshtools.c b/source/blender/src/meshtools.c
index 3a7df18c584..6be2aeab11e 100644
--- a/source/blender/src/meshtools.c
+++ b/source/blender/src/meshtools.c
@@ -831,4 +831,5 @@ EditVert *editmesh_get_x_mirror_vert(Object *ob, float *co)
 	if(poinval != -1)
 		return (EditVert *)(poinval);
 	return NULL;
-}
\ No newline at end of file
+}
+
diff --git a/source/blender/src/writeavicodec.c b/source/blender/src/writeavicodec.c
index ace6ac8bf25..83b0f466049 100644
--- a/source/blender/src/writeavicodec.c
+++ b/source/blender/src/writeavicodec.c
@@ -33,10 +33,6 @@
  * 
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #if defined(_WIN32) && !defined(FREE_WINDOWS)
 
 #define  INC_OLE2
@@ -73,10 +69,11 @@ static PAVISTREAM psUncompressed = NULL, psCompressed = NULL;
 
 // function definitions
 static void init_bmi(BITMAPINFOHEADER *bmi);
-static void opts_to_acd(AviCodecData *acd);
-static void acd_to_opts(AviCodecData *acd);
+static void opts_to_acd(struct AviCodecData *acd);
+static void acd_to_opts(struct AviCodecData *acd);
 static void free_opts_data();
 static int open_avi_codec_file(char * name);
+extern struct Render R;
 
 ///////////////////////////////////////////////////////////////////////////
 //
@@ -507,7 +504,7 @@ static void init_bmi(BITMAPINFOHEADER *bmi)
 }
 
 
-static void opts_to_acd(AviCodecData *acd)
+static void opts_to_acd(struct AviCodecData *acd)
 {
 	HIC hic;
 	ICINFO icinfo;
@@ -546,7 +543,7 @@ static void opts_to_acd(AviCodecData *acd)
 }
 
 
-static void acd_to_opts(AviCodecData *acd)
+static void acd_to_opts(struct AviCodecData *acd)
 {
 	memset(&opts, 0, sizeof(opts));
 	if (acd) {
diff --git a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
index 41bece58e84..8be153ecb60 100644
--- a/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
+++ b/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
@@ -31,10 +31,6 @@
  * The engine ties all game modules together. 
  */
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifdef WIN32
 #pragma warning (disable : 4786)
 #endif //WIN32
@@ -325,7 +321,7 @@ void KX_KetsjiEngine::EndFrame()
 
 }
 
-#include "PIL_time.h"
+// #include "PIL_time.h"
 
 void KX_KetsjiEngine::NextFrame()
 {
diff --git a/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp b/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
index 9a489a38553..f6382ec775c 100644
--- a/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
+++ b/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
@@ -23,20 +23,14 @@
 #include "PHY_IMotionState.h"
 #include "OdePhysicsController.h"
 
-// Ode
-//#include <ode/config.h>
 #include <ode/ode.h>
 #include <../ode/src/joint.h>
 #include <ode/odemath.h>
 
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 ODEPhysicsEnvironment::ODEPhysicsEnvironment()
 {
 	m_OdeWorld = dWorldCreate();
-	m_OdeSpace = dHashSpaceCreate(0);
+	m_OdeSpace = dHashSpaceCreate();
 	m_OdeContactGroup = dJointGroupCreate (0);
 	dWorldSetCFM (m_OdeWorld,1e-5f);
 
@@ -106,7 +100,7 @@ bool		ODEPhysicsEnvironment::proceedDeltaTime(double  curTime,float timeStep1)
 		
 		//physics integrator + resolver update
 		//dWorldStep (m_OdeWorld,deltaTime);
-		dWorldQuickStep (m_OdeWorld,deltaTime);
+		//dWorldQuickStep (m_OdeWorld,deltaTime);
 		//dWorldID w, dReal stepsize)
 
 		//clear collision points