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-25 00:33:55 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-07-25 00:33:55 +0400
commitd9dbea183622916cc62d259764a23d80f5122b5f (patch)
treeddd9dc44c56676a64985780bb1e51059cd7d8aa0 /source/blender/editors/space_clip/space_clip.c
parent8509e94d3ad69aaa2bb3b14c5669ea9d596e3fd0 (diff)
move mask and draw settings into its own struct to be shared between spaces.
Diffstat (limited to 'source/blender/editors/space_clip/space_clip.c')
-rw-r--r--source/blender/editors/space_clip/space_clip.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index bdbfa250674..9b1ffcf31b1 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -766,8 +766,8 @@ static int clip_context(const bContext *C, const char *member, bContextDataResul
return TRUE;
}
else if (CTX_data_equals(member, "edit_mask")) {
- if (sc->mask)
- CTX_data_id_pointer_set(result, &sc->mask->id);
+ if (sc->mask_info.mask)
+ CTX_data_id_pointer_set(result, &sc->mask_info.mask->id);
return TRUE;
}
@@ -1120,7 +1120,7 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar)
int width, height;
ED_mask_size(C, &width, &height);
ED_mask_draw_region(mask, ar,
- sc->mask_draw_flag, sc->mask_draw_type,
+ sc->mask_info.draw_flag, sc->mask_info.draw_type,
width, height,
TRUE, TRUE,
sc->stabmat, C);