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:
authorCampbell Barton <ideasman42@gmail.com>2018-06-17 18:01:43 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-17 18:03:10 +0300
commit4be752a93cf37700668c604296f37ea08248f13b (patch)
tree0f838c87eaa6bf289b76f232e6b1571a28a55cba /source/gameengine/Ketsji/KX_BlenderMaterial.h
parent5513da65b24a3ce77b1709acea841475115f3a7a (diff)
Cleanup: trailing space in source/gameengine/
Diffstat (limited to 'source/gameengine/Ketsji/KX_BlenderMaterial.h')
-rw-r--r--source/gameengine/Ketsji/KX_BlenderMaterial.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/source/gameengine/Ketsji/KX_BlenderMaterial.h b/source/gameengine/Ketsji/KX_BlenderMaterial.h
index a3d10c0a89d..02b60913b91 100644
--- a/source/gameengine/Ketsji/KX_BlenderMaterial.h
+++ b/source/gameengine/Ketsji/KX_BlenderMaterial.h
@@ -55,30 +55,30 @@ public:
return (void*) this;
}
- virtual
+ virtual
bool Activate(
- RAS_IRasterizer* rasty,
+ RAS_IRasterizer* rasty,
TCachingInfo& cachingInfo
) const;
-
- virtual
+
+ virtual
void ActivateMeshSlot(
- const RAS_MeshSlot & ms,
- RAS_IRasterizer* rasty
+ const RAS_MeshSlot & ms,
+ RAS_IRasterizer* rasty
) const;
-
+
void ActivateMat(
RAS_IRasterizer* rasty,
TCachingInfo& cachingInfo
)const;
void ActivatShaders(
- RAS_IRasterizer* rasty,
+ RAS_IRasterizer* rasty,
TCachingInfo& cachingInfo
)const;
void ActivateBlenderShaders(
- RAS_IRasterizer* rasty,
+ RAS_IRasterizer* rasty,
TCachingInfo& cachingInfo
)const;
@@ -86,11 +86,11 @@ public:
Image* GetBlenderImage() const;
MTexPoly *GetMTexPoly() const;
unsigned int* GetMCol() const;
- BL_Texture * getTex (unsigned int idx) {
- return (idx < MAXTEX) ? mTextures + idx : NULL;
+ BL_Texture * getTex (unsigned int idx) {
+ return (idx < MAXTEX) ? mTextures + idx : NULL;
}
- Image * getImage (unsigned int idx) {
- return (idx < MAXTEX && mMaterial) ? mMaterial->img[idx] : NULL;
+ Image * getImage (unsigned int idx) {
+ return (idx < MAXTEX && mMaterial) ? mMaterial->img[idx] : NULL;
}
unsigned int* getBlendFunc() {
return mBlendFunc;
@@ -101,7 +101,7 @@ public:
MT_Scalar hard, MT_Scalar spec,
MT_Scalar ref, MT_Scalar emit, MT_Scalar alpha
);
-
+
virtual void Replace_IScene(SCA_IScene *val);
BL_Material *GetBLMaterial();