[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57964] trunk/blender/source/blender/ compositor/operations/COM_WrapOperation.cpp: Fix deadlock in coordinate wrapping operation with zero dimension
Sergey Sharybin
sergey.vfx at gmail.com
Wed Jul 3 17:33:14 CEST 2013
Revision: 57964
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57964
Author: nazgul
Date: 2013-07-03 15:33:14 +0000 (Wed, 03 Jul 2013)
Log Message:
-----------
Fix deadlock in coordinate wrapping operation with zero dimension
Modified Paths:
--------------
trunk/blender/source/blender/compositor/operations/COM_WrapOperation.cpp
Modified: trunk/blender/source/blender/compositor/operations/COM_WrapOperation.cpp
===================================================================
--- trunk/blender/source/blender/compositor/operations/COM_WrapOperation.cpp 2013-07-03 15:33:11 UTC (rev 57963)
+++ trunk/blender/source/blender/compositor/operations/COM_WrapOperation.cpp 2013-07-03 15:33:14 UTC (rev 57964)
@@ -42,12 +42,14 @@
inline float WrapOperation::getWrappedOriginalXPos(float x)
{
+ if (this->getWidth() == 0) return 0;
while (x < 0) x += this->m_width;
return fmodf(x, this->getWidth());
}
inline float WrapOperation::getWrappedOriginalYPos(float y)
{
+ if (this->getHeight() == 0) return 0;
while (y < 0) y += this->m_height;
return fmodf(y, this->getHeight());
}
More information about the Bf-blender-cvs
mailing list