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-06-04 21:30:54 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-06-04 21:30:54 +0400
commitd46a6dc59c76c4b5f9210aba51f5f6347c7ccd26 (patch)
tree8677eb154960d38fd880d0b62f7c2808b7985664 /source/blender/editors/space_clip
parentc517247fc67b77e451c7e920385beda02a0de524 (diff)
abbreviate mask-editing to mask-edit
Diffstat (limited to 'source/blender/editors/space_clip')
-rw-r--r--source/blender/editors/space_clip/clip_draw.c2
-rw-r--r--source/blender/editors/space_clip/clip_editor.c8
-rw-r--r--source/blender/editors/space_clip/space_clip.c4
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/editors/space_clip/clip_draw.c b/source/blender/editors/space_clip/clip_draw.c
index 6ac5ec59742..d55d32deaa4 100644
--- a/source/blender/editors/space_clip/clip_draw.c
+++ b/source/blender/editors/space_clip/clip_draw.c
@@ -198,7 +198,7 @@ static void draw_movieclip_cache(SpaceClip *sc, ARegion *ar, MovieClip *clip, Sc
clip_draw_curfra_label(sc, x, 8.0f);
/* movie clip animation */
- if ((sc->mode == SC_MODE_MASKEDITING) && sc->mask) {
+ if ((sc->mode == SC_MODE_MASKEDIT) && sc->mask) {
MaskLayer *masklay = BKE_mask_layer_active(sc->mask);
if (masklay) {
MaskLayerShape *masklay_shape;
diff --git a/source/blender/editors/space_clip/clip_editor.c b/source/blender/editors/space_clip/clip_editor.c
index f16ef21b707..8bee06854e1 100644
--- a/source/blender/editors/space_clip/clip_editor.c
+++ b/source/blender/editors/space_clip/clip_editor.c
@@ -129,7 +129,7 @@ int ED_space_clip_tracking_frame_poll(bContext *C)
return FALSE;
}
-int ED_space_clip_maskediting_poll(bContext *C)
+int ED_space_clip_maskedit_poll(bContext *C)
{
SpaceClip *sc = CTX_wm_space_clip(C);
@@ -140,9 +140,9 @@ int ED_space_clip_maskediting_poll(bContext *C)
return FALSE;
}
-int ED_space_clip_maskediting_mask_poll(bContext *C)
+int ED_space_clip_maskedit_mask_poll(bContext *C)
{
- if (ED_space_clip_maskediting_poll(C)) {
+ if (ED_space_clip_maskedit_poll(C)) {
MovieClip *clip = CTX_data_edit_movieclip(C);
if (clip) {
@@ -681,7 +681,7 @@ int ED_space_clip_show_trackedit(SpaceClip *sc)
int ED_space_clip_show_maskedit(SpaceClip *sc)
{
if (sc) {
- return sc->mode == SC_MODE_MASKEDITING;
+ return sc->mode == SC_MODE_MASKEDIT;
}
return FALSE;
diff --git a/source/blender/editors/space_clip/space_clip.c b/source/blender/editors/space_clip/space_clip.c
index a7fe86e0eff..aec71d095f7 100644
--- a/source/blender/editors/space_clip/space_clip.c
+++ b/source/blender/editors/space_clip/space_clip.c
@@ -1097,7 +1097,7 @@ static void clip_main_area_draw(const bContext *C, ARegion *ar)
/* Grease Pencil */
clip_draw_grease_pencil((bContext *)C, 1);
- if(sc->mode == SC_MODE_MASKEDITING) {
+ if(sc->mode == SC_MODE_MASKEDIT) {
int x, y;
int width, height;
float zoomx, zoomy, aspx, aspy;
@@ -1323,7 +1323,7 @@ static void clip_header_area_listener(ARegion *ar, wmNotifier *wmn)
/* for proportional editmode only */
case ND_TOOLSETTINGS:
/* TODO - should do this when in mask mode only but no datas available */
- // if(sc->mode == SC_MODE_MASKEDITING)
+ // if(sc->mode == SC_MODE_MASKEDIT)
{
ED_region_tag_redraw(ar);
}