diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-02-25 06:26:02 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-02-25 06:26:02 +0300 |
| commit | 2eb85c01f3e0ea2ba9dd129ae70e8b370953d7b5 (patch) | |
| tree | ba17d1fecef75d17946361484c48be4361406875 /source/gameengine/Ketsji/BL_Shader.cpp | |
| parent | 56e9c87309e155d6710067759c415279848b6bea (diff) | |
remove warnings for the BGE
- variables that shadow vers declared earlier
- Py_Fatal print an error to the stderr
- gcc was complaining about the order of initialized vars (for classes)
- const return values for ints and bools didnt do anything.
- braces for ambiguous if statements
Diffstat (limited to 'source/gameengine/Ketsji/BL_Shader.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Shader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp index 2a4a74d5b90..e8281201d24 100644 --- a/source/gameengine/Ketsji/BL_Shader.cpp +++ b/source/gameengine/Ketsji/BL_Shader.cpp @@ -18,7 +18,7 @@ #define spit(x) std::cout << x << std::endl; #define SORT_UNIFORMS 1 -#define UNIFORM_MAX_LEN sizeof(float)*16 +#define UNIFORM_MAX_LEN (int)sizeof(float)*16 #define MAX_LOG_LEN 262144 // bounds BL_Uniform::BL_Uniform(int data_size) @@ -108,7 +108,7 @@ void BL_Uniform::SetData(int location, int type,bool transpose) #endif } -const bool BL_Shader::Ok()const +bool BL_Shader::Ok()const { return (mShader !=0 && mOk && mUse); } |