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:
authorMartin Poirier <theeth@yahoo.com>2009-03-13 21:04:38 +0300
committerMartin Poirier <theeth@yahoo.com>2009-03-13 21:04:38 +0300
commit54a55827ecee7f25d6a52255d8a639498a678fa6 (patch)
tree6311657bfab7e75fa59e6828e0381bdcd4ec9eda /source/gameengine/Ketsji/BL_Shader.h
parentdff781c2a8c77f35fefe00b0a561235861d4d053 (diff)
parent39acb4efa4c3f35806f5dc37124ff1028eb18215 (diff)
merging trunk 19093:19274etch-a-ton
Diffstat (limited to 'source/gameengine/Ketsji/BL_Shader.h')
-rw-r--r--source/gameengine/Ketsji/BL_Shader.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/BL_Shader.h b/source/gameengine/Ketsji/BL_Shader.h
index 52cbd0cda51..76acd5513ef 100644
--- a/source/gameengine/Ketsji/BL_Shader.h
+++ b/source/gameengine/Ketsji/BL_Shader.h
@@ -166,7 +166,7 @@ public:
//const BL_Sampler* GetSampler(int i);
void SetSampler(int loc, int unit);
- const bool Ok()const;
+ bool Ok()const;
unsigned int GetProg();
void SetProg(bool enable);
int GetAttribute(){return mAttr;};