[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59828] trunk/blender/source/blender/ compositor/intern/COM_MemoryBuffer.h: Removed unused variables used only in BLI_assert, this triggers compiler warning in release builds.

Lukas Toenne lukas.toenne at googlemail.com
Thu Sep 5 14:10:50 CEST 2013


Revision: 59828
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59828
Author:   lukastoenne
Date:     2013-09-05 12:10:49 +0000 (Thu, 05 Sep 2013)
Log Message:
-----------
Removed unused variables used only in BLI_assert, this triggers compiler warning in release builds.

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.h

Modified: trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.h
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.h	2013-09-05 11:40:38 UTC (rev 59827)
+++ trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.h	2013-09-05 12:10:49 UTC (rev 59828)
@@ -189,9 +189,8 @@
 
 		BLI_assert(offset >= 0);
 		BLI_assert(offset < this->determineBufferSize() * COM_NUMBER_OF_CHANNELS);
-		bool clip_x = (extend_x == COM_MB_CLIP && (x < m_rect.xmin || x >= m_rect.xmax));
-		bool clip_y = (extend_y == COM_MB_CLIP && (y < m_rect.ymin || y >= m_rect.ymax));
-		BLI_assert(!clip_x && !clip_y);
+		BLI_assert(!(extend_x == COM_MB_CLIP && (x < m_rect.xmin || x >= m_rect.xmax))
+		           && !(extend_y == COM_MB_CLIP && (y < m_rect.ymin || y >= m_rect.ymax)));
 
 #if 0
 		/* always true */




More information about the Bf-blender-cvs mailing list