[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51610] trunk/blender/source/blender: fix for build error in own commit with non gcc compilers.

Campbell Barton ideasman42 at gmail.com
Thu Oct 25 09:53:15 CEST 2012


Revision: 51610
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51610
Author:   campbellbarton
Date:     2012-10-25 07:53:11 +0000 (Thu, 25 Oct 2012)
Log Message:
-----------
fix for build error in own commit with non gcc compilers. (and remove invalid comment)

Modified Paths:
--------------
    trunk/blender/source/blender/blenlib/BLI_utildefines.h
    trunk/blender/source/blender/bmesh/intern/bmesh_mods.c

Modified: trunk/blender/source/blender/blenlib/BLI_utildefines.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_utildefines.h	2012-10-25 04:58:27 UTC (rev 51609)
+++ trunk/blender/source/blender/blenlib/BLI_utildefines.h	2012-10-25 07:53:11 UTC (rev 51610)
@@ -352,7 +352,7 @@
 #  define BLI_STATIC_ASSERT(a, msg) _Static_assert(a, msg);
 #else
    /* TODO msvc, clang */
-#  define BLI_STATIC_ASSERT(a, msg) (void)0
+#  define BLI_STATIC_ASSERT(a, msg)
 #endif
 
 /* hints for branch pradiction, only use in code that runs a _lot_ where */

Modified: trunk/blender/source/blender/bmesh/intern/bmesh_mods.c
===================================================================
--- trunk/blender/source/blender/bmesh/intern/bmesh_mods.c	2012-10-25 04:58:27 UTC (rev 51609)
+++ trunk/blender/source/blender/bmesh/intern/bmesh_mods.c	2012-10-25 07:53:11 UTC (rev 51610)
@@ -470,9 +470,6 @@
  * both collapse a vertex and return a new edge.
  * Except this takes a factor and merges custom data.
  *
- *  BMESH_TODO:
- *    Insert error checking for KV valance.
- *
  * \param bm The bmesh
  * \param ke The edge to collapse
  * \param kv The vertex  to collapse into the edge




More information about the Bf-blender-cvs mailing list