Revision: 49541
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49541
Author: campbellbarton
Date: 2012-08-03 22:33:45 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
allow editing masks in an image space when there is no image.
also simplify image listener.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_image/image_edit.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/transform/transform_snap.c
Modified: trunk/blender/source/blender/editors/space_image/image_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_edit.c
2012-08-03 22:12:57 UTC (rev 49540)
+++ trunk/blender/source/blender/editors/space_image/image_edit.c
2012-08-03 22:33:45 UTC (rev 49541)
@@ -371,7 +371,7 @@
{
SpaceImage *sima = CTX_wm_space_image(C);
- if (sima && sima->image) {
+ if (sima) {
Scene *scene = CTX_data_scene(C);
return ED_space_image_check_show_maskedit(scene, sima);
}
@@ -382,13 +382,8 @@
int ED_space_image_maskedit_mask_poll(bContext *C)
{
if (ED_space_image_maskedit_poll(C)) {
- Image *ima = CTX_data_edit_image(C);
-
- if (ima) {
- SpaceImage *sima = CTX_wm_space_image(C);
-
- return sima->mask_info.mask != NULL;
- }
+ SpaceImage *sima = CTX_wm_space_image(C);
+ return sima->mask_info.mask != NULL;
}
return FALSE;
Modified: trunk/blender/source/blender/editors/space_image/space_image.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/space_image.c
2012-08-03 22:12:57 UTC (rev 49540)
+++ trunk/blender/source/blender/editors/space_image/space_image.c
2012-08-03 22:33:45 UTC (rev 49541)
@@ -411,9 +411,6 @@
static void image_listener(ScrArea *sa, wmNotifier *wmn)
{
SpaceImage *sima = (SpaceImage *)sa->spacedata.first;
-
- /* grr, prevent feedback loop */
- const int show_mask = (sima->image && (sima->image->source ==
IMA_SRC_VIEWER && sima->mode == SI_MODE_MASK));
/* context changes */
switch (wmn->category) {
@@ -429,8 +426,6 @@
case ND_COMPO_RESULT:
if (ED_space_image_show_render(sima))
image_scopes_tag_refresh(sa);
- if (!show_mask)
- ED_area_tag_refresh(sa);
ED_area_tag_redraw(sa);
break;
}
Modified: trunk/blender/source/blender/editors/transform/transform_snap.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_snap.c
2012-08-03 22:12:57 UTC (rev 49540)
+++ trunk/blender/source/blender/editors/transform/transform_snap.c
2012-08-03 22:33:45 UTC (rev 49541)
@@ -2135,7 +2135,12 @@
/* evil hack - snapping needs to be adapted for image aspect ratio */
if ((t->spacetype == SPACE_IMAGE) && (t->mode == TFM_TRANSLATION)) {
- ED_space_image_get_uv_aspect(t->sa->spacedata.first, asp, asp +
1);
+ if (t->options & CTX_MASK) {
+ ED_space_image_get_aspect(t->sa->spacedata.first, asp,
asp + 1);
+ }
+ else {
+ ED_space_image_get_uv_aspect(t->sa->spacedata.first,
asp, asp + 1);
+ }
}
for (i = 0; i <= max_index; i++) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
