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:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-12-14 13:19:13 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-12-14 13:19:13 +0400
commitdbe158f0bb9f71511184629f7b8e2f3b6eb19fa9 (patch)
tree25a9cec66666c0346eb6dcc8010c87a3af979f31 /source/blender/editors
parent3d99ba125f74f77b4deea9a6385bcc5ffd6849b2 (diff)
Fix #33525: Mask points are add offset for the mouse when adding on viewer node with aspect != 1
It was strange logic in code from 2010 which forced image aspect to be 1 for viewer nodes and render results. Not sure why it's needed, was only used for unwrapping aspect correction, but render result/viewer images are already handled differently there.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/space_image/image_edit.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/editors/space_image/image_edit.c b/source/blender/editors/space_image/image_edit.c
index c4e2230e7a7..261caf57c5d 100644
--- a/source/blender/editors/space_image/image_edit.c
+++ b/source/blender/editors/space_image/image_edit.c
@@ -194,9 +194,7 @@ void ED_space_image_get_size_fl(SpaceImage *sima, float size[2])
void ED_space_image_get_aspect(SpaceImage *sima, float *aspx, float *aspy)
{
Image *ima = sima->image;
- if ((ima == NULL) || (ima->type == IMA_TYPE_R_RESULT) || (ima->type == IMA_TYPE_COMPOSITE) ||
- (ima->aspx == 0.0f || ima->aspy == 0.0f))
- {
+ if ((ima == NULL) || (ima->aspx == 0.0f || ima->aspy == 0.0f)) {
*aspx = *aspy = 1.0;
}
else {