kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

* More fixes to make scons / Windows happy. :)

Browse Source
This commit is contained in:
Thomas Dinges 2013-11-04 22:33:02 +00:00
parent 93de84f267
commit cbbf6bfe25
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
View File

@ -18,9 +18,12 @@ incs = [
'#source/blender/gpu', '#source/blender/gpu',
'#source/blender/makesdna', '#source/blender/makesdna',
'#source/gameengine/BlenderRoutines', '#source/gameengine/BlenderRoutines',
'#source/gameengine/Expressions',
'#source/gameengine/GameLogic',
'#source/gameengine/Physics/common',
'#source/gameengine/Rasterizer', '#source/gameengine/Rasterizer',
'#source/gameengine/SceneGraph', '#source/gameengine/SceneGraph',
'#source/blender/gameengine/Ketsji', '#source/gameengine/Ketsji',
env['BF_OPENGL_INC'], env['BF_OPENGL_INC'],
] ]
incs = ' '.join(incs) incs = ' '.join(incs)

2
source/gameengine/Rasterizer/RAS_Polygon.h
View File

@ -36,8 +36,6 @@ class RAS_DisplayArray;
class RAS_MaterialBucket; class RAS_MaterialBucket;
class RAS_TexVert; class RAS_TexVert;
using namespace std;
#ifdef WITH_CXX_GUARDEDALLOC #ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"
#endif #endif