Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/editors/uvedit
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/uvedit')
-rw-r--r--source/blender/editors/uvedit/uvedit_buttons.c4
-rw-r--r--source/blender/editors/uvedit/uvedit_draw.c2
-rw-r--r--source/blender/editors/uvedit/uvedit_ops.c48
-rw-r--r--source/blender/editors/uvedit/uvedit_smart_stitch.c2
-rw-r--r--source/blender/editors/uvedit/uvedit_unwrap_ops.c26
5 files changed, 41 insertions, 41 deletions
diff --git a/source/blender/editors/uvedit/uvedit_buttons.c b/source/blender/editors/uvedit/uvedit_buttons.c
index 4b71d1e9267..064a51a639f 100644
--- a/source/blender/editors/uvedit/uvedit_buttons.c
+++ b/source/blender/editors/uvedit/uvedit_buttons.c
@@ -134,7 +134,7 @@ static void uvedit_vertex_buttons(const bContext *C, uiBlock *block)
ED_space_image_get_size(sima, &imx, &imy);
- em = BMEdit_FromObject(obedit);
+ em = BKE_editmesh_from_object(obedit);
if (uvedit_center(scene, em, ima, center)) {
copy_v2_v2(uvedit_old_center, center);
@@ -175,7 +175,7 @@ static void do_uvedit_vertex(bContext *C, void *UNUSED(arg), int event)
if (event != B_UVEDIT_VERTEX)
return;
- em = BMEdit_FromObject(obedit);
+ em = BKE_editmesh_from_object(obedit);
ED_space_image_get_size(sima, &imx, &imy);
uvedit_center(scene, em, ima, center);
diff --git a/source/blender/editors/uvedit/uvedit_draw.c b/source/blender/editors/uvedit/uvedit_draw.c
index c70d2376cd6..f6d279c5fac 100644
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@ -128,7 +128,7 @@ static int draw_uvs_face_check(Scene *scene)
static void draw_uvs_shadow(Object *obedit)
{
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMesh *bm = em->bm;
BMFace *efa;
BMLoop *l;
diff --git a/source/blender/editors/uvedit/uvedit_ops.c b/source/blender/editors/uvedit/uvedit_ops.c
index a891826fbd6..7fbcfa1c941 100644
--- a/source/blender/editors/uvedit/uvedit_ops.c
+++ b/source/blender/editors/uvedit/uvedit_ops.c
@@ -98,7 +98,7 @@ int ED_uvedit_test(Object *obedit)
if (obedit->type != OB_MESH)
return 0;
- em = BMEdit_FromObject(obedit);
+ em = BKE_editmesh_from_object(obedit);
ret = EDBM_mtexpoly_check(em);
return ret;
@@ -183,7 +183,7 @@ void ED_uvedit_assign_image(Main *UNUSED(bmain), Scene *scene, Object *obedit, I
if (!obedit || (obedit->type != OB_MESH))
return;
- em = BMEdit_FromObject(obedit);
+ em = BKE_editmesh_from_object(obedit);
if (!em || !em->bm->totface) {
return;
}
@@ -286,7 +286,7 @@ static int uvedit_set_tile(Object *obedit, Image *ima, int curtile)
if (ima->type == IMA_TYPE_R_RESULT || ima->type == IMA_TYPE_COMPOSITE)
return 0;
- em = BMEdit_FromObject(obedit);
+ em = BKE_editmesh_from_object(obedit);
cd_poly_tex_offset = CustomData_get_offset(&em->bm->pdata, CD_MTEXPOLY);
@@ -601,7 +601,7 @@ void uv_poly_copy_aspect(float uv_orig[][2], float uv[][2], float aspx, float as
int ED_uvedit_minmax(Scene *scene, Image *ima, Object *obedit, float r_min[2], float r_max[2])
{
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
@@ -634,7 +634,7 @@ int ED_uvedit_minmax(Scene *scene, Image *ima, Object *obedit, float r_min[2], f
static int ED_uvedit_median(Scene *scene, Image *ima, Object *obedit, float co[2])
{
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
@@ -883,7 +883,7 @@ void uv_find_nearest_vert(Scene *scene, Image *ima, BMEditMesh *em,
int ED_uvedit_nearest_uv(Scene *scene, Object *obedit, Image *ima, const float co[2], float r_uv[2])
{
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
@@ -1326,7 +1326,7 @@ static float *uv_sel_co_from_eve(Scene *scene, Image *ima, BMEditMesh *em, BMVer
static void uv_weld_align(bContext *C, int tool)
{
Object *obedit = CTX_data_edit_object(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
SpaceImage *sima;
Scene *scene;
Image *ima;
@@ -1597,7 +1597,7 @@ static int uv_remove_doubles_exec(bContext *C, wmOperator *op)
SpaceImage *sima;
Scene *scene;
Object *obedit = CTX_data_edit_object(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
Image *ima;
MTexPoly *tf;
int uv_a_index;
@@ -1853,7 +1853,7 @@ static int uv_select_all_exec(bContext *C, wmOperator *op)
Scene *scene = CTX_data_scene(C);
Object *obedit = CTX_data_edit_object(C);
Image *ima = CTX_data_edit_image(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
int action = RNA_enum_get(op->ptr, "action");
@@ -1911,7 +1911,7 @@ static int uv_mouse_select(bContext *C, const float co[2], bool extend, bool loo
ToolSettings *ts = scene->toolsettings;
Object *obedit = CTX_data_edit_object(C);
Image *ima = CTX_data_edit_image(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
@@ -2316,7 +2316,7 @@ static int uv_select_linked_internal(bContext *C, wmOperator *op, const wmEvent
ToolSettings *ts = scene->toolsettings;
Object *obedit = CTX_data_edit_object(C);
Image *ima = CTX_data_edit_image(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
float limit[2];
int extend;
@@ -2420,7 +2420,7 @@ static int uv_select_split_exec(bContext *C, wmOperator *op)
ToolSettings *ts = scene->toolsettings;
Image *ima = CTX_data_edit_image(C);
Object *obedit = CTX_data_edit_object(C);
- BMesh *bm = BMEdit_FromObject(obedit)->bm;
+ BMesh *bm = BKE_editmesh_from_object(obedit)->bm;
BMFace *efa;
BMLoop *l;
@@ -2505,7 +2505,7 @@ static int uv_unlink_selection_exec(bContext *C, wmOperator *op)
ToolSettings *ts = scene->toolsettings;
Object *obedit = CTX_data_edit_object(C);
Image *ima = CTX_data_edit_image(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
@@ -2600,7 +2600,7 @@ static void uv_faces_do_sticky(SpaceImage *sima, Scene *scene, Object *obedit, s
* selection (so for sticky modes, vertex or location based). */
ToolSettings *ts = scene->toolsettings;
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
@@ -2728,7 +2728,7 @@ static int uv_border_select_exec(bContext *C, wmOperator *op)
Object *obedit = CTX_data_edit_object(C);
Image *ima = CTX_data_edit_image(C);
ARegion *ar = CTX_wm_region(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
@@ -2879,7 +2879,7 @@ static int uv_circle_select_exec(bContext *C, wmOperator *op)
Scene *scene = CTX_data_scene(C);
ToolSettings *ts = scene->toolsettings;
Object *obedit = CTX_data_edit_object(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
ARegion *ar = CTX_wm_region(C);
BMFace *efa;
BMLoop *l;
@@ -2985,7 +2985,7 @@ static int do_lasso_select_mesh_uv(bContext *C, const int mcords[][2], short mov
Object *obedit = CTX_data_edit_object(C);
Scene *scene = CTX_data_scene(C);
ToolSettings *ts = scene->toolsettings;
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
const int use_face_center = (ts->uv_flag & UV_SYNC_SELECTION) ?
(ts->selectmode == SCE_SELECT_FACE) :
(ts->uv_selectmode == UV_SELECT_FACE);
@@ -3175,7 +3175,7 @@ static void UV_OT_snap_cursor(wmOperatorType *ot)
static int uv_snap_uvs_to_cursor(Scene *scene, Image *ima, Object *obedit, SpaceImage *sima)
{
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
@@ -3205,7 +3205,7 @@ static int uv_snap_uvs_to_cursor(Scene *scene, Image *ima, Object *obedit, Space
static int uv_snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *obedit)
{
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMesh *bm = em->bm;
BMFace *f;
BMLoop *l, *lsub;
@@ -3263,7 +3263,7 @@ static int uv_snap_uvs_to_adjacent_unselected(Scene *scene, Image *ima, Object *
static int uv_snap_uvs_to_pixels(SpaceImage *sima, Scene *scene, Object *obedit)
{
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
Image *ima = sima->image;
BMFace *efa;
BMLoop *l;
@@ -3358,7 +3358,7 @@ static int uv_pin_exec(bContext *C, wmOperator *op)
Scene *scene = CTX_data_scene(C);
Object *obedit = CTX_data_edit_object(C);
Image *ima = CTX_data_edit_image(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
@@ -3416,7 +3416,7 @@ static int uv_select_pinned_exec(bContext *C, wmOperator *UNUSED(op))
Scene *scene = CTX_data_scene(C);
Object *obedit = CTX_data_edit_object(C);
Image *ima = CTX_data_edit_image(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
@@ -3488,7 +3488,7 @@ static int uv_hide_exec(bContext *C, wmOperator *op)
Object *obedit = CTX_data_edit_object(C);
Scene *scene = CTX_data_scene(C);
ToolSettings *ts = scene->toolsettings;
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
@@ -3604,7 +3604,7 @@ static int uv_reveal_exec(bContext *C, wmOperator *UNUSED(op))
Object *obedit = CTX_data_edit_object(C);
Scene *scene = CTX_data_scene(C);
ToolSettings *ts = scene->toolsettings;
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
diff --git a/source/blender/editors/uvedit/uvedit_smart_stitch.c b/source/blender/editors/uvedit/uvedit_smart_stitch.c
index 44918e9d495..c7977689bc4 100644
--- a/source/blender/editors/uvedit/uvedit_smart_stitch.c
+++ b/source/blender/editors/uvedit/uvedit_smart_stitch.c
@@ -1611,7 +1611,7 @@ static int stitch_init(bContext *C, wmOperator *op)
/* initialize state */
state->use_limit = RNA_boolean_get(op->ptr, "use_limit");
state->limit_dist = RNA_float_get(op->ptr, "limit");
- state->em = em = BMEdit_FromObject(obedit);
+ state->em = em = BKE_editmesh_from_object(obedit);
state->snap_islands = RNA_boolean_get(op->ptr, "snap_islands");
state->static_island = RNA_int_get(op->ptr, "static_island");
state->midpoints = RNA_boolean_get(op->ptr, "midpoint_snap");
diff --git a/source/blender/editors/uvedit/uvedit_unwrap_ops.c b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
index 69f6daeeb19..ba85b7e1a74 100644
--- a/source/blender/editors/uvedit/uvedit_unwrap_ops.c
+++ b/source/blender/editors/uvedit/uvedit_unwrap_ops.c
@@ -108,7 +108,7 @@ static void modifier_unwrap_state(Object *obedit, Scene *scene, short *use_subsu
static int ED_uvedit_ensure_uvs(bContext *C, Scene *scene, Object *obedit)
{
Main *bmain = CTX_data_main(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMIter iter;
Image *ima;
@@ -560,7 +560,7 @@ static bool minimize_stretch_init(bContext *C, wmOperator *op)
{
Scene *scene = CTX_data_scene(C);
Object *obedit = CTX_data_edit_object(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
MinStretch *ms;
int fill_holes = RNA_boolean_get(op->ptr, "fill_holes");
bool implicit = true;
@@ -761,7 +761,7 @@ static int pack_islands_exec(bContext *C, wmOperator *op)
{
Scene *scene = CTX_data_scene(C);
Object *obedit = CTX_data_edit_object(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
ParamHandle *handle;
bool implicit = true;
@@ -808,7 +808,7 @@ static int average_islands_scale_exec(bContext *C, wmOperator *UNUSED(op))
{
Scene *scene = CTX_data_scene(C);
Object *obedit = CTX_data_edit_object(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
ParamHandle *handle;
bool implicit = true;
@@ -847,7 +847,7 @@ static ParamHandle *liveHandle = NULL;
void ED_uvedit_live_unwrap_begin(Scene *scene, Object *obedit)
{
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
short abf = scene->toolsettings->unwrapper == 0;
short fillholes = scene->toolsettings->uvcalc_flag & UVCALC_FILLHOLES;
short use_subsurf;
@@ -887,7 +887,7 @@ void ED_uvedit_live_unwrap_end(short cancel)
void ED_uvedit_live_unwrap(Scene *scene, Object *obedit)
{
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
if (scene->toolsettings->edge_mode_live_unwrap &&
CustomData_has_layer(&em->bm->ldata, CD_MLOOPUV))
@@ -1000,7 +1000,7 @@ static void uv_map_transform(bContext *C, wmOperator *op, float center[3], float
/* context checks are messy here, making it work in both 3d view and uv editor */
Scene *scene = CTX_data_scene(C);
Object *obedit = CTX_data_edit_object(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
View3D *v3d = CTX_wm_view3d(C);
RegionView3D *rv3d = CTX_wm_region_view3d(C);
/* common operator properties */
@@ -1178,7 +1178,7 @@ static void uv_map_clip_correct(Scene *scene, Object *ob, BMEditMesh *em, wmOper
/* assumes UV Map is checked, doesn't run update funcs */
void ED_unwrap_lscm(Scene *scene, Object *obedit, const short sel)
{
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
ParamHandle *handle;
const short fill_holes = scene->toolsettings->uvcalc_flag & UVCALC_FILLHOLES;
@@ -1208,7 +1208,7 @@ static int unwrap_exec(bContext *C, wmOperator *op)
{
Scene *scene = CTX_data_scene(C);
Object *obedit = CTX_data_edit_object(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
int method = RNA_enum_get(op->ptr, "method");
int fill_holes = RNA_boolean_get(op->ptr, "fill_holes");
int correct_aspect = RNA_boolean_get(op->ptr, "correct_aspect");
@@ -1303,7 +1303,7 @@ static int uv_from_view_exec(bContext *C, wmOperator *op)
Scene *scene = CTX_data_scene(C);
Object *obedit = CTX_data_edit_object(C);
Camera *camera = NULL;
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
ARegion *ar = CTX_wm_region(C);
View3D *v3d = CTX_wm_view3d(C);
RegionView3D *rv3d = CTX_wm_region_view3d(C);
@@ -1500,7 +1500,7 @@ static int sphere_project_exec(bContext *C, wmOperator *op)
{
Scene *scene = CTX_data_scene(C);
Object *obedit = CTX_data_edit_object(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
@@ -1579,7 +1579,7 @@ static int cylinder_project_exec(bContext *C, wmOperator *op)
{
Scene *scene = CTX_data_scene(C);
Object *obedit = CTX_data_edit_object(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
@@ -1644,7 +1644,7 @@ static int cube_project_exec(bContext *C, wmOperator *op)
{
Scene *scene = CTX_data_scene(C);
Object *obedit = CTX_data_edit_object(C);
- BMEditMesh *em = BMEdit_FromObject(obedit);
+ BMEditMesh *em = BKE_editmesh_from_object(obedit);
BMFace *efa;
BMLoop *l;
BMIter iter, liter;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 04:03:09 +0300