[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48271] trunk/blender/source/blender/ compositor/operations/COM_NormalizeOperation.cpp: fix for #31914
Jeroen Bakker
j.bakker at atmind.nl
Mon Jun 25 14:59:04 CEST 2012
Revision: 48271
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48271
Author: jbakker
Date: 2012-06-25 12:58:53 +0000 (Mon, 25 Jun 2012)
Log Message:
-----------
fix for #31914
Modified Paths:
--------------
trunk/blender/source/blender/compositor/operations/COM_NormalizeOperation.cpp
Modified: trunk/blender/source/blender/compositor/operations/COM_NormalizeOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_NormalizeOperation.cpp 2012-06-25 12:13:21 UTC (rev 48270)
+++ trunk/blender/source/blender/compositor/operations/COM_NormalizeOperation.cpp 2012-06-25 12:58:53 UTC (rev 48271)
@@ -58,7 +58,8 @@
bool NormalizeOperation::determineDependingAreaOfInterest(rcti *input, ReadBufferOperation *readOperation, rcti *output)
{
rcti imageInput;
-
+ if (this->cachedInstance) return false;
+
NodeOperation *operation = getInputOperation(0);
imageInput.xmax = operation->getWidth();
imageInput.xmin = 0;
@@ -92,8 +93,12 @@
float value;
while (p--) {
value = bc[0];
- maxv = max(value, maxv);
- minv = min(value, minv);
+ if ((value > maxv) && (value <= BLENDER_ZMAX)) {
+ maxv = value;
+ }
+ if ((value < minv) && (value >= -BLENDER_ZMAX)) {
+ minv = value;
+ }
bc += 4;
}
More information about the Bf-blender-cvs
mailing list