diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 18 | ||||
-rw-r--r-- | source/blender/editors/space_image/space_image.c | 6 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_conversions.c | 2 |
3 files changed, 7 insertions, 19 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 5e2a908776d..74c75a664b0 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -54,6 +54,7 @@ #include "WM_types.h" #include "ED_util.h" +#include "ED_image.h" #include "ED_screen.h" #include "ED_object.h" #include "ED_armature.h" @@ -320,23 +321,12 @@ int ED_operator_posemode(bContext *C) return 0; } - +/* wrapper for ED_space_image_show_uvedit */ int ED_operator_uvedit(bContext *C) { + SpaceImage *sima= CTX_wm_space_image(C); Object *obedit= CTX_data_edit_object(C); - EditMesh *em= NULL; - - if(obedit && obedit->type==OB_MESH) - em= BKE_mesh_get_editmesh((Mesh *)obedit->data); - - if(em && (em->faces.first) && (CustomData_has_layer(&em->fdata, CD_MTFACE))) { - BKE_mesh_end_editmesh(obedit->data, em); - return 1; - } - - if(obedit) - BKE_mesh_end_editmesh(obedit->data, em); - return 0; + return ED_space_image_show_uvedit(sima, obedit); } int ED_operator_uvmap(bContext *C) diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 58ae3d0df87..8b8772c6e28 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -265,11 +265,9 @@ int ED_space_image_show_paint(SpaceImage *sima) int ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit) { - if(ED_space_image_show_render(sima)) - return 0; - if(ED_space_image_show_paint(sima)) + if(sima && (ED_space_image_show_render(sima) || ED_space_image_show_paint(sima))) return 0; - + if(obedit && obedit->type == OB_MESH) { EditMesh *em = BKE_mesh_get_editmesh(obedit->data); int ret; diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 64b7596355c..90a275883ae 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -2444,7 +2444,7 @@ static void createTransUVs(bContext *C, TransInfo *t) EditMesh *em = ((Mesh *)t->obedit->data)->edit_mesh; EditFace *efa; - if(!ED_uvedit_test(t->obedit)) return; + if(!ED_space_image_show_uvedit(sima, t->obedit)) return; /* count */ for (efa= em->faces.first; efa; efa= efa->next) { |