Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2006-01-29 18:15:34 +0300
committerKent Mein <mein@cs.umn.edu>2006-01-29 18:15:34 +0300
commite544723e639f93473bfaf2f07179f33bb5daf6d6 (patch)
treec117dc86e6cbb0b56fbc6fb81d14d74406306e2f /source/blender/renderconverter/intern/convertBlenderScene.c
parent160239ea73c8b82d1fa98933c36f4ac892fe9ece (diff)
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
Diffstat (limited to 'source/blender/renderconverter/intern/convertBlenderScene.c')
-rw-r--r--source/blender/renderconverter/intern/convertBlenderScene.c5
1 files changed, 3 insertions, 2 deletions
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.