[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47428] trunk/blender: abbreviate mask-editing to mask-edit
Campbell Barton
ideasman42 at gmail.com
Mon Jun 4 19:30:55 CEST 2012
Revision: 47428
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47428
Author: campbellbarton
Date: 2012-06-04 17:30:54 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
abbreviate mask-editing to mask-edit
Modified Paths:
--------------
trunk/blender/release/scripts/startup/bl_ui/space_clip.py
trunk/blender/source/blender/editors/include/ED_clip.h
trunk/blender/source/blender/editors/mask/mask_add.c
trunk/blender/source/blender/editors/mask/mask_edit.c
trunk/blender/source/blender/editors/mask/mask_intern.h
trunk/blender/source/blender/editors/mask/mask_ops.c
trunk/blender/source/blender/editors/mask/mask_relationships.c
trunk/blender/source/blender/editors/mask/mask_select.c
trunk/blender/source/blender/editors/mask/mask_shapekey.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_clip/clip_draw.c
trunk/blender/source/blender/editors/space_clip/clip_editor.c
trunk/blender/source/blender/editors/space_clip/space_clip.c
trunk/blender/source/blender/makesdna/DNA_space_types.h
trunk/blender/source/blender/makesrna/intern/rna_space.c
Modified: trunk/blender/release/scripts/startup/bl_ui/space_clip.py
===================================================================
--- trunk/blender/release/scripts/startup/bl_ui/space_clip.py 2012-06-04 17:27:22 UTC (rev 47427)
+++ trunk/blender/release/scripts/startup/bl_ui/space_clip.py 2012-06-04 17:30:54 UTC (rev 47428)
@@ -45,13 +45,13 @@
sub.menu("CLIP_MT_clip")
if clip:
- if sc.mode == 'MASKEDITING':
+ if sc.mode == 'MASKEDIT':
sub.menu("CLIP_MT_mask")
else:
sub.menu("CLIP_MT_track")
sub.menu("CLIP_MT_reconstruction")
- if sc.mode != 'MASKEDITING':
+ if sc.mode != 'MASKEDIT':
layout.prop(sc, "view", text="", expand=True)
if clip:
@@ -59,7 +59,7 @@
layout.prop(sc, "mode", text="")
layout.prop(sc, "pivot_point", text="", icon_only=True)
- if sc.mode == 'MASKEDITING':
+ if sc.mode == 'MASKEDIT':
toolsettings = context.tool_settings
row = layout.row(align=True)
@@ -85,7 +85,7 @@
row = layout.row()
row.template_ID(sc, "clip", open='clip.open')
- if sc.mode == 'MASKEDITING':
+ if sc.mode == 'MASKEDIT':
row = layout.row()
row.template_ID(sc, "mask", new="mask.new")
@@ -127,7 +127,7 @@
sc = context.space_data
clip = sc.clip
- return clip and sc.view == 'CLIP' and sc.mode == 'MASKEDITING'
+ return clip and sc.view == 'CLIP' and sc.mode == 'MASKEDIT'
class CLIP_PT_tracking_panel:
@@ -428,7 +428,7 @@
if sc.mode == 'DISTORTION':
return sc.view == 'CLIP'
- elif sc.mode == 'MASKEDITING':
+ elif sc.mode == 'MASKEDIT':
return True
return False
@@ -619,7 +619,7 @@
col.prop(clip.tracking.camera, "k3")
-class CLIP_PT_mask_objects(Panel):
+class CLIP_PT_mask_layers(Panel):
bl_space_type = 'CLIP_EDITOR'
bl_region_type = 'UI'
bl_label = "Mask Layers"
@@ -628,7 +628,7 @@
def poll(cls, context):
sc = context.space_data
- return sc.mask and sc.mode == 'MASKEDITING'
+ return sc.mask and sc.mode == 'MASKEDIT'
def draw(self, context):
layout = self.layout
@@ -667,7 +667,7 @@
sc = context.space_data
mask = sc.mask
- if mask and sc.mode == 'MASKEDITING':
+ if mask and sc.mode == 'MASKEDIT':
return mask.layers.active and mask.layers.active.splines.active
return False
@@ -694,7 +694,7 @@
sc = context.space_data
mask = sc.mask
- if mask and sc.mode == 'MASKEDITING':
+ if mask and sc.mode == 'MASKEDIT':
return mask.layers.active and mask.layers.active.splines.active_point
return False
@@ -776,7 +776,7 @@
row = col.row()
row.prop(clip, "display_aspect", text="")
- if sc.mode == 'MASKEDITING':
+ if sc.mode == 'MASKEDIT':
col = layout.column()
col.prop(sc, "mask_draw_type", text="")
col.prop(sc, "show_mask_smooth")
@@ -791,7 +791,7 @@
def poll(cls, context):
sc = context.space_data
- return sc.mode != 'MASKEDITING'
+ return sc.mode != 'MASKEDIT'
def draw(self, context):
layout = self.layout
@@ -1138,7 +1138,7 @@
layout = self.layout
sc = context.space_data
- if sc.mode == 'MASKEDITING':
+ if sc.mode == 'MASKEDIT':
layout.operator("mask.select_border")
layout.operator("mask.select_circle")
Modified: trunk/blender/source/blender/editors/include/ED_clip.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_clip.h 2012-06-04 17:27:22 UTC (rev 47427)
+++ trunk/blender/source/blender/editors/include/ED_clip.h 2012-06-04 17:30:54 UTC (rev 47428)
@@ -49,8 +49,8 @@
int ED_space_clip_tracking_poll(struct bContext *C);
int ED_space_clip_tracking_size_poll(struct bContext *C);
int ED_space_clip_tracking_frame_poll(struct bContext *C);
-int ED_space_clip_maskediting_poll(struct bContext *C);
-int ED_space_clip_maskediting_mask_poll(bContext *C);
+int ED_space_clip_maskedit_poll(struct bContext *C);
+int ED_space_clip_maskedit_mask_poll(bContext *C);
void ED_space_clip_set(struct bContext *C, struct bScreen *screen, struct SpaceClip *sc, struct MovieClip *clip);
struct MovieClip *ED_space_clip(struct SpaceClip *sc);
Modified: trunk/blender/source/blender/editors/mask/mask_add.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_add.c 2012-06-04 17:27:22 UTC (rev 47427)
+++ trunk/blender/source/blender/editors/mask/mask_add.c 2012-06-04 17:30:54 UTC (rev 47428)
@@ -624,7 +624,7 @@
/* api callbacks */
ot->exec = add_vertex_exec;
ot->invoke = add_vertex_invoke;
- ot->poll = ED_maskediting_mask_poll;
+ ot->poll = ED_maskedit_mask_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -690,7 +690,7 @@
/* api callbacks */
ot->exec = add_feather_vertex_exec;
ot->invoke = add_feather_vertex_invoke;
- ot->poll = ED_maskediting_mask_poll;
+ ot->poll = ED_maskedit_mask_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Modified: trunk/blender/source/blender/editors/mask/mask_edit.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_edit.c 2012-06-04 17:27:22 UTC (rev 47427)
+++ trunk/blender/source/blender/editors/mask/mask_edit.c 2012-06-04 17:30:54 UTC (rev 47428)
@@ -50,23 +50,23 @@
/********************** generic poll functions *********************/
-int ED_maskediting_poll(bContext *C)
+int ED_maskedit_poll(bContext *C)
{
SpaceClip *sc = CTX_wm_space_clip(C);
if (sc) {
- return ED_space_clip_maskediting_poll(C);
+ return ED_space_clip_maskedit_poll(C);
}
return FALSE;
}
-int ED_maskediting_mask_poll(bContext *C)
+int ED_maskedit_mask_poll(bContext *C)
{
SpaceClip *sc = CTX_wm_space_clip(C);
if (sc) {
- return ED_space_clip_maskediting_mask_poll(C);
+ return ED_space_clip_maskedit_mask_poll(C);
}
return FALSE;
@@ -232,7 +232,7 @@
wmKeyMapItem *kmi;
keymap = WM_keymap_find(keyconf, "Mask Editing", 0, 0);
- keymap->poll = ED_maskediting_poll;
+ keymap->poll = ED_maskedit_poll;
WM_keymap_add_item(keymap, "MASK_OT_new", NKEY, KM_PRESS, KM_ALT, 0);
Modified: trunk/blender/source/blender/editors/mask/mask_intern.h
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_intern.h 2012-06-04 17:27:22 UTC (rev 47427)
+++ trunk/blender/source/blender/editors/mask/mask_intern.h 2012-06-04 17:30:54 UTC (rev 47428)
@@ -92,8 +92,8 @@
void ED_mask_select_flush_all(struct Mask *mask);
/* mask_editor.c */
-int ED_maskediting_poll(struct bContext *C);
-int ED_maskediting_mask_poll(struct bContext *C);
+int ED_maskedit_poll(struct bContext *C);
+int ED_maskedit_mask_poll(struct bContext *C);
void ED_mask_size(struct bContext *C, int *width, int *height);
void ED_mask_aspect(struct bContext *C, float *aspx, float *aspy);
Modified: trunk/blender/source/blender/editors/mask/mask_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_ops.c 2012-06-04 17:27:22 UTC (rev 47427)
+++ trunk/blender/source/blender/editors/mask/mask_ops.c 2012-06-04 17:30:54 UTC (rev 47428)
@@ -313,7 +313,7 @@
/* api callbacks */
ot->exec = masklay_new_exec;
- ot->poll = ED_maskediting_poll;
+ ot->poll = ED_maskedit_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -347,7 +347,7 @@
/* api callbacks */
ot->exec = masklay_remove_exec;
- ot->poll = ED_maskediting_poll;
+ ot->poll = ED_maskedit_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -754,7 +754,7 @@
/* api callbacks */
ot->invoke = slide_point_invoke;
ot->modal = slide_point_modal;
- ot->poll = ED_maskediting_mask_poll;
+ ot->poll = ED_maskedit_mask_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -797,7 +797,7 @@
/* api callbacks */
ot->exec = cyclic_toggle_exec;
- ot->poll = ED_maskediting_mask_poll;
+ ot->poll = ED_maskedit_mask_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -941,7 +941,7 @@
/* api callbacks */
ot->invoke = WM_operator_confirm;
ot->exec = delete_exec;
- ot->poll = ED_maskediting_mask_poll;
+ ot->poll = ED_maskedit_mask_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -992,7 +992,7 @@
/* api callbacks */
ot->exec = mask_switch_direction_exec;
- ot->poll = ED_maskediting_mask_poll;
+ ot->poll = ED_maskedit_mask_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -1051,7 +1051,7 @@
/* api callbacks */
ot->invoke = WM_menu_invoke;
ot->exec = set_handle_type_exec;
- ot->poll = ED_maskediting_mask_poll;
+ ot->poll = ED_maskedit_mask_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -1098,7 +1098,7 @@
/* api callbacks */
ot->exec = mask_hide_view_clear_exec;
- ot->poll = ED_maskediting_mask_poll;
+ ot->poll = ED_maskedit_mask_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -1159,7 +1159,7 @@
/* api callbacks */
ot->exec = mask_hide_view_set_exec;
- ot->poll = ED_maskediting_mask_poll;
+ ot->poll = ED_maskedit_mask_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
Modified: trunk/blender/source/blender/editors/mask/mask_relationships.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_relationships.c 2012-06-04 17:27:22 UTC (rev 47427)
+++ trunk/blender/source/blender/editors/mask/mask_relationships.c 2012-06-04 17:30:54 UTC (rev 47428)
@@ -88,7 +88,7 @@
/* api callbacks */
ot->exec = mask_parent_clear_exec;
- ot->poll = ED_maskediting_mask_poll;
+ ot->poll = ED_maskedit_mask_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ -167,7 +167,7 @@
//ot->invoke = mask_parent_set_invoke;
ot->exec = mask_parent_set_exec;
- ot->poll = ED_maskediting_mask_poll;
+ ot->poll = ED_maskedit_mask_poll;
/* flags */
ot->flag = OPTYPE_REGISTER | OPTYPE_UNDO;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list