[Bf-blender-cvs] [44b54baf967] blender2.7: Fix build error with Visual Studio, appears to be a compiler bug

Brecht Van Lommel noreply at git.blender.org
Sun Apr 7 02:44:23 CEST 2019


Commit: 44b54baf96798378374451e63470b7e63175c84d
Author: Brecht Van Lommel
Date:   Sun Apr 7 02:38:03 2019 +0200
Branches: blender2.7
https://developer.blender.org/rB44b54baf96798378374451e63470b7e63175c84d

Fix build error with Visual Studio, appears to be a compiler bug

It's not clear that "if (0 &&" was introduced intentionally, but this test
only seems to have been an insignificant optimization anyway.

Fixes T63329

===================================================================

M	source/blender/bmesh/intern/bmesh_mesh.c

===================================================================

diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c
index 8039b2691f4..f249f076841 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -1169,16 +1169,10 @@ void bmesh_edit_end(BMesh *bm, BMOpTypeFlag type_flag)
 
 void BM_mesh_elem_index_ensure(BMesh *bm, const char htype)
 {
-	const char htype_needed = bm->elem_index_dirty & htype;
-
 #ifdef DEBUG
 	BM_ELEM_INDEX_VALIDATE(bm, "Should Never Fail!", __func__);
 #endif
 
-	if (0 && htype_needed == 0) {
-		goto finally;
-	}
-
 	if (htype & BM_VERT) {
 		if (bm->elem_index_dirty & BM_VERT) {
 			BMIter iter;



More information about the Bf-blender-cvs mailing list