diff options
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 30 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 12 |
2 files changed, 36 insertions, 6 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 5e364a3adf1..e794d194071 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -189,6 +189,7 @@ EnumPropertyItem rna_enum_viewport_shade_items[] = { EnumPropertyItem rna_enum_clip_editor_mode_items[] = { {SC_MODE_TRACKING, "TRACKING", ICON_ANIM_DATA, "Tracking", "Show tracking and solving tools"}, {SC_MODE_MASKEDIT, "MASK", ICON_MOD_MASK, "Mask", "Show mask editing tools"}, + {SC_MODE_CORRESPONDENCE, "CORRESPONDENCE", ICON_MOD_CORRESPONDENCE, "Correspondence", "Show correspondence editing tools"}, {0, NULL, 0, NULL, NULL} }; @@ -1558,6 +1559,14 @@ static void rna_SpaceClipEditor_clip_set(PointerRNA *ptr, PointerRNA value) ED_space_clip_set_clip(NULL, screen, sc, (MovieClip *)value.data); } +static void rna_SpaceClipEditor_secondary_clip_set(PointerRNA *ptr, PointerRNA value) +{ + SpaceClip *sc = (SpaceClip *)(ptr->data); + bScreen *screen = (bScreen *)ptr->id.data; + + ED_space_clip_set_secondary_clip(NULL, screen, sc, (MovieClip *)value.data); +} + static void rna_SpaceClipEditor_mask_set(PointerRNA *ptr, PointerRNA value) { SpaceClip *sc = (SpaceClip *)(ptr->data); @@ -1565,19 +1574,19 @@ static void rna_SpaceClipEditor_mask_set(PointerRNA *ptr, PointerRNA value) ED_space_clip_set_mask(NULL, sc, (Mask *)value.data); } -static void rna_SpaceClipEditor_clip_mode_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) +static void rna_SpaceClipEditor_clip_mode_update(bContext *C, PointerRNA *ptr) { SpaceClip *sc = (SpaceClip *)(ptr->data); sc->scopes.ok = 0; + + /* update split view if in correspondence mode */ + ED_clip_update_correspondence_mode(C, sc); } -static void rna_SpaceClipEditor_lock_selection_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) +static void rna_SpaceClipEditor_lock_selection_update(bContext *C, PointerRNA *ptr) { - SpaceClip *sc = (SpaceClip *)(ptr->data); - - sc->xlockof = 0.f; - sc->ylockof = 0.f; + ED_space_clip_region_set_lock_zero(C); } static void rna_SpaceClipEditor_view_type_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) @@ -4548,6 +4557,13 @@ static void rna_def_space_clip(BlenderRNA *brna) RNA_def_property_pointer_funcs(prop, NULL, "rna_SpaceClipEditor_clip_set", NULL, NULL); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL); + /* secondary movieclip */ + prop = RNA_def_property(srna, "secondary_clip", PROP_POINTER, PROP_NONE); + RNA_def_property_flag(prop, PROP_EDITABLE); + RNA_def_property_ui_text(prop, "Secondary Movie Clip", "Secondary Movie clip displayed and edited in this space"); + RNA_def_property_pointer_funcs(prop, NULL, "rna_SpaceClipEditor_secondary_clip_set", NULL, NULL); + RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, NULL); + /* clip user */ prop = RNA_def_property(srna, "clip_user", PROP_POINTER, PROP_NONE); RNA_def_property_flag(prop, PROP_NEVER_NULL); @@ -4565,6 +4581,7 @@ static void rna_def_space_clip(BlenderRNA *brna) RNA_def_property_enum_sdna(prop, NULL, "mode"); RNA_def_property_enum_items(prop, rna_enum_clip_editor_mode_items); RNA_def_property_ui_text(prop, "Mode", "Editing context being displayed"); + RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, "rna_SpaceClipEditor_clip_mode_update"); /* view */ @@ -4591,6 +4608,7 @@ static void rna_def_space_clip(BlenderRNA *brna) prop = RNA_def_property(srna, "lock_selection", PROP_BOOLEAN, PROP_NONE); RNA_def_property_ui_text(prop, "Lock to Selection", "Lock viewport to selected markers during playback"); RNA_def_property_boolean_sdna(prop, NULL, "flag", SC_LOCK_SELECTION); + RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); RNA_def_property_update(prop, NC_SPACE | ND_SPACE_CLIP, "rna_SpaceClipEditor_lock_selection_update"); /* lock to time cursor */ diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 74888bf4f00..6927abcb4f8 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -2911,6 +2911,18 @@ static void rna_def_userdef_theme_space_clip(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Selected Marker", "Color of selected marker"); RNA_def_property_update(prop, 0, "rna_userdef_update"); + prop = RNA_def_property(srna, "linked_marker", PROP_FLOAT, PROP_COLOR_GAMMA); + RNA_def_property_float_sdna(prop, NULL, "linked_marker"); + RNA_def_property_array(prop, 3); + RNA_def_property_ui_text(prop, "Linked Marker", "Color of linked marker"); + RNA_def_property_update(prop, 0, "rna_userdef_update"); + + prop = RNA_def_property(srna, "selected_linked_marker", PROP_FLOAT, PROP_COLOR_GAMMA); + RNA_def_property_float_sdna(prop, NULL, "sel_linked_marker"); + RNA_def_property_array(prop, 3); + RNA_def_property_ui_text(prop, "Selected Linked Marker", "Color of selected linked marker"); + RNA_def_property_update(prop, 0, "rna_userdef_update"); + prop = RNA_def_property(srna, "disabled_marker", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "dis_marker"); RNA_def_property_array(prop, 3); |