diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-04-17 19:47:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-04-17 19:47:00 +0400 |
| commit | 392e1da1790d252f0f156379c1d5507959a4e17a (patch) | |
| tree | 815d4055f1baada104f9843b05cd87b60b5c0fa2 /source/gameengine/Ketsji/BL_Shader.cpp | |
| parent | 3afd8d6cc859255d0b52081fbee91b6c6a012b4c (diff) | |
bugfix and cleanup
- BGE Shader.setSampler(name, index): index range check was wrong.
- Compositor check for an invalid channel was incorrect.
- getting the center of selected verts used an uninitalized z axis.
- do_init_render_material() used && rather then & when testing for MA_TRANSP.
- weight paint activate flipped bone used && rather then & for flag checking.
Diffstat (limited to 'source/gameengine/Ketsji/BL_Shader.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/BL_Shader.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/BL_Shader.cpp b/source/gameengine/Ketsji/BL_Shader.cpp index 55be606378d..8edefe7ac2d 100644 --- a/source/gameengine/Ketsji/BL_Shader.cpp +++ b/source/gameengine/Ketsji/BL_Shader.cpp @@ -884,7 +884,7 @@ KX_PYMETHODDEF_DOC( BL_Shader, setSampler, "setSampler(name, index)" ) { int loc = GetUniformLocation(uniform); if(loc != -1) { - if(index >= MAXTEX && index < 0) + if(index >= MAXTEX || index < 0) spit("Invalid texture sample index: " << index); #ifdef SORT_UNIFORMS |