Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-10-25 11:53:11 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-10-25 11:53:11 +0400
commit95ddd19d1385cd2ab2962a62013ae7493de960e7 (patch)
treef1a1750ed7f3a70fc89ff13497ea7dad545cd0d5 /source
parent9804515cf03997f8ef180f3b5951ddcb9f5b9fba (diff)
fix for build error in own commit with non gcc compilers. (and remove invalid comment)
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenlib/BLI_utildefines.h2
-rw-r--r--source/blender/bmesh/intern/bmesh_mods.c3
2 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h
index 22312a52e87..c27ea7146b5 100644
--- a/source/blender/blenlib/BLI_utildefines.h
+++ b/source/blender/blenlib/BLI_utildefines.h
@@ -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 */
diff --git a/source/blender/bmesh/intern/bmesh_mods.c b/source/blender/bmesh/intern/bmesh_mods.c
index a5694ecd920..62374d8b7bb 100644
--- a/source/blender/bmesh/intern/bmesh_mods.c
+++ b/source/blender/bmesh/intern/bmesh_mods.c
@@ -470,9 +470,6 @@ BMFace *BM_face_split_n(BMesh *bm, BMFace *f, BMVert *v1, BMVert *v2, float cos[
* 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