diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2013-12-13 18:36:40 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2013-12-16 16:13:59 +0400 |
| commit | 63eb863d8da4daa8c003211ee0048c8ad10b87af (patch) | |
| tree | 6c9012fa06b91ddb0e27b2c6118238e57ed5e606 /source/blender | |
| parent | 0f934ee3b7192aacafe8287d8521f22ecfbdfe2e (diff) | |
Add optional 'frame' argument to scene.timeline_markers.new(name)
Differential Revision: http://developer.blender.org/D101
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 104b68ef451..adc0f7ad892 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1382,11 +1382,11 @@ static void rna_GameSettings_exit_key_set(PointerRNA *ptr, int value) gm->exitkey = value; } -static TimeMarker *rna_TimeLine_add(Scene *scene, const char name[]) +static TimeMarker *rna_TimeLine_add(Scene *scene, const char name[], int frame) { TimeMarker *marker = MEM_callocN(sizeof(TimeMarker), "TimeMarker"); marker->flag = SELECT; - marker->frame = 1; + marker->frame = frame; BLI_strncpy_utf8(marker->name, name, sizeof(marker->name)); BLI_addtail(&scene->markers, marker); @@ -4912,7 +4912,7 @@ static void rna_def_timeline_markers(BlenderRNA *brna, PropertyRNA *cprop) RNA_def_function_ui_description(func, "Add a keyframe to the curve"); parm = RNA_def_string(func, "name", "Marker", 0, "", "New name for the marker (not unique)"); RNA_def_property_flag(parm, PROP_REQUIRED); - + parm = RNA_def_int(func, "frame", 1, -MAXFRAME, MAXFRAME, "", "The frame for the new marker", -MAXFRAME, MAXFRAME); parm = RNA_def_pointer(func, "marker", "TimelineMarker", "", "Newly created timeline marker"); RNA_def_function_return(func, parm); |