diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2006-01-15 14:34:55 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2006-01-15 14:34:55 +0300 |
| commit | 6f3e5931052727358201e6648bd6011d99085414 (patch) | |
| tree | b3893dc8bacb90a02dc9c9ed251b590a429496fe /source/gameengine/Ketsji/KX_BlenderMaterial.h | |
| parent | e35f73cd00f878706cd953fc3514e0b68b1b6f65 (diff) | |
more graphics patches from Snailrose,
remove constraint fixed,
Bullet timestep now subdivides Blender game engine timestep, so it runs 60 hertz,
SphereShape reverted to old style, so no support for non-uniform scaled spheres for now,
Diffstat (limited to 'source/gameengine/Ketsji/KX_BlenderMaterial.h')
| -rw-r--r-- | source/gameengine/Ketsji/KX_BlenderMaterial.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h index 57348144890..1af4b2550a9 100644 --- a/source/gameengine/Ketsji/KX_BlenderMaterial.h +++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h @@ -72,6 +72,7 @@ public: KX_PYMETHOD_DOC( KX_BlenderMaterial, getTexture ); KX_PYMETHOD_DOC( KX_BlenderMaterial, setTexture ); + KX_PYMETHOD_DOC( KX_BlenderMaterial, setBlending ); // -------------------------------- // pre calculate to avoid pops/lag at startup virtual void OnConstruction( ); @@ -82,6 +83,9 @@ private: KX_Scene* mScene; BL_Texture mTextures[MAXTEX]; // texture array + bool mUserDefBlend; + unsigned int mBlendFunc[2]; + // message centers void setTexData( bool enable ); void setShaderData( bool enable ); @@ -90,7 +94,6 @@ private: void setEnvMap( bool val, bool cube=false); void setTexMatrixData(int i); bool setDefaultBlending(); - bool setBlending( int ind, bool enable=false ); void setObjectMatrixData(int i); // cleanup stuff |