Commit: 25502a9bdcb74f5a9363a44dac18726f0c15c669
Author: Campbell Barton
Date:   Mon Mar 12 14:51:45 2018 +1100
Branches: master
https://developer.blender.org/rB25502a9bdcb74f5a9363a44dac18726f0c15c669

Cleanup: sync EDBM_uv_* functions w/ 2.8

They're nearly the same, so keep names matching to avoid conflicts.

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

M       source/blender/editors/include/ED_mesh.h
M       source/blender/editors/mesh/editmesh_utils.c
M       source/blender/editors/sculpt_paint/sculpt_uv.c
M       source/blender/editors/space_image/image_edit.c
M       source/blender/editors/space_image/space_image.c
M       source/blender/editors/uvedit/uvedit_draw.c
M       source/blender/editors/uvedit/uvedit_ops.c
M       source/blender/makesrna/intern/rna_scene_api.c
M       source/blenderplayer/bad_level_call_stubs/stubs.c

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

diff --git a/source/blender/editors/include/ED_mesh.h 
b/source/blender/editors/include/ED_mesh.h
index 84698b33e25..5ed6105e5e7 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -47,6 +47,7 @@ struct bDeformGroup;
 struct MDeformVert;
 struct Scene;
 struct Mesh;
+struct MTexPoly;
 struct UvVertMap;
 struct UvMapVert;
 struct BMEditMesh;
@@ -112,8 +113,10 @@ struct UvElementMap *BM_uv_element_map_create(
 void                 BM_uv_element_map_free(struct UvElementMap *vmap);
 struct UvElement    *BM_uv_element_get(struct UvElementMap *map, struct BMFace 
*efa, struct BMLoop *l);
 
-bool             EDBM_mtexpoly_check(struct BMEditMesh *em);
-struct MTexPoly *EDBM_mtexpoly_active_get(struct BMEditMesh *em, struct BMFace 
**r_act_efa, const bool sloppy, const bool selected);
+bool           EDBM_uv_check(struct BMEditMesh *em);
+struct BMFace *EDBM_uv_active_face_get(
+        struct BMEditMesh *em, const bool sloppy, const bool selected,
+        struct MTexPoly **r_tf);
 
 void              BM_uv_vert_map_free(struct UvVertMap *vmap);
 struct UvMapVert *BM_uv_vert_map_at_index(struct UvVertMap *vmap, unsigned int 
v);
@@ -137,8 +140,9 @@ bool EDBM_backbuf_border_init(struct ViewContext *vc, short 
xmin, short ymin, sh
 bool EDBM_backbuf_check(unsigned int index);
 void EDBM_backbuf_free(void);
 
-bool EDBM_backbuf_border_mask_init(struct ViewContext *vc, const int 
mcords[][2], short tot,
-                                   short xmin, short ymin, short xmax, short 
ymax);
+bool EDBM_backbuf_border_mask_init(
+        struct ViewContext *vc, const int mcords[][2], short tot,
+        short xmin, short ymin, short xmax, short ymax);
 bool EDBM_backbuf_circle_init(struct ViewContext *vc, short xs, short ys, 
short rads);
 
 struct BMVert *EDBM_vert_find_nearest_ex(
@@ -218,9 +222,11 @@ typedef struct MirrTopoStore_t {
        int prev_ob_mode;
 } MirrTopoStore_t;
 
-bool ED_mesh_mirrtopo_recalc_check(struct Mesh *me, struct DerivedMesh *dm, 
const int ob_mode, MirrTopoStore_t *mesh_topo_store);
-void ED_mesh_mirrtopo_init(struct Mesh *me, struct DerivedMesh *dm, const int 
ob_mode, MirrTopoStore_t *mesh_topo_store,
-                           const bool skip_em_vert_array_init);
+bool ED_mesh_mirrtopo_recalc_check(
+        struct Mesh *me, struct DerivedMesh *dm, const int ob_mode, 
MirrTopoStore_t *mesh_topo_store);
+void ED_mesh_mirrtopo_init(
+        struct Mesh *me, struct DerivedMesh *dm, const int ob_mode, 
MirrTopoStore_t *mesh_topo_store,
+        const bool skip_em_vert_array_init);
 void ED_mesh_mirrtopo_free(MirrTopoStore_t *mesh_topo_store);
 
 
diff --git a/source/blender/editors/mesh/editmesh_utils.c 
b/source/blender/editors/mesh/editmesh_utils.c
index c4440fa190a..8197e368a17 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -919,29 +919,31 @@ UvElement *BM_uv_element_get(UvElementMap *map, BMFace 
*efa, BMLoop *l)
 
 /* last_sel, use em->act_face otherwise get the last selected face in the 
editselections
  * at the moment, last_sel is mainly useful for making sure the space image 
dosnt flicker */
-MTexPoly *EDBM_mtexpoly_active_get(BMEditMesh *em, BMFace **r_act_efa, const 
bool sloppy, const bool selected)
+BMFace *EDBM_uv_active_face_get(BMEditMesh *em, const bool sloppy, const bool 
selected, MTexPoly **r_tf)
 {
        BMFace *efa = NULL;
        
-       if (!EDBM_mtexpoly_check(em))
+       if (!EDBM_uv_check(em)) {
                return NULL;
-       
+       }
+
        efa = BM_mesh_active_face_get(em->bm, sloppy, selected);
 
        if (efa) {
-               if (r_act_efa) *r_act_efa = efa;
-               return CustomData_bmesh_get(&em->bm->pdata, efa->head.data, 
CD_MTEXPOLY);
+               if (r_tf) *r_tf = CustomData_bmesh_get(&em->bm->pdata, 
efa->head.data, CD_MTEXPOLY);
+               return efa;
        }
 
-       if (r_act_efa) *r_act_efa = NULL;
+       if (r_tf) *r_tf = NULL;
        return NULL;
 }
 
 /* can we edit UV's for this mesh?*/
-bool EDBM_mtexpoly_check(BMEditMesh *em)
+bool EDBM_uv_check(BMEditMesh *em)
 {
        /* some of these checks could be a touch overkill */
-       return em && em->bm->totface && CustomData_has_layer(&em->bm->pdata, 
CD_MTEXPOLY) &&
+       return em && em->bm->totface &&
+              CustomData_has_layer(&em->bm->pdata, CD_MTEXPOLY) &&
               CustomData_has_layer(&em->bm->ldata, CD_MLOOPUV);
 }
 
diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c 
b/source/blender/editors/sculpt_paint/sculpt_uv.c
index 7b636530d61..e39750227c0 100644
--- a/source/blender/editors/sculpt_paint/sculpt_uv.c
+++ b/source/blender/editors/sculpt_paint/sculpt_uv.c
@@ -173,7 +173,7 @@ static int uv_sculpt_brush_poll_do(bContext *C, const bool 
check_region)
        }
 
        em = BKE_editmesh_from_object(obedit);
-       ret = EDBM_mtexpoly_check(em);
+       ret = EDBM_uv_check(em);
 
        if (ret) {
                ARegion *ar = CTX_wm_region(C);
diff --git a/source/blender/editors/space_image/image_edit.c 
b/source/blender/editors/space_image/image_edit.c
index 8f2f6595408..9d7944a25d3 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -365,7 +365,7 @@ bool ED_space_image_show_uvedit(SpaceImage *sima, Object 
*obedit)
                struct BMEditMesh *em = BKE_editmesh_from_object(obedit);
                bool ret;
 
-               ret = EDBM_mtexpoly_check(em);
+               ret = EDBM_uv_check(em);
 
                return ret;
        }
diff --git a/source/blender/editors/space_image/space_image.c 
b/source/blender/editors/space_image/space_image.c
index ba67eb4683f..bac3b9f8df7 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -434,12 +434,9 @@ static void image_refresh(const bContext *C, ScrArea *sa)
                }
                else {
                        /* old shading system, we set texface */
-                       MTexPoly *tf;
-                       
-                       if (em && EDBM_mtexpoly_check(em)) {
-                               tf = EDBM_mtexpoly_active_get(em, NULL, sloppy, 
selected);
-
-                               if (tf) {
+                       if (em && EDBM_uv_check(em)) {
+                               MTexPoly *tf;
+                               if (EDBM_uv_active_face_get(em, sloppy, 
selected, &tf)) {
                                        /* don't need to check for pin here, 
see above */
                                        sima->image = tf->tpage;
                                        
diff --git a/source/blender/editors/uvedit/uvedit_draw.c 
b/source/blender/editors/uvedit/uvedit_draw.c
index fecacd07997..7b793697077 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -570,7 +570,7 @@ static void draw_uvs(SpaceImage *sima, Scene *scene, Object 
*obedit)
        const int cd_loop_uv_offset  = CustomData_get_offset(&bm->ldata, 
CD_MLOOPUV);
        const int cd_poly_tex_offset = CustomData_get_offset(&bm->pdata, 
CD_MTEXPOLY);
 
-       activetf = EDBM_mtexpoly_active_get(em, &efa_act, false, false); /* 
will be set to NULL if hidden */
+       efa_act = EDBM_uv_active_face_get(em, false, false, &activetf); /* will 
be set to NULL if hidden */
 #ifndef USE_EDBM_LOOPTRIS
        activef = BM_mesh_active_face_get(bm, false, false);
 #endif
@@ -967,7 +967,7 @@ static void draw_uv_shadows_get(SpaceImage *sima, Object 
*ob, Object *obedit, bo
        if ((sima->mode == SI_MODE_PAINT) && obedit && obedit->type == OB_MESH) 
{
                struct BMEditMesh *em = BKE_editmesh_from_object(obedit);
                
-               *show_shadow = EDBM_mtexpoly_check(em);
+               *show_shadow = EDBM_uv_check(em);
        }
        
        *show_texpaint = (ob && ob->type == OB_MESH && ob->mode == 
OB_MODE_TEXTURE_PAINT);
diff --git a/source/blender/editors/uvedit/uvedit_ops.c 
b/source/blender/editors/uvedit/uvedit_ops.c
index 1ee10268be5..b95327cf700 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -106,7 +106,7 @@ bool ED_uvedit_test(Object *obedit)
                return 0;
 
        em = BKE_editmesh_from_object(obedit);
-       ret = EDBM_mtexpoly_check(em);
+       ret = EDBM_uv_check(em);
        
        return ret;
 }
@@ -4081,7 +4081,7 @@ static int uv_seams_from_islands_exec(bContext *C, 
wmOperator *op)
        em = me->edit_btmesh;
        bm = em->bm;
 
-       if (!EDBM_mtexpoly_check(em)) {
+       if (!EDBM_uv_check(em)) {
                return OPERATOR_CANCELLED;
        }
 
diff --git a/source/blender/makesrna/intern/rna_scene_api.c 
b/source/blender/makesrna/intern/rna_scene_api.c
index 3043e636b31..2a63f465dc2 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -112,7 +112,7 @@ static void rna_Scene_uvedit_aspect(Scene *scene, Object 
*ob, float *aspect)
        if ((ob->type == OB_MESH) && (ob->mode == OB_MODE_EDIT)) {
                BMEditMesh *em;
                em = BKE_editmesh_from_object(ob);
-               if (EDBM_mtexpoly_check(em)) {
+               if (EDBM_uv_check(em)) {
                        ED_uvedit_get_aspect(scene, ob, em->bm, aspect, aspect 
+ 1);
                        return;
                }
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c 
b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 880c866085d..8399b43bcdd 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -227,7 +227,7 @@ void EDBM_mesh_load(struct Object *ob) RET_NONE
 void EDBM_mesh_make(struct ToolSettings *ts, struct Object *ob, const bool 
use_key_index) RET_NONE
 void EDBM_mesh_normals_update(struct BMEditMesh *em) RET_NONE
 void *g_system;
-bool EDBM_mtexpoly_check(struct BMEditMesh *em) RET_ZERO
+bool EDBM_uv_check(struct BMEditMesh *em) RET_ZERO
 
 float *RE_RenderLayerGetPass(volatile struct RenderLayer *rl, const char 
*name, const char *viewname) RET_NULL
 float RE_filter_value(int type, float x) RET_ZERO

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

Reply via email to