Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2009-12-08 10:11:43 +0300
committerCampbell Barton <ideasman42@gmail.com>2009-12-08 10:11:43 +0300
commitf4fa39a55122d1f9031c355f52860fbe2ca8ca6b (patch)
tree2d9dba8f57be89bdbec16086b136f1606d49a39f
parent53f94f92a1a84c44376722a4a642766f53b3ab24 (diff)
white space commit (spaces -> tabs and clearing whitespace)
-rw-r--r--release/scripts/modules/rigify/__init__.py2
-rw-r--r--release/scripts/modules/rigify/arm.py2
-rw-r--r--release/scripts/modules/rigify/delta.py6
-rw-r--r--release/scripts/modules/rigify/neck.py12
-rw-r--r--release/scripts/modules/rigify/palm.py2
-rw-r--r--release/scripts/modules/rigify/spine.py12
-rw-r--r--release/scripts/modules/rna_prop_ui.py2
-rw-r--r--release/scripts/ui/space_dopesheet.py216
-rw-r--r--release/scripts/ui/space_graph.py224
-rw-r--r--release/scripts/ui/space_nla.py176
10 files changed, 327 insertions, 327 deletions
diff --git a/release/scripts/modules/rigify/__init__.py b/release/scripts/modules/rigify/__init__.py
index c2568d3eb5d..cf6e17a895f 100644
--- a/release/scripts/modules/rigify/__init__.py
+++ b/release/scripts/modules/rigify/__init__.py
@@ -450,7 +450,7 @@ def generate_rig(context, obj_orig, prefix="ORG-"):
if bone_name not in bone_typeinfos:
continue
-
+
bone_def_dict = bone_definitions[bone_name]
# Only blend results from the same submodule, eg.
diff --git a/release/scripts/modules/rigify/arm.py b/release/scripts/modules/rigify/arm.py
index fff52aa3ab4..2145109cd55 100644
--- a/release/scripts/modules/rigify/arm.py
+++ b/release/scripts/modules/rigify/arm.py
@@ -64,7 +64,7 @@ def metarig_definition(obj, orig_bone_name):
mt.update()
mt.shoulder_p = mt.arm_p.parent
-
+
if not mt.shoulder_p:
raise Exception("could not find 'arm' parent, skipping:", orig_bone_name)
print(mt.shoulder_p)
diff --git a/release/scripts/modules/rigify/delta.py b/release/scripts/modules/rigify/delta.py
index fedb417ee67..00d79ed33df 100644
--- a/release/scripts/modules/rigify/delta.py
+++ b/release/scripts/modules/rigify/delta.py
@@ -86,14 +86,14 @@ def main(obj, bone_definition, base_names):
del child_pbone
bpy.ops.object.mode_set(mode='OBJECT')
-
-
+
+
# Move the child bone to the deltas location
obj.animation_data_create()
delta_pbone = obj.pose.bones[delta_name]
# child_pbone = obj.pose.bones[child_name]
-
+
# ------------------- drivers
delta_pbone.rotation_mode = 'XYZ'
diff --git a/release/scripts/modules/rigify/neck.py b/release/scripts/modules/rigify/neck.py
index 6963bfbfb8d..d20c231c0f8 100644
--- a/release/scripts/modules/rigify/neck.py
+++ b/release/scripts/modules/rigify/neck.py
@@ -161,7 +161,7 @@ def main(obj, bone_definition, base_names):
neck_e_parent.head = neck_e.head
neck_e_parent.tail = neck_e.head + ((mt.head_e.tail - mt.head_e.head).normalize() * neck_chain_segment_length / 2.0)
neck_e_parent.roll = neck_e.roll
-
+
orig_parent = neck_e.parent
neck_e.connected = False
@@ -221,7 +221,7 @@ def main(obj, bone_definition, base_names):
head_driver_path = mt.head_p.path_to_id()
target_names = [("b%.2d" % (i + 1)) for i in range(len(neck_chain))]
-
+
mt.head_p["bend_tot"] = 0.0
fcurve = mt.head_p.driver_add('["bend_tot"]', 0)
driver = fcurve.driver
@@ -234,7 +234,7 @@ def main(obj, bone_definition, base_names):
tar.id_type = 'OBJECT'
tar.id = obj
tar.rna_path = head_driver_path + ('["bend_%.2d"]' % (i + 1))
-
+
for i, attr in enumerate(mt_chain.attr_names):
neck_p = getattr(mt_chain, attr + "_p")
@@ -264,9 +264,9 @@ def main(obj, bone_definition, base_names):
driver = fcurve.driver
driver.type = 'SCRIPTED'
driver.expression = "bend/bend_tot"
-
+
fcurve.modifiers.remove(0) # grr dont need a modifier
-
+
# add target
tar = driver.targets.new()
@@ -274,7 +274,7 @@ def main(obj, bone_definition, base_names):
tar.id_type = 'OBJECT'
tar.id = obj
tar.rna_path = head_driver_path + ('["bend_tot"]')
-
+
tar = driver.targets.new()
tar.name = "bend"
tar.id_type = 'OBJECT'
diff --git a/release/scripts/modules/rigify/palm.py b/release/scripts/modules/rigify/palm.py
index 0d85d60fad5..a0b86007974 100644
--- a/release/scripts/modules/rigify/palm.py
+++ b/release/scripts/modules/rigify/palm.py
@@ -85,7 +85,7 @@ def metarig_definition(obj, orig_bone_name):
[pinky, ring... etc]
'''
arm = obj.data
-
+
palm_bone = arm.bones[orig_bone_name]
palm_parent = palm_bone.parent
palm_base = palm_bone.basename
diff --git a/release/scripts/modules/rigify/spine.py b/release/scripts/modules/rigify/spine.py
index 23af154520a..d714214adfb 100644
--- a/release/scripts/modules/rigify/spine.py
+++ b/release/scripts/modules/rigify/spine.py
@@ -110,7 +110,7 @@ def metarig_definition(obj, orig_bone_name):
raise Exception("expected the ribcage to have only 1 child.")
child = children[0]
-
+
bone_definition = [pelvis.name, ribcage.name, child.name]
bone_definition.extend([child.name for child in child.children_recursive_basename])
return bone_definition
@@ -389,7 +389,7 @@ def main(obj, bone_definition, base_names):
driver = fcurve.driver
driver.type = 'SUM'
fcurve.modifiers.remove(0) # grr dont need a modifier
-
+
for i in range(spine_chain_len - 1):
tar = driver.targets.new()
tar.name = target_names[i]
@@ -422,9 +422,9 @@ def main(obj, bone_definition, base_names):
driver = fcurve.driver
driver.type = 'SCRIPTED'
driver.expression = "bend/bend_tot"
-
+
fcurve.modifiers.remove(0) # grr dont need a modifier
-
+
# add target
tar = driver.targets.new()
@@ -432,13 +432,13 @@ def main(obj, bone_definition, base_names):
tar.id_type = 'OBJECT'
tar.id = obj
tar.rna_path = rib_driver_path + ('["bend_tot"]')
-
+
tar = driver.targets.new()
tar.name = "bend"
tar.id_type = 'OBJECT'
tar.id = obj
tar.rna_path = rib_driver_path + ('["%s"]' % prop_name)
-
+
# original bone drivers
diff --git a/release/scripts/modules/rna_prop_ui.py b/release/scripts/modules/rna_prop_ui.py
index ca452da7f73..dd71da74d35 100644
--- a/release/scripts/modules/rna_prop_ui.py
+++ b/release/scripts/modules/rna_prop_ui.py
@@ -217,7 +217,7 @@ class WM_OT_properties_edit(bpy.types.Operator):
wm.invoke_props_popup(self, event)
return ('RUNNING_MODAL',)
-
+
class WM_OT_properties_add(bpy.types.Operator):
diff --git a/release/scripts/ui/space_dopesheet.py b/release/scripts/ui/space_dopesheet.py
index db01134604e..a669140d38e 100644
--- a/release/scripts/ui/space_dopesheet.py
+++ b/release/scripts/ui/space_dopesheet.py
@@ -20,167 +20,167 @@ import bpy
class DOPESHEET_HT_header(bpy.types.Header):
- bl_space_type = 'DOPESHEET_EDITOR'
+ bl_space_type = 'DOPESHEET_EDITOR'
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- st = context.space_data
+ st = context.space_data
- row = layout.row(align=True)
- row.template_header()
+ row = layout.row(align=True)
+ row.template_header()
- if context.area.show_menus:
- sub = row.row(align=True)
+ if context.area.show_menus:
+ sub = row.row(align=True)
- sub.menu("DOPESHEET_MT_view")
- sub.menu("DOPESHEET_MT_select")
+ sub.menu("DOPESHEET_MT_view")
+ sub.menu("DOPESHEET_MT_select")
- if st.mode == 'DOPESHEET' or (st.mode == 'ACTION' and st.action != None):
- sub.menu("DOPESHEET_MT_channel")
- elif st.mode == 'GPENCIL':
- # gpencil Channel menu
- pass
+ if st.mode == 'DOPESHEET' or (st.mode == 'ACTION' and st.action != None):
+ sub.menu("DOPESHEET_MT_channel")
+ elif st.mode == 'GPENCIL':
+ # gpencil Channel menu
+ pass
- if st.mode != 'GPENCIL':
- sub.menu("DOPESHEET_MT_key")
+ if st.mode != 'GPENCIL':
+ sub.menu("DOPESHEET_MT_key")
- layout.prop(st, "mode", text="")
- layout.prop(st.dopesheet, "display_summary", text="Summary")
+ layout.prop(st, "mode", text="")
+ layout.prop(st.dopesheet, "display_summary", text="Summary")
- if st.mode == 'DOPESHEET':
- layout.template_dopesheet_filter(st.dopesheet)
- elif st.mode == 'ACTION':
- layout.template_ID(st, "action", new="action.new")
+ if st.mode == 'DOPESHEET':
+ layout.template_dopesheet_filter(st.dopesheet)
+ elif st.mode == 'ACTION':
+ layout.template_ID(st, "action", new="action.new")
- if st.mode != 'GPENCIL':
- layout.prop(st, "autosnap", text="")
+ if st.mode != 'GPENCIL':
+ layout.prop(st, "autosnap", text="")
- row = layout.row(align=True)
- row.operator("action.copy", text="", icon='ICON_COPYDOWN')
- row.operator("action.paste", text="", icon='ICON_PASTEDOWN')
+ row = layout.row(align=True)
+ row.operator("action.copy", text="", icon='ICON_COPYDOWN')
+ row.operator("action.paste", text="", icon='ICON_PASTEDOWN')
class DOPESHEET_MT_view(bpy.types.Menu):
- bl_label = "View"
+ bl_label = "View"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- st = context.space_data
+ st = context.space_data
- layout.column()
+ layout.column()
- layout.prop(st, "show_cframe_indicator")
- layout.prop(st, "show_sliders")
- layout.prop(st, "automerge_keyframes")
+ layout.prop(st, "show_cframe_indicator")
+ layout.prop(st, "show_sliders")
+ layout.prop(st, "automerge_keyframes")
- if st.show_seconds:
- layout.operator("anim.time_toggle", text="Show Frames")
- else:
- layout.operator("anim.time_toggle", text="Show Seconds")
+ if st.show_seconds:
+ layout.operator("anim.time_toggle", text="Show Frames")
+ else:
+ layout.operator("anim.time_toggle", text="Show Seconds")
- layout.separator()
- layout.operator("anim.previewrange_set")
- layout.operator("anim.previewrange_clear")
- layout.operator("action.previewrange_set")
+ layout.separator()
+ layout.operator("anim.previewrange_set")
+ layout.operator("anim.previewrange_clear")
+ layout.operator("action.previewrange_set")
- layout.separator()
- layout.operator("action.frame_jump")
- layout.operator("action.view_all")
+ layout.separator()
+ layout.operator("action.frame_jump")
+ layout.operator("action.view_all")
- layout.separator()
- layout.operator("screen.area_dupli")
- layout.operator("screen.screen_full_area")
+ layout.separator()
+ layout.operator("screen.area_dupli")
+ layout.operator("screen.screen_full_area")
class DOPESHEET_MT_select(bpy.types.Menu):
- bl_label = "Select"
+ bl_label = "Select"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- # This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
- layout.operator("action.select_all_toggle")
- layout.operator("action.select_all_toggle", text="Invert Selection").invert = True
+ layout.column()
+ # This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
+ layout.operator("action.select_all_toggle")
+ layout.operator("action.select_all_toggle", text="Invert Selection").invert = True
- layout.separator()
- layout.operator("action.select_border")
- layout.operator("action.select_border", text="Border Axis Range").axis_range = True
+ layout.separator()
+ layout.operator("action.select_border")
+ layout.operator("action.select_border", text="Border Axis Range").axis_range = True
- layout.separator()
- layout.operator("action.select_column", text="Columns on Selected Keys").mode = 'KEYS'
- layout.operator("action.select_column", text="Column on Current Frame").mode = 'CFRA'
+ layout.separator()
+ layout.operator("action.select_column", text="Columns on Selected Keys").mode = 'KEYS'
+ layout.operator("action.select_column", text="Column on Current Frame").mode = 'CFRA'
- layout.operator("action.select_column", text="Columns on Selected Markers").mode = 'MARKERS_COLUMN'
- layout.operator("action.select_column", text="Between Selected Markers").mode = 'MARKERS_BETWEEN'
+ layout.operator("action.select_column", text="Columns on Selected Markers").mode = 'MARKERS_COLUMN'
+ layout.operator("action.select_column", text="Between Selected Markers").mode = 'MARKERS_BETWEEN'
class DOPESHEET_MT_channel(bpy.types.Menu):
- bl_label = "Channel"
+ bl_label = "Channel"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- layout.operator("anim.channels_setting_toggle")
- layout.operator("anim.channels_setting_enable")
- layout.operator("anim.channels_setting_disable")
+ layout.column()
+ layout.operator("anim.channels_setting_toggle")
+ layout.operator("anim.channels_setting_enable")
+ layout.operator("anim.channels_setting_disable")
- layout.separator()
- layout.operator("anim.channels_editable_toggle")
+ layout.separator()
+ layout.operator("anim.channels_editable_toggle")
- layout.separator()
- layout.operator("anim.channels_expand")
- layout.operator("anim.channels_collapse")
+ layout.separator()
+ layout.operator("anim.channels_expand")
+ layout.operator("anim.channels_collapse")
class DOPESHEET_MT_key(bpy.types.Menu):
- bl_label = "Key"
+ bl_label = "Key"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- layout.menu("DOPESHEET_MT_key_transform", text="Transform")
+ layout.column()
+ layout.menu("DOPESHEET_MT_key_transform", text="Transform")
- layout.operator_menu_enum("action.snap", property="type", text="Snap")
- layout.operator_menu_enum("action.mirror", property="type", text="Mirror")
+ layout.operator_menu_enum("action.snap", property="type", text="Snap")
+ layout.operator_menu_enum("action.mirror", property="type", text="Mirror")
- layout.separator()
- # Inconsistent naming? act/action
- layout.operator("act.keyframe_insert")
+ layout.separator()
+ # Inconsistent naming? act/action
+ layout.operator("act.keyframe_insert")
- layout.separator()
- layout.operator("action.duplicate")
- layout.operator("action.delete")
+ layout.separator()
+ layout.operator("action.duplicate")
+ layout.operator("action.delete")
- layout.separator()
- layout.operator_menu_enum("action.keyframe_type", property="type", text="Keyframe Type")
- layout.operator_menu_enum("action.handle_type", property="type", text="Handle Type")
- layout.operator_menu_enum("action.interpolation_type", property="type", text="Interpolation Mode")
- layout.operator_menu_enum("action.extrapolation_type", property="type", text="Extrapolation Mode")
+ layout.separator()
+ layout.operator_menu_enum("action.keyframe_type", property="type", text="Keyframe Type")
+ layout.operator_menu_enum("action.handle_type", property="type", text="Handle Type")
+ layout.operator_menu_enum("action.interpolation_type", property="type", text="Interpolation Mode")
+ layout.operator_menu_enum("action.extrapolation_type", property="type", text="Extrapolation Mode")
- layout.separator()
- layout.operator("action.clean")
- layout.operator("action.sample")
+ layout.separator()
+ layout.operator("action.clean")
+ layout.operator("action.sample")
- layout.separator()
- layout.operator("action.copy")
- layout.operator("action.paste")
+ layout.separator()
+ layout.operator("action.copy")
+ layout.operator("action.paste")
class DOPESHEET_MT_key_transform(bpy.types.Menu):
- bl_label = "Transform"
+ bl_label = "Transform"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- layout.operator("tfm.translate", text="Grab/Move")
- layout.operator("tfm.transform", text="Extend").mode = 'TIME_EXTEND'
- layout.operator("tfm.resize", text="Scale")
+ layout.column()
+ layout.operator("tfm.translate", text="Grab/Move")
+ layout.operator("tfm.transform", text="Extend").mode = 'TIME_EXTEND'
+ layout.operator("tfm.resize", text="Scale")
bpy.types.register(DOPESHEET_HT_header) # header/menu classes
diff --git a/release/scripts/ui/space_graph.py b/release/scripts/ui/space_graph.py
index b9f5364da3a..c24bf460147 100644
--- a/release/scripts/ui/space_graph.py
+++ b/release/scripts/ui/space_graph.py
@@ -20,171 +20,171 @@ import bpy
class GRAPH_HT_header(bpy.types.Header):
- bl_space_type = 'GRAPH_EDITOR'
+ bl_space_type = 'GRAPH_EDITOR'
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- st = context.space_data
+ st = context.space_data
- row = layout.row(align=True)
- row.template_header()
+ row = layout.row(align=True)
+ row.template_header()
- if context.area.show_menus:
- sub = row.row(align=True)
+ if context.area.show_menus:
+ sub = row.row(align=True)
- sub.menu("GRAPH_MT_view")
- sub.menu("GRAPH_MT_select")
- sub.menu("GRAPH_MT_channel")
- sub.menu("GRAPH_MT_key")
+ sub.menu("GRAPH_MT_view")
+ sub.menu("GRAPH_MT_select")
+ sub.menu("GRAPH_MT_channel")
+ sub.menu("GRAPH_MT_key")
- layout.prop(st, "mode", text="")
+ layout.prop(st, "mode", text="")
- layout.template_dopesheet_filter(st.dopesheet)
+ layout.template_dopesheet_filter(st.dopesheet)
- layout.prop(st, "autosnap", text="")
- layout.prop(st, "pivot_point", text="", icon_only=True)
+ layout.prop(st, "autosnap", text="")
+ layout.prop(st, "pivot_point", text="", icon_only=True)
- row = layout.row(align=True)
- row.operator("graph.copy", text="", icon='ICON_COPYDOWN')
- row.operator("graph.paste", text="", icon='ICON_PASTEDOWN')
+ row = layout.row(align=True)
+ row.operator("graph.copy", text="", icon='ICON_COPYDOWN')
+ row.operator("graph.paste", text="", icon='ICON_PASTEDOWN')
- row = layout.row(align=True)
- if st.has_ghost_curves:
- row.operator("graph.ghost_curves_clear", text="", icon='ICON_GHOST_DISABLED')
- else:
- row.operator("graph.ghost_curves_create", text="", icon='ICON_GHOST_ENABLED')
+ row = layout.row(align=True)
+ if st.has_ghost_curves:
+ row.operator("graph.ghost_curves_clear", text="", icon='ICON_GHOST_DISABLED')
+ else:
+ row.operator("graph.ghost_curves_create", text="", icon='ICON_GHOST_ENABLED')
class GRAPH_MT_view(bpy.types.Menu):
- bl_label = "View"
+ bl_label = "View"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- st = context.space_data
+ st = context.space_data
- layout.column()
+ layout.column()
- layout.separator()
- layout.operator("graph.properties", icon="ICON_MENU_PANEL")
+ layout.separator()
+ layout.operator("graph.properties", icon="ICON_MENU_PANEL")
- layout.prop(st, "show_cframe_indicator")
- layout.prop(st, "show_cursor")
- layout.prop(st, "show_sliders")
- layout.prop(st, "automerge_keyframes")
+ layout.prop(st, "show_cframe_indicator")
+ layout.prop(st, "show_cursor")
+ layout.prop(st, "show_sliders")
+ layout.prop(st, "automerge_keyframes")
- layout.separator()
- if st.show_handles:
- layout.operator("graph.handles_view_toggle", icon="ICON_CHECKBOX_HLT", text="Show All Handles")
- else:
- layout.operator("graph.handles_view_toggle", icon="ICON_CHECKBOX_DEHLT", text="Show All Handles")
- layout.prop(st, "only_selected_curves_handles")
- layout.prop(st, "only_selected_keyframe_handles")
- layout.operator("anim.time_toggle")
+ layout.separator()
+ if st.show_handles:
+ layout.operator("graph.handles_view_toggle", icon="ICON_CHECKBOX_HLT", text="Show All Handles")
+ else:
+ layout.operator("graph.handles_view_toggle", icon="ICON_CHECKBOX_DEHLT", text="Show All Handles")
+ layout.prop(st, "only_selected_curves_handles")
+ layout.prop(st, "only_selected_keyframe_handles")
+ layout.operator("anim.time_toggle")
- layout.separator()
- layout.operator("anim.previewrange_set")
- layout.operator("anim.previewrange_clear")
- layout.operator("graph.previewrange_set")
+ layout.separator()
+ layout.operator("anim.previewrange_set")
+ layout.operator("anim.previewrange_clear")
+ layout.operator("graph.previewrange_set")
- layout.separator()
- layout.operator("graph.frame_jump")
- layout.operator("graph.view_all")
+ layout.separator()
+ layout.operator("graph.frame_jump")
+ layout.operator("graph.view_all")
- layout.separator()
- layout.operator("screen.area_dupli")
- layout.operator("screen.screen_full_area")
+ layout.separator()
+ layout.operator("screen.area_dupli")
+ layout.operator("screen.screen_full_area")
class GRAPH_MT_select(bpy.types.Menu):
- bl_label = "Select"
+ bl_label = "Select"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- # This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
- layout.operator("graph.select_all_toggle")
- layout.operator("graph.select_all_toggle", text="Invert Selection").invert = True
+ layout.column()
+ # This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
+ layout.operator("graph.select_all_toggle")
+ layout.operator("graph.select_all_toggle", text="Invert Selection").invert = True
- layout.separator()
- layout.operator("graph.select_border")
- layout.operator("graph.select_border", text="Border Axis Range").axis_range = True
+ layout.separator()
+ layout.operator("graph.select_border")
+ layout.operator("graph.select_border", text="Border Axis Range").axis_range = True
- layout.separator()
- layout.operator("graph.select_column", text="Columns on Selected Keys").mode = 'KEYS'
- layout.operator("graph.select_column", text="Column on Current Frame").mode = 'CFRA'
+ layout.separator()
+ layout.operator("graph.select_column", text="Columns on Selected Keys").mode = 'KEYS'
+ layout.operator("graph.select_column", text="Column on Current Frame").mode = 'CFRA'
- layout.operator("graph.select_column", text="Columns on Selected Markers").mode = 'MARKERS_COLUMN'
- layout.operator("graph.select_column", text="Between Selected Markers").mode = 'MARKERS_BETWEEN'
+ layout.operator("graph.select_column", text="Columns on Selected Markers").mode = 'MARKERS_COLUMN'
+ layout.operator("graph.select_column", text="Between Selected Markers").mode = 'MARKERS_BETWEEN'
class GRAPH_MT_channel(bpy.types.Menu):
- bl_label = "Channel"
+ bl_label = "Channel"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- layout.operator("anim.channels_setting_toggle")
- layout.operator("anim.channels_setting_enable")
- layout.operator("anim.channels_setting_disable")
+ layout.column()
+ layout.operator("anim.channels_setting_toggle")
+ layout.operator("anim.channels_setting_enable")
+ layout.operator("anim.channels_setting_disable")
- layout.separator()
- layout.operator("anim.channels_editable_toggle")
+ layout.separator()
+ layout.operator("anim.channels_editable_toggle")
- layout.separator()
- layout.operator("anim.channels_expand")
- layout.operator("anim.channels_collapse")
+ layout.separator()
+ layout.operator("anim.channels_expand")
+ layout.operator("anim.channels_collapse")
class GRAPH_MT_key(bpy.types.Menu):
- bl_label = "Key"
+ bl_label = "Key"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- layout.menu("GRAPH_MT_key_transform", text="Transform")
+ layout.column()
+ layout.menu("GRAPH_MT_key_transform", text="Transform")
- layout.operator_menu_enum("graph.snap", property="type", text="Snap")
- layout.operator_menu_enum("graph.mirror", property="type", text="Mirror")
+ layout.operator_menu_enum("graph.snap", property="type", text="Snap")
+ layout.operator_menu_enum("graph.mirror", property="type", text="Mirror")
- layout.separator()
- layout.operator("graph.keyframe_insert")
- layout.operator("graph.fmodifier_add")
+ layout.separator()
+ layout.operator("graph.keyframe_insert")
+ layout.operator("graph.fmodifier_add")
- layout.separator()
- layout.operator("graph.duplicate")
- layout.operator("graph.delete")
+ layout.separator()
+ layout.operator("graph.duplicate")
+ layout.operator("graph.delete")
- layout.separator()
- layout.operator_menu_enum("graph.handle_type", property="type", text="Handle Type")
- layout.operator_menu_enum("graph.interpolation_type", property="type", text="Interpolation Mode")
- layout.operator_menu_enum("graph.extrapolation_type", property="type", text="Extrapolation Mode")
+ layout.separator()
+ layout.operator_menu_enum("graph.handle_type", property="type", text="Handle Type")
+ layout.operator_menu_enum("graph.interpolation_type", property="type", text="Interpolation Mode")
+ layout.operator_menu_enum("graph.extrapolation_type", property="type", text="Extrapolation Mode")
- layout.separator()
- layout.operator("graph.clean")
- layout.operator("graph.sample")
- layout.operator("graph.bake")
+ layout.separator()
+ layout.operator("graph.clean")
+ layout.operator("graph.sample")
+ layout.operator("graph.bake")
- layout.separator()
- layout.operator("graph.copy")
- layout.operator("graph.paste")
+ layout.separator()
+ layout.operator("graph.copy")
+ layout.operator("graph.paste")
class GRAPH_MT_key_transform(bpy.types.Menu):
- bl_label = "Transform"
+ bl_label = "Transform"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- layout.operator("tfm.translate", text="Grab/Move")
- layout.operator("tfm.transform", text="Extend").mode = 'TIME_EXTEND'
- layout.operator("tfm.rotate", text="Rotate")
- layout.operator("tfm.resize", text="Scale")
+ layout.column()
+ layout.operator("tfm.translate", text="Grab/Move")
+ layout.operator("tfm.transform", text="Extend").mode = 'TIME_EXTEND'
+ layout.operator("tfm.rotate", text="Rotate")
+ layout.operator("tfm.resize", text="Scale")
bpy.types.register(GRAPH_HT_header) # header/menu classes
diff --git a/release/scripts/ui/space_nla.py b/release/scripts/ui/space_nla.py
index bdcb6883ab3..d17e5e0b8cb 100644
--- a/release/scripts/ui/space_nla.py
+++ b/release/scripts/ui/space_nla.py
@@ -20,142 +20,142 @@ import bpy
class NLA_HT_header(bpy.types.Header):
- bl_space_type = 'NLA_EDITOR'
+ bl_space_type = 'NLA_EDITOR'
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- st = context.space_data
+ st = context.space_data
- row = layout.row(align=True)
- row.template_header()
+ row = layout.row(align=True)
+ row.template_header()
- if context.area.show_menus:
- sub = row.row(align=True)
+ if context.area.show_menus:
+ sub = row.row(align=True)
- sub.menu("NLA_MT_view")
- sub.menu("NLA_MT_select")
- sub.menu("NLA_MT_edit")
- sub.menu("NLA_MT_add")
+ sub.menu("NLA_MT_view")
+ sub.menu("NLA_MT_select")
+ sub.menu("NLA_MT_edit")
+ sub.menu("NLA_MT_add")
- layout.template_dopesheet_filter(st.dopesheet)
+ layout.template_dopesheet_filter(st.dopesheet)
- layout.prop(st, "autosnap", text="")
+ layout.prop(st, "autosnap", text="")
class NLA_MT_view(bpy.types.Menu):
- bl_label = "View"
+ bl_label = "View"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- st = context.space_data
+ st = context.space_data
- layout.column()
+ layout.column()
- layout.operator("nla.properties", icon="ICON_MENU_PANEL")
+ layout.operator("nla.properties", icon="ICON_MENU_PANEL")
- layout.separator()
- layout.prop(st, "show_cframe_indicator")
+ layout.separator()
+ layout.prop(st, "show_cframe_indicator")
- if st.show_seconds:
- layout.operator("anim.time_toggle", text="Show Frames")
- else:
- layout.operator("anim.time_toggle", text="Show Seconds")
+ if st.show_seconds:
+ layout.operator("anim.time_toggle", text="Show Frames")
+ else:
+ layout.operator("anim.time_toggle", text="Show Seconds")
- layout.prop(st, "show_strip_curves")
+ layout.prop(st, "show_strip_curves")
- layout.separator()
- layout.operator("anim.previewrange_set")
- layout.operator("anim.previewrange_clear")
+ layout.separator()
+ layout.operator("anim.previewrange_set")
+ layout.operator("anim.previewrange_clear")
- layout.separator()
- layout.operator("screen.area_dupli")
- layout.operator("screen.screen_full_area")
+ layout.separator()
+ layout.operator("screen.area_dupli")
+ layout.operator("screen.screen_full_area")
class NLA_MT_select(bpy.types.Menu):
- bl_label = "Select"
+ bl_label = "Select"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- # This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
- layout.operator("nla.select_all_toggle")
- layout.operator("nla.select_all_toggle", text="Invert Selection").invert = True
+ layout.column()
+ # This is a bit misleading as the operator's default text is "Select All" while it actually *toggles* All/None
+ layout.operator("nla.select_all_toggle")
+ layout.operator("nla.select_all_toggle", text="Invert Selection").invert = True
- layout.separator()
- layout.operator("nla.select_border")
- layout.operator("nla.select_border", text="Border Axis Range").axis_range = True
+ layout.separator()
+ layout.operator("nla.select_border")
+ layout.operator("nla.select_border", text="Border Axis Range").axis_range = True
class NLA_MT_edit(bpy.types.Menu):
- bl_label = "Edit"
+ bl_label = "Edit"
- def draw(self, context):
- layout = self.layout
-
- scene = context.scene
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- layout.menu("NLA_MT_edit_transform", text="Transform")
+ scene = context.scene
- layout.operator_menu_enum("nla.snap", property="type", text="Snap")
+ layout.column()
+ layout.menu("NLA_MT_edit_transform", text="Transform")
- layout.separator()
- layout.operator("nla.duplicate")
- layout.operator("nla.split")
- layout.operator("nla.delete")
+ layout.operator_menu_enum("nla.snap", property="type", text="Snap")
- layout.separator()
- layout.operator("nla.mute_toggle")
+ layout.separator()
+ layout.operator("nla.duplicate")
+ layout.operator("nla.split")
+ layout.operator("nla.delete")
- layout.separator()
- layout.operator("nla.apply_scale")
- layout.operator("nla.clear_scale")
+ layout.separator()
+ layout.operator("nla.mute_toggle")
- layout.separator()
- layout.operator("nla.move_up")
- layout.operator("nla.move_down")
+ layout.separator()
+ layout.operator("nla.apply_scale")
+ layout.operator("nla.clear_scale")
- layout.separator()
- # TODO: names of these tools for 'tweakmode' need changing?
- if scene.nla_tweakmode_on:
- layout.operator("nla.tweakmode_exit", text="Stop Tweaking Strip Actions")
- else:
- layout.operator("nla.tweakmode_enter", text="Start Tweaking Strip Actions")
+ layout.separator()
+ layout.operator("nla.move_up")
+ layout.operator("nla.move_down")
+
+ layout.separator()
+ # TODO: names of these tools for 'tweakmode' need changing?
+ if scene.nla_tweakmode_on:
+ layout.operator("nla.tweakmode_exit", text="Stop Tweaking Strip Actions")
+ else:
+ layout.operator("nla.tweakmode_enter", text="Start Tweaking Strip Actions")
class NLA_MT_add(bpy.types.Menu):
- bl_label = "Add"
+ bl_label = "Add"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- layout.operator("nla.actionclip_add")
- layout.operator("nla.transition_add")
+ layout.column()
+ layout.operator("nla.actionclip_add")
+ layout.operator("nla.transition_add")
- layout.separator()
- layout.operator("nla.meta_add")
- layout.operator("nla.meta_remove")
+ layout.separator()
+ layout.operator("nla.meta_add")
+ layout.operator("nla.meta_remove")
- layout.separator()
- layout.operator("nla.tracks_add")
- layout.operator("nla.tracks_add", text="Add Tracks Above Selected").above_selected = True
+ layout.separator()
+ layout.operator("nla.tracks_add")
+ layout.operator("nla.tracks_add", text="Add Tracks Above Selected").above_selected = True
class NLA_MT_edit_transform(bpy.types.Menu):
- bl_label = "Transform"
+ bl_label = "Transform"
- def draw(self, context):
- layout = self.layout
+ def draw(self, context):
+ layout = self.layout
- layout.column()
- layout.operator("tfm.translate", text="Grab/Move")
- layout.operator("tfm.transform", text="Extend").mode = 'TIME_EXTEND'
- layout.operator("tfm.resize", text="Scale")
+ layout.column()
+ layout.operator("tfm.translate", text="Grab/Move")
+ layout.operator("tfm.transform", text="Extend").mode = 'TIME_EXTEND'
+ layout.operator("tfm.resize", text="Scale")
bpy.types.register(NLA_HT_header) # header/menu classes