[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61102] trunk/blender/source/gameengine/ Rasterizer: * More fixes to make scons / Windows happy.

Thomas Dinges blender at dingto.org
Mon Nov 4 23:33:02 CET 2013


Revision: 61102
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61102
Author:   dingto
Date:     2013-11-04 22:33:02 +0000 (Mon, 04 Nov 2013)
Log Message:
-----------
* More fixes to make scons / Windows happy. :) 

Modified Paths:
--------------
    trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
    trunk/blender/source/gameengine/Rasterizer/RAS_Polygon.h

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript	2013-11-04 22:22:54 UTC (rev 61101)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript	2013-11-04 22:33:02 UTC (rev 61102)
@@ -18,9 +18,12 @@
     '#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)

Modified: trunk/blender/source/gameengine/Rasterizer/RAS_Polygon.h
===================================================================
--- trunk/blender/source/gameengine/Rasterizer/RAS_Polygon.h	2013-11-04 22:22:54 UTC (rev 61101)
+++ trunk/blender/source/gameengine/Rasterizer/RAS_Polygon.h	2013-11-04 22:33:02 UTC (rev 61102)
@@ -36,8 +36,6 @@
 class RAS_MaterialBucket;
 class RAS_TexVert;
 
-using namespace std;
-
 #ifdef WITH_CXX_GUARDEDALLOC
 #include "MEM_guardedalloc.h"
 #endif




More information about the Bf-blender-cvs mailing list