Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-11 14:44:14 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-03-11 16:34:13 +0300
commit403ae48063d91126bd36ca56920290bcb53f504e (patch)
treecbaa40f691f9c1a270ad1e33fffa9ee2a1d689f0 /source/blender/editors/space_image/image_ops.c
parentb5349d967f1af433a9ee914aec72e028c3b2cd10 (diff)
UV editor: automatically show image assigned to active face.
When manually selecting a different image, this image will become pinned and continue to show. The material node is not automatically modified as it was in old Blender versions, only the image displayed in the UV editor. Fixes T61239: confusing behavior when unwrapping non-square images. By showing the relevant image by default it's more clear why it does aspect correction.
Diffstat (limited to 'source/blender/editors/space_image/image_ops.c')
-rw-r--r--source/blender/editors/space_image/image_ops.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 064a4d2ce11..bba336ca2e0 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -1300,7 +1300,7 @@ static int image_open_exec(bContext *C, wmOperator *op)
}
else if (sa && sa->spacetype == SPACE_IMAGE) {
SpaceImage *sima = sa->spacedata.first;
- ED_space_image_set(bmain, sima, obedit, ima);
+ ED_space_image_set(bmain, sima, obedit, ima, false);
iuser = &sima->iuser;
}
else {
@@ -2461,7 +2461,7 @@ static int image_new_exec(bContext *C, wmOperator *op)
RNA_property_update(C, &data->pprop.ptr, data->pprop.prop);
}
else if (sima) {
- ED_space_image_set(bmain, sima, obedit, ima);
+ ED_space_image_set(bmain, sima, obedit, ima, false);
}
BKE_image_signal(bmain, ima, (sima) ? &sima->iuser : NULL, IMA_SIGNAL_USER_NEW_IMAGE);
@@ -3800,7 +3800,7 @@ static int image_read_viewlayers_exec(bContext *C, wmOperator *UNUSED(op))
ima = BKE_image_verify_viewer(bmain, IMA_TYPE_R_RESULT, "Render Result");
if (sima->image == NULL) {
- ED_space_image_set(bmain, sima, NULL, ima);
+ ED_space_image_set(bmain, sima, NULL, ima, false);
}
RE_ReadRenderResult(scene, scene);