archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

bugfix [#25238] Render image window edits UV's

Browse Source
This commit is contained in:
Campbell Barton
2010-12-20 05:26:25 +00:00
parent 3bed4cbf2b
commit 8e80ada09a
3 changed files with 7 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/screen/screen_ops.c
View File

@@ -54,6 +54,7 @@
#include "WM_types.h" #include "WM_types.h"
#include "ED_util.h" #include "ED_util.h"
#include "ED_image.h"
#include "ED_screen.h" #include "ED_screen.h"
#include "ED_object.h" #include "ED_object.h"
#include "ED_armature.h" #include "ED_armature.h"
@@ -320,23 +321,12 @@ int ED_operator_posemode(bContext *C)
return 0; return 0;
} }
/* wrapper for ED_space_image_show_uvedit */
int ED_operator_uvedit(bContext *C) int ED_operator_uvedit(bContext *C)
{ {
SpaceImage *sima= CTX_wm_space_image(C);
Object *obedit= CTX_data_edit_object(C); Object *obedit= CTX_data_edit_object(C);
EditMesh *em= NULL; return ED_space_image_show_uvedit(sima, obedit);
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;
} }
int ED_operator_uvmap(bContext *C) int ED_operator_uvmap(bContext *C)

6
source/blender/editors/space_image/space_image.c
View File

@@ -265,11 +265,9 @@ int ED_space_image_show_paint(SpaceImage *sima)
int ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit) int ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit)
{ {
if(ED_space_image_show_render(sima)) if(sima && (ED_space_image_show_render(sima) || ED_space_image_show_paint(sima)))
return 0; return 0;
if(ED_space_image_show_paint(sima))
return 0;
if(obedit && obedit->type == OB_MESH) { if(obedit && obedit->type == OB_MESH) {
EditMesh *em = BKE_mesh_get_editmesh(obedit->data); EditMesh *em = BKE_mesh_get_editmesh(obedit->data);
int ret; int ret;

2
source/blender/editors/transform/transform_conversions.c
View File

@@ -2444,7 +2444,7 @@ static void createTransUVs(bContext *C, TransInfo *t)
EditMesh *em = ((Mesh *)t->obedit->data)->edit_mesh; EditMesh *em = ((Mesh *)t->obedit->data)->edit_mesh;
EditFace *efa; EditFace *efa;
if(!ED_uvedit_test(t->obedit)) return; if(!ED_space_image_show_uvedit(sima, t->obedit)) return;
/* count */ /* count */
for (efa= em->faces.first; efa; efa= efa->next) { for (efa= em->faces.first; efa; efa= efa->next) {