diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-13 18:01:28 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-13 18:01:28 +0400 |
| commit | 3dd02efe2c1ae76c9d69f10352585dfdaf40afc8 (patch) | |
| tree | 0b4c9cb5b4f6de16529c49c6a7e6a5da852f1909 /source/blender | |
| parent | 29165fc373aace1cef7b070112ebfc4301ef8f95 (diff) | |
fix for incorrectly checking for break in r47826
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/compositor/operations/COM_GlareGhostOperation.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/compositor/operations/COM_GlareGhostOperation.cpp b/source/blender/compositor/operations/COM_GlareGhostOperation.cpp index defbd76fa51..d3ecee2a508 100644 --- a/source/blender/compositor/operations/COM_GlareGhostOperation.cpp +++ b/source/blender/compositor/operations/COM_GlareGhostOperation.cpp @@ -74,7 +74,7 @@ void GlareGhostOperation::generateGlare(float *data, MemoryBuffer *inputTile, No sc = 2.13; isc = -0.97; - for (y = 0; y < gbuf->getHeight() & (!breaked); y++) { + for (y = 0; y < gbuf->getHeight() && (!breaked); y++) { v = (float)(y + 0.5f) / (float)gbuf->getHeight(); for (x = 0; x < gbuf->getWidth(); x++) { u = (float)(x + 0.5f) / (float)gbuf->getWidth(); @@ -94,8 +94,8 @@ void GlareGhostOperation::generateGlare(float *data, MemoryBuffer *inputTile, No } memset(tbuf1->getBuffer(), 0, tbuf1->getWidth() * tbuf1->getHeight() * COM_NUMBER_OF_CHANNELS * sizeof(float)); - for (n = 1; n < settings->iter & (!breaked); n++) { - for (y = 0; y < gbuf->getHeight() & (!breaked); y++) { + for (n = 1; n < settings->iter && (!breaked); n++) { + for (y = 0; y < gbuf->getHeight() && (!breaked); y++) { v = (float)(y + 0.5f) / (float)gbuf->getHeight(); for (x = 0; x < gbuf->getWidth(); x++) { u = (float)(x + 0.5f) / (float)gbuf->getWidth(); |