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 --- source/blender/blenkernel/BKE_writeavi.h | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'source/blender/blenkernel/BKE_writeavi.h') 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 } -- cgit v1.2.3