diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-25 06:41:30 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-25 06:41:30 +0400 |
| commit | e1a54214bbed9b32e1aee0e849ae654c495afa80 (patch) | |
| tree | a95eaa2b98e7baa7e91fa34db46571e531b1cfb3 /source/gameengine/VideoTexture/ImageMix.cpp | |
| parent | 153eea5f23e2f0060d89a701ddd9b48085fc6070 (diff) | |
code cleanup:
- remove unused defines.
- quiet some shadow warnings.
- bevel, ifdef out some asserts that are too common.
- style
Diffstat (limited to 'source/gameengine/VideoTexture/ImageMix.cpp')
| -rw-r--r-- | source/gameengine/VideoTexture/ImageMix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/VideoTexture/ImageMix.cpp b/source/gameengine/VideoTexture/ImageMix.cpp index 27c4fed6fe6..ee6e16d0a86 100644 --- a/source/gameengine/VideoTexture/ImageMix.cpp +++ b/source/gameengine/VideoTexture/ImageMix.cpp @@ -69,7 +69,7 @@ bool ImageMix::setWeight (const char * id, short weight) ExceptionID ImageSizesNotMatch; -ExpDesc ImageSizesNotMatchDesc (ImageSizesNotMatch, "Image sizes of sources are different"); +ExpDesc ImageSizesNotMatchDesc(ImageSizesNotMatch, "Image sizes of sources are different"); // calculate image from sources and set its availability void ImageMix::calcImage (unsigned int texId, double ts) |