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:
authorJoshua Leung <aligorith@gmail.com>2011-01-10 02:16:05 +0300
committerJoshua Leung <aligorith@gmail.com>2011-01-10 02:16:05 +0300
commit56db5f10aab70fe9f99c830efbafd77b5f8b6c49 (patch)
tree98988cf3dacd332bb998d526ac1473dde573f776 /release
parent3fba5cfe7ae1b3e626a88b63ed2295e1a6ce13b0 (diff)
Restoring "Pose Markers"
These were markers which belonged to an action instead of the scene, and are used by PoseLib to keep track of where poses are. To restore this, I've made this only available in Action/Shapekey Editor modes, and only when an action is being shown and the "Show Pose Markers" option in the Markers menu has been enabled. Other than that, all the standard marker operators apply now (instead of using a separate set of special operators).
Diffstat (limited to 'release')
-rw-r--r--release/scripts/ui/space_dopesheet.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/release/scripts/ui/space_dopesheet.py b/release/scripts/ui/space_dopesheet.py
index b6d1185d5db..00e80c664c4 100644
--- a/release/scripts/ui/space_dopesheet.py
+++ b/release/scripts/ui/space_dopesheet.py
@@ -185,6 +185,8 @@ class DOPESHEET_MT_marker(bpy.types.Menu):
def draw(self, context):
layout = self.layout
+ st = context.space_data
+
#layout.operator_context = 'EXEC_REGION_WIN'
layout.column()
@@ -197,7 +199,9 @@ class DOPESHEET_MT_marker(bpy.types.Menu):
layout.operator("marker.rename", text="Rename Marker")
layout.operator("marker.move", text="Grab/Move Marker")
- # TODO: pose markers for action edit mode only?
+ if st.mode in ('ACTION', 'SHAPEKEY') and st.action:
+ layout.separator()
+ layout.prop(st, "show_pose_markers")
class DOPESHEET_MT_channel(bpy.types.Menu):
bl_label = "Channel"