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

Fix T58125: UV Editor transform fails

Browse Source
This commit is contained in:
Campbell Barton
2018-11-29 14:39:50 +11:00
parent 559fff160e
commit 6e24dd9a1e
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/transform/transform_generics.c
View File

@@ -1213,9 +1213,12 @@ void initTransDataContainers_FromObjectData(TransInfo *t, Object *obact, Object
bool free_objects = false;
if (objects == NULL) {
objects = BKE_view_layer_array_from_objects_in_mode(
t->view_layer, t->view, &objects_len, {
t->view_layer,
(t->spacetype == SPACE_VIEW3D) ? t->view : NULL,
&objects_len, {
.object_mode = object_mode,
.no_dup_data = true});
.no_dup_data = true,
});
free_objects = true;
}

3
source/blender/editors/transform/transform_gizmo_2d.c
View File

@@ -165,11 +165,10 @@ static void gizmo2d_calc_bounds(const bContext *C, float *r_center, float *r_min
if (sa->spacetype == SPACE_IMAGE) {
SpaceImage *sima = sa->spacedata.first;
ViewLayer *view_layer = CTX_data_view_layer(C);
View3D *v3d = CTX_wm_view3d(C);
Image *ima = ED_space_image(sima);
uint objects_len = 0;
Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(
view_layer, v3d, &objects_len);
view_layer, NULL, &objects_len);
if (!ED_uvedit_minmax_multi(CTX_data_scene(C), ima, objects, objects_len, r_min, r_max)) {
zero_v2(r_min);
zero_v2(r_max);

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

@@ -994,7 +994,7 @@ static void CalcSnapGeometry(TransInfo *t, float *UNUSED(vec))
uint objects_len = 0;
Object **objects = BKE_view_layer_array_from_objects_in_edit_mode_unique_data_with_uvs(
t->view_layer, t->view, &objects_len);
t->view_layer, NULL, &objects_len);
float dist_sq = FLT_MAX;
if (ED_uvedit_nearest_uv_multi(t->scene, ima, objects, objects_len, co, &dist_sq, t->tsnap.snapPoint)) {