[Bf-blender-cvs] [21105e1b1f1] blender2.8: Cleanup: use simple early exit for common case
Campbell Barton
noreply at git.blender.org
Wed Aug 29 17:12:57 CEST 2018
Commit: 21105e1b1f1266a3846462588bdbe840d09758ea
Author: Campbell Barton
Date: Thu Aug 30 01:19:44 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB21105e1b1f1266a3846462588bdbe840d09758ea
Cleanup: use simple early exit for common case
Caused MSVC warning, may as well do simple check.
===================================================================
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 a454fb7e948..0dcbc05b201 100644
--- a/source/blender/bmesh/intern/bmesh_mesh.c
+++ b/source/blender/bmesh/intern/bmesh_mesh.c
@@ -1549,14 +1549,17 @@ void bmesh_edit_end(BMesh *bm, BMOpTypeFlag type_flag)
void BM_mesh_elem_index_ensure_ex(BMesh *bm, const char htype, int elem_offset[4])
{
- 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 (elem_offset == NULL) {
+ /* Simple case. */
+ const char htype_needed = bm->elem_index_dirty & htype;
+ if (htype_needed == 0) {
+ goto finally;
+ }
}
if (htype & BM_VERT) {
More information about the Bf-blender-cvs
mailing list