svn merge ^/trunk/blender -r43564:43609
[blender.git] / source / blender / editors / uvedit / uvedit_smart_stitch.c
index 3731d348522d6eff3b7705484847b650e9a43318..70c94ab0a54c4ebc8c42c9a6f5470b3117223d81 100644 (file)
@@ -1,3 +1,6 @@
+
+#if 0 /* BMESH TODO */
+
 /*
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
@@ -50,6 +53,7 @@
 #include "BKE_customdata.h"
 #include "BKE_depsgraph.h"
 #include "BKE_mesh.h"
+#include "BKE_tessmesh.h"
 
 #include "ED_mesh.h"
 #include "ED_uvedit.h"
@@ -443,7 +447,7 @@ static void stitch_state_delete(StitchState *stitch_state)
 {
        if(stitch_state){
                if(stitch_state->element_map){
-                       EM_free_uv_element_map(stitch_state->element_map);
+                       EDBM_free_uv_element_map(stitch_state->element_map);
                }
                if(stitch_state->uvs){
                        MEM_freeN(stitch_state->uvs);
@@ -971,9 +975,9 @@ static int stitch_init(bContext *C, wmOperator *op)
        state->midpoints = RNA_boolean_get(op->ptr, "midpoint_snap");
        /* in uv synch selection, all uv's are visible */
        if(ts->uv_flag & UV_SYNC_SELECTION){
-               state->element_map = EM_make_uv_element_map(state->em, 0, 1);
+               state->element_map = EDBM_make_uv_element_map(state->em, 0, 1);
        }else{
-               state->element_map = EM_make_uv_element_map(state->em, 1, 1);
+               state->element_map = EDBM_make_uv_element_map(state->em, 1, 1);
        }
        if(!state->element_map){
                stitch_state_delete(state);
@@ -1464,4 +1468,4 @@ void UV_OT_stitch(wmOperatorType *ot)
        RNA_def_property_flag(prop, PROP_HIDDEN);
 }
 
-
+#endif /* BMESH TODO */