From e544723e639f93473bfaf2f07179f33bb5daf6d6 Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Sun, 29 Jan 2006 15:15:34 +0000 Subject: 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 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 --- intern/bsp/intern/BSP_CSGMesh_CFIterator.h | 1 - intern/bsp/intern/CSG_BooleanOps.cpp | 3 ++- intern/string/intern/STR_String.cpp | 5 +---- 3 files changed, 3 insertions(+), 6 deletions(-) (limited to 'intern') 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 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 #include #include +#include #include "STR_String.h" -#ifdef HAVE_CONFIG_H -#include -#endif - /*------------------------------------------------------------------------------------------------- Construction / destruction -------------------------------------------------------------------------------------------------*/ -- cgit v1.2.3