[Bf-blender-cvs] [5f0f861] master: BMesh: avoid mdisp lookups (minor optimization)

[Campbell Barton]

Commit: 5f0f861b1d0d7cc3733f4f3652af1068c7465c8b
Author: Campbell Barton
Date:   Tue Nov 3 15:14:12 2015 +1100
Branches: master
https://developer.blender.org/rB5f0f861b1d0d7cc3733f4f3652af1068c7465c8b

BMesh: avoid mdisp lookups (minor optimization)

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

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

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

diff --git a/source/blender/bmesh/intern/bmesh_core.c 
b/source/blender/bmesh/intern/bmesh_core.c
index e67aa1d..de8539b 100644
--- a/source/blender/bmesh/intern/bmesh_core.c
+++ b/source/blender/bmesh/intern/bmesh_core.c
@@ -896,7 +896,7 @@ static bool bm_loop_reverse_loop(BMesh *bm, BMFace *f
 #endif
 
        const int len = f->len;
-       const bool do_disps = CustomData_has_layer(&bm->ldata, CD_MDISPS);
+       const int cd_loop_mdisp_offset = CustomData_get_offset(&bm->ldata, 
CD_MDISPS);
        BMLoop *l_iter, *oldprev, *oldnext;
        BMEdge **edar = BLI_array_alloca(edar, len);
        int i, j, edok;
@@ -913,12 +913,12 @@ static bool bm_loop_reverse_loop(BMesh *bm, BMFace *f
                l_iter->prev = oldnext;
                l_iter = oldnext;
                
-               if (do_disps) {
+               if (cd_loop_mdisp_offset != -1) {
                        float (*co)[3];
                        int x, y, sides;
                        MDisps *md;
                        
-                       md = CustomData_bmesh_get(&bm->ldata, 
l_iter->head.data, CD_MDISPS);
+                       md = BM_ELEM_CD_GET_VOID_P(l_iter, 
cd_loop_mdisp_offset);
                        if (!md->totdisp || !md->disps)
                                continue;
 
@@ -957,6 +957,7 @@ static bool bm_loop_reverse_loop(BMesh *bm, BMFace *f
        for (i = 0, l_iter = l_first; i < len; i++, l_iter = l_iter->next)
                bmesh_radial_append(l_iter->e, l_iter);
 
+#ifndef NDEBUG
        /* validate radial */
        for (i = 0, l_iter = l_first; i < len; i++, l_iter = l_iter->next) {
                BM_CHECK_ELEMENT(l_iter);
@@ -966,6 +967,7 @@ static bool bm_loop_reverse_loop(BMesh *bm, BMFace *f
        }
 
        BM_CHECK_ELEMENT(f);
+#endif
 
        /* Loop indices are no more valid! */
        bm->elem_index_dirty |= BM_LOOP;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs