diff options
author | Thomas Dinges <blender@dingto.org> | 2009-08-17 02:01:20 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2009-08-17 02:01:20 +0400 |
commit | 2cf5b528569e22892bff4aee179ea949278145f3 (patch) | |
tree | e097257b1323beadbf7d3d55caf2fb8d5867adb9 | |
parent | 64fb0667b29e9c174c3df88ea1f664f45630348f (diff) |
2.5 Timeline:
* Finally the header and menus are done via python.
* Added RNA for sync audio.
Note: This is just a basic working version in python. It needs more work and some layout changes.
Joshua: Feel free to adjust this further :)
-rw-r--r-- | release/ui/space_time.py | 8 | ||||
-rw-r--r-- | source/blender/editors/space_time/space_time.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/release/ui/space_time.py b/release/ui/space_time.py index 26e55bac016..427d52650b3 100644 --- a/release/ui/space_time.py +++ b/release/ui/space_time.py @@ -9,6 +9,7 @@ class TIME_HT_header(bpy.types.Header): st = context.space_data scene = context.scene + rd = context.scene.render_data tools = context.tool_settings screen = context.screen @@ -47,10 +48,11 @@ class TIME_HT_header(bpy.types.Header): sub = row.row() sub.scale_x = 2.0 sub.itemO("screen.animation_play", text="", icon='ICON_PAUSE') - row.item_booleanO("screen.keyframe_jump", "next", True, text="", icon='ICON_NEXT_KEYFRAME') row.item_booleanO("screen.frame_jump", "end", True, text="", icon='ICON_FF') + layout.itemS() + row = layout.row(align=True) row.itemR(tools, "enable_auto_key", text="", toggle=True, icon='ICON_REC') sub = row.row() @@ -59,6 +61,10 @@ class TIME_HT_header(bpy.types.Header): layout.itemS() + layout.itemR(rd, "sync_audio", text="", toggle=True, icon='ICON_SPEAKER') + + layout.itemS() + row = layout.row(align=True) row.itemR(scene, "active_keyingset") row.itemO("anim.insert_keyframe", text="", icon="ICON_KEY_HLT") diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c index 77ad832e4e9..784b151f909 100644 --- a/source/blender/editors/space_time/space_time.c +++ b/source/blender/editors/space_time/space_time.c @@ -270,7 +270,7 @@ static void time_main_area_listener(ARegion *ar, wmNotifier *wmn) /* ************************ header time area region *********************** */ -//#define PY_HEADER +#define PY_HEADER /* add handlers, stuff you only do once or on area/region changes */ static void time_header_area_init(wmWindowManager *wm, ARegion *ar) { diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 8b8da209f5e..7c730e1d242 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -1421,6 +1421,11 @@ static void rna_def_scene_render_data(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Fields Still", "Disable the time difference between fields."); RNA_def_property_update(prop, NC_SCENE|ND_RENDER_OPTIONS, NULL); + prop= RNA_def_property(srna, "sync_audio", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "audio.flag", AUDIO_SYNC); + RNA_def_property_ui_text(prop, "Sync Audio", "Play back and sync with audio from Sequence Editor"); + RNA_def_property_update(prop, NC_SCENE, NULL); + prop= RNA_def_property(srna, "render_shadows", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "mode", R_SHADOW); RNA_def_property_ui_text(prop, "Render Shadows", "Calculate shadows while rendering."); |