diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-06 14:25:59 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-06 14:25:59 +0400 |
| commit | 870ba8aa13c87fdeb1724d0f3ad7b7a4b53a4d32 (patch) | |
| tree | b20f227ec19530eab04c9a54e8cf7faaf16f634d /source/blender/makesrna/intern/rna_movieclip.c | |
| parent | 2202aaa083b99a4c37c20fbaf34e370d4e78c839 (diff) | |
| parent | 8849a789702a9be0c06ecc850845c3bb3af0d0fd (diff) | |
svn merge ^/trunk/blender -r47423:47506
Diffstat (limited to 'source/blender/makesrna/intern/rna_movieclip.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_movieclip.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_movieclip.c b/source/blender/makesrna/intern/rna_movieclip.c index 13c11f6402f..26d967dfb42 100644 --- a/source/blender/makesrna/intern/rna_movieclip.c +++ b/source/blender/makesrna/intern/rna_movieclip.c @@ -285,6 +285,19 @@ static void rna_def_movieclip(BlenderRNA *brna) RNA_def_property_struct_type(prop, "GreasePencil"); RNA_def_property_ui_text(prop, "Grease Pencil", "Grease pencil data for this movie clip"); RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL); + + /* use custom offset */ + prop = RNA_def_property(srna, "use_custom_start_frame", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "flag", MCLIP_CUSTOM_START_FRAME); + RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); + RNA_def_property_ui_text(prop, "Custom Start Frame", "Use custom first frame offset instead of automatic frame number"); + RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_MovieClip_reload_update"); + + /* frame offset */ + prop = RNA_def_property(srna, "start_frame", PROP_INT, PROP_NONE); + RNA_def_property_int_sdna(prop, NULL, "start_frame"); + RNA_def_property_ui_text(prop, "Start Frame", "Number of frame from sequence or movie displaying at scene frame #1"); + RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, "rna_MovieClip_reload_update"); } void RNA_def_movieclip(BlenderRNA *brna) |