forked from bartvdbraak/blender
Jacques patch to get things compiling on windows.
basically it returns NULL for two functions that had their entire body commented out. Kent
This commit is contained in:
parent
92586e1ee2
commit
d32f4a2851
@ -31,10 +31,6 @@
|
|||||||
|
|
||||||
#include "KX_BlenderRenderTools.h"
|
#include "KX_BlenderRenderTools.h"
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#include <config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
// OpenGL gl.h needs 'windows.h' on windows platforms
|
// OpenGL gl.h needs 'windows.h' on windows platforms
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
@ -442,6 +438,7 @@ RAS_IPolyMaterial* KX_BlenderRenderTools::CreateBlenderPolyMaterial(
|
|||||||
texname,
|
texname,
|
||||||
ba,matname,tile,tilexrep,tileyrep,mode,transparant,zsort, lightlayer
|
ba,matname,tile,tilexrep,tileyrep,mode,transparant,zsort, lightlayer
|
||||||
,bIsTriangle,clientobject,(struct TFace*)tface);*/
|
,bIsTriangle,clientobject,(struct TFace*)tface);*/
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned int KX_BlenderRenderTools::m_numgllights;
|
unsigned int KX_BlenderRenderTools::m_numgllights;
|
||||||
|
@ -30,10 +30,6 @@
|
|||||||
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifdef HAVE_CONFIG_H
|
|
||||||
#include <config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
@ -338,6 +334,7 @@ RAS_IPolyMaterial* GPC_RenderTools::CreateBlenderPolyMaterial(
|
|||||||
/* return new GPC_PolygonMaterial(texname, ba,matname,tile,tilexrep,tileyrep,
|
/* return new GPC_PolygonMaterial(texname, ba,matname,tile,tilexrep,tileyrep,
|
||||||
mode,transparant,zsort,lightlayer,bIsTriangle,clientobject,tface);
|
mode,transparant,zsort,lightlayer,bIsTriangle,clientobject,tface);
|
||||||
*/
|
*/
|
||||||
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user