archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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

Browse Source 
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
This commit is contained in:
Kent Mein
2006-01-29 15:15:34 +00:00
parent 160239ea73
commit e544723e63
11 changed files with 25 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
intern/bsp/intern/BSP_CSGMesh_CFIterator.h
View File

@@ -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

3
intern/bsp/intern/CSG_BooleanOps.cpp
View File

@@ -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;

5
intern/string/intern/STR_String.cpp
View File

@@ -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
-------------------------------------------------------------------------------------------------*/

17
source/blender/blenkernel/BKE_writeavi.h
View File

@@ -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
}

5
source/blender/renderconverter/intern/convertBlenderScene.c
View File

@@ -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.

1
source/blender/src/blenderbuttons.c
View File

@@ -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,
};

3
source/blender/src/editgroup.c
View File

@@ -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();
}
}
}

3
source/blender/src/meshtools.c
View File

@@ -831,4 +831,5 @@ EditVert *editmesh_get_x_mirror_vert(Object *ob, float *co)
if(poinval != -1)
return (EditVert *)(poinval);
return NULL;
}
}

13
source/blender/src/writeavicodec.c
View File

@@ -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) {

6
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
View File

@@ -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()
{

10
source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
View File

@@ -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