[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47830] trunk/blender/source/blender/ compositor/operations/COM_GlareGhostOperation.cpp: fix for incorrectly checking for break in r47826
Campbell Barton
ideasman42 at gmail.com
Wed Jun 13 16:01:30 CEST 2012
Revision: 47830
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47830
Author: campbellbarton
Date: 2012-06-13 14:01:28 +0000 (Wed, 13 Jun 2012)
Log Message:
-----------
fix for incorrectly checking for break in r47826
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47826
Modified Paths:
--------------
trunk/blender/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
Modified: trunk/blender/source/blender/compositor/operations/COM_GlareGhostOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_GlareGhostOperation.cpp 2012-06-13 13:59:46 UTC (rev 47829)
+++ trunk/blender/source/blender/compositor/operations/COM_GlareGhostOperation.cpp 2012-06-13 14:01:28 UTC (rev 47830)
@@ -74,7 +74,7 @@
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 @@
}
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();
More information about the Bf-blender-cvs
mailing list