diff options
| author | Philipp Oeser <info@graphics-engineer.com> | 2020-04-27 17:26:59 +0300 |
|---|---|---|
| committer | Philipp Oeser <info@graphics-engineer.com> | 2020-04-27 17:26:59 +0300 |
| commit | b6592c83b5490f154f27de22e34effa2617a5847 (patch) | |
| tree | 5d735c733b000a277983889b0affcafd9888bdb2 /source/blender | |
| parent | 7c782b8f277384525f32b459c72c7559dc4f8038 (diff) | |
| parent | 8f289196cfd8c6f5ca8700576d9b5e011bdc8e5a (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 992727e3b11..c2054756795 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -58,6 +58,7 @@ #include "BKE_icons.h" #include "BKE_image.h" #include "BKE_image_save.h" +#include "BKE_layer.h" #include "BKE_lib_id.h" #include "BKE_main.h" #include "BKE_packedFile.h" @@ -898,7 +899,12 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op)) /* get bounds */ float min[2], max[2]; if (ED_space_image_show_uvedit(sima, obedit)) { - if (!ED_uvedit_minmax(scene, ima, obedit, min, max)) { + uint objects_len = 0; + Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs( + view_layer, ((View3D *)NULL), &objects_len); + bool success = ED_uvedit_minmax_multi(scene, ima, objects, objects_len, min, max); + MEM_freeN(objects); + if (!success) { return OPERATOR_CANCELLED; } } |