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:
authorCampbell Barton <ideasman42@gmail.com>2012-07-31 18:16:27 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-07-31 18:16:27 +0400
commitc42d0189e586419269e9004868bec365e1b8396f (patch)
tree896796da95b1f292ce36d61e4cf7224230b4f2e3 /source/blender/editors/screen
parent8f6197bd08955f210653973f313bd4de5026bd91 (diff)
resolve glitch in the image space where mask editing and UVs would conflict.
now UV editing overrides mask.
Diffstat (limited to 'source/blender/editors/screen')
-rw-r--r--source/blender/editors/screen/screen_ops.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index a431ea7ea03..36353c43cbd 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -476,7 +476,8 @@ int ED_operator_mask(bContext *C)
case SPACE_IMAGE:
{
SpaceImage *sima = sa->spacedata.first;
- return ED_space_image_check_show_maskedit(sima);
+ Scene *scene = CTX_data_scene(C);
+ return ED_space_image_check_show_maskedit(scene, sima);
}
}
}