← Back to branch summary

~ubuntu-branches/ubuntu/trusty/blender/trusty

« back to all changes in this revision

Viewing changes to release/scripts/startup/bl_ui/space_time.py

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-03-06 12:08:47 UTC
  • mfrom: (1.5.1) (14.1.8 experimental)
  • Revision ID: package-import@ubuntu.com-20130306120847-frjfaryb2zrotwcg
Tags: 2.66a-1ubuntu1
https://launchpad.net/bugs/1076930
https://launchpad.net/bugs/1089256
https://launchpad.net/bugs/1052743
https://launchpad.net/bugs/999024
* Resynchronize with Debian (LP: #1076930, #1089256, #1052743, #999024,
  #1122888, #1147084)
* debian/control:
  - Lower build-depends on libavcodec-dev since we're not
    doing the libav9 transition in Ubuntu yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
release/scripts/startup/bl_ui/space_time.py
81
81
 
82
82
        row = layout.row(align=True)
83
83
        row.prop(toolsettings, "use_keyframe_insert_auto", text="", toggle=True)
84
 
        row.prop(toolsettings, "use_keyframe_insert_keyingset", text="", toggle=True)
85
 
        if screen.is_animation_playing and toolsettings.use_keyframe_insert_auto:
86
 
            subsub = row.row()
87
 
            subsub.prop(toolsettings, "use_record_with_nla", toggle=True)
 
84
        if toolsettings.use_keyframe_insert_auto:
 
85
            row.prop(toolsettings, "use_keyframe_insert_keyingset", text="", toggle=True)
 
86
 
 
87
            if screen.is_animation_playing:
 
88
                subsub = row.row()
 
89
                subsub.prop(toolsettings, "use_record_with_nla", toggle=True)
88
90
 
89
91
        row = layout.row(align=True)
90
92
        row.prop_search(scene.keying_sets_all, "active", scene, "keying_sets_all", text="")
125
127
 
126
128
        layout.operator("marker.camera_bind")
127
129
 
 
130
        layout.separator()
 
131
 
 
132
        layout.operator("screen.area_dupli")
 
133
        layout.operator("screen.screen_full_area")
 
134
 
128
135
 
129
136
class TIME_MT_cache(Menu):
130
137
    bl_label = "Cache"
145
152
        col.prop(st, "cache_cloth")
146
153
        col.prop(st, "cache_smoke")
147
154
        col.prop(st, "cache_dynamicpaint")
 
155
        col.prop(st, "cache_rigidbody")
148
156
 
149
157
 
150
158
class TIME_MT_frame(Menu):
158
166
 
159
167
        layout.separator()
160
168
 
161
 
        sub = layout.row()
162
 
        sub.menu("TIME_MT_autokey")
 
169
        layout.menu("TIME_MT_autokey")
163
170
 
164
171
 
165
172
class TIME_MT_playback(Menu):