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:
authorThomas Dinges <blender@dingto.org>2013-11-05 02:33:02 +0400
committerThomas Dinges <blender@dingto.org>2013-11-05 02:33:02 +0400
commitcbbf6bfe25adc83ec7112c2f8ad5748263f910ab (patch)
tree9068dec4ca6b3bb36cb05b0cef200111f292c8d3 /source/gameengine/Rasterizer
parent93de84f267157c7e8558b2595e0dcdbbd45df7eb (diff)
* More fixes to make scons / Windows happy. :)
Diffstat (limited to 'source/gameengine/Rasterizer')
-rw-r--r--source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript5
-rw-r--r--source/gameengine/Rasterizer/RAS_Polygon.h2
2 files changed, 4 insertions, 3 deletions
diff --git a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
index 6de29e65ac0..0a7417656c6 100644
--- a/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
+++ b/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
@@ -18,9 +18,12 @@ incs = [
'#source/blender/gpu',
'#source/blender/makesdna',
'#source/gameengine/BlenderRoutines',
+ '#source/gameengine/Expressions',
+ '#source/gameengine/GameLogic',
+ '#source/gameengine/Physics/common',
'#source/gameengine/Rasterizer',
'#source/gameengine/SceneGraph',
- '#source/blender/gameengine/Ketsji',
+ '#source/gameengine/Ketsji',
env['BF_OPENGL_INC'],
]
incs = ' '.join(incs)
diff --git a/source/gameengine/Rasterizer/RAS_Polygon.h b/source/gameengine/Rasterizer/RAS_Polygon.h
index 665056c0ccc..b18477a72d2 100644
--- a/source/gameengine/Rasterizer/RAS_Polygon.h
+++ b/source/gameengine/Rasterizer/RAS_Polygon.h
@@ -36,8 +36,6 @@ class RAS_DisplayArray;
class RAS_MaterialBucket;
class RAS_TexVert;
-using namespace std;
-
#ifdef WITH_CXX_GUARDEDALLOC
#include "MEM_guardedalloc.h"
#endif