[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37898] branches/cycles/source: Cycles: fix build with game engine enabled.

[Brecht Van Lommel]

Revision: 37898
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37898
Author:   blendix
Date:     2011-06-28 12:21:58 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
Cycles: fix build with game engine enabled.

Modified Paths:
--------------
    branches/cycles/source/blender/editors/include/ED_uvedit.h
    branches/cycles/source/blender/editors/space_view3d/drawmesh.c
    branches/cycles/source/gameengine/Ketsji/BL_BlenderShader.cpp
    
branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp

Modified: branches/cycles/source/blender/editors/include/ED_uvedit.h
===================================================================
--- branches/cycles/source/blender/editors/include/ED_uvedit.h  2011-06-28 
12:18:17 UTC (rev 37897)
+++ branches/cycles/source/blender/editors/include/ED_uvedit.h  2011-06-28 
12:21:58 UTC (rev 37898)
@@ -39,6 +39,7 @@
 struct MTFace;
 struct Object;
 struct Scene;
+struct SpaceImage;
 struct bContext;
 struct wmKeyConfig;
 

Modified: branches/cycles/source/blender/editors/space_view3d/drawmesh.c
===================================================================
--- branches/cycles/source/blender/editors/space_view3d/drawmesh.c      
2011-06-28 12:18:17 UTC (rev 37897)
+++ branches/cycles/source/blender/editors/space_view3d/drawmesh.c      
2011-06-28 12:21:58 UTC (rev 37898)
@@ -71,6 +71,7 @@
 #include "GPU_draw.h"
 
 #include "ED_mesh.h"
+#include "ED_uvedit.h"
 
 #include "view3d_intern.h"     // own include
 

Modified: branches/cycles/source/gameengine/Ketsji/BL_BlenderShader.cpp
===================================================================
--- branches/cycles/source/gameengine/Ketsji/BL_BlenderShader.cpp       
2011-06-28 12:18:17 UTC (rev 37897)
+++ branches/cycles/source/gameengine/Ketsji/BL_BlenderShader.cpp       
2011-06-28 12:21:58 UTC (rev 37898)
@@ -4,6 +4,7 @@
 
 #include "DNA_customdata_types.h"
 #include "DNA_material_types.h"
+#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "BKE_global.h"
@@ -40,7 +41,7 @@
 
 void BL_BlenderShader::ReloadMaterial()
 {
-       mGPUMat = (mMat) ? GPU_material_from_blender(mBlenderScene, mMat, 
OB_RENDERED) : NULL;
+       mGPUMat = (mMat) ? GPU_material_from_blender(mBlenderScene, mMat, 
OB_RENDER) : NULL;
 }
 
 void BL_BlenderShader::SetProg(bool enable, double time)

Modified: 
branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
===================================================================
--- 
branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
  2011-06-28 12:18:17 UTC (rev 37897)
+++ 
branches/cycles/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
  2011-06-28 12:21:58 UTC (rev 37898)
@@ -51,6 +51,7 @@
 #include "DNA_image_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_material_types.h"
+#include "DNA_object_types.h"
 #include "DNA_scene_types.h"
 
 #include "BKE_DerivedMesh.h"
@@ -840,7 +841,7 @@
                        Material* blmat = current_polymat->GetBlenderMaterial();
                        Scene* blscene = current_polymat->GetBlenderScene();
                        if (!wireframe && blscene && blmat)
-                               
GPU_material_vertex_attributes(GPU_material_from_blender(blscene, blmat, 
OB_RENDERED), &current_gpu_attribs);
+                               
GPU_material_vertex_attributes(GPU_material_from_blender(blscene, blmat, 
OB_RENDER), &current_gpu_attribs);
                        else
                                memset(&current_gpu_attribs, 0, 
sizeof(current_gpu_attribs));
                        // DM draw can mess up blending mode, restore at the end

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs