diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-12-20 08:26:25 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-20 08:26:25 +0300 |
| commit | 8e80ada09ae2394fabb57b3c16efddbd6f16c20d (patch) | |
| tree | 3760e0a729db4dacdbd1c1d3f1d8cd4d78e11758 /source/blender/editors/space_image/space_image.c | |
| parent | 3bed4cbf2b4c09dcb62197b8a8c4ec4224abc8b7 (diff) | |
bugfix [#25238] Render image window edits UV's
Diffstat (limited to 'source/blender/editors/space_image/space_image.c')
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 6 |
1 files changed, 2 insertions, 4 deletions
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; |