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>2010-01-21 22:43:27 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-01-21 22:43:27 +0300
commit8f3f1da08065f725097f23e758ca21634bb03d7a (patch)
tree0893c59c0b31421a684b187c155fd783c3ea50ee /release
parent8c0dff6bc3a64d84f14d68f5af6f73fa27338ce5 (diff)
- temp marker rename in menu (using python or the outliner isnt fun)
- marker selected property - rigify error formatting error
Diffstat (limited to 'release')
-rw-r--r--release/scripts/modules/rigify/__init__.py2
-rw-r--r--release/scripts/ui/space_time.py8
2 files changed, 8 insertions, 2 deletions
diff --git a/release/scripts/modules/rigify/__init__.py b/release/scripts/modules/rigify/__init__.py
index 262508c9a84..089542263e6 100644
--- a/release/scripts/modules/rigify/__init__.py
+++ b/release/scripts/modules/rigify/__init__.py
@@ -431,7 +431,7 @@ def generate_test(context, metarig_type="", GENERATE_FINAL=True):
else:
new_objects.append((obj, None))
else:
- print("note: rig type '%s' has no metarig_template(), can't test this", module_name)
+ print("note: rig type '%s' has no metarig_template(), can't test this" % module_name)
return new_objects
diff --git a/release/scripts/ui/space_time.py b/release/scripts/ui/space_time.py
index a991c9de75f..65e7405c3fe 100644
--- a/release/scripts/ui/space_time.py
+++ b/release/scripts/ui/space_time.py
@@ -114,7 +114,13 @@ class TIME_MT_frame(bpy.types.Menu):
layout.operator("marker.duplicate", text="Duplicate Marker")
layout.operator("marker.move", text="Grab/Move Marker")
layout.operator("marker.delete", text="Delete Marker")
- layout.label(text="ToDo: Name Marker")
+
+ # it was ok for riscos... ok TODO, operator
+ for marker in context.scene.timeline_markers:
+ if marker.selected:
+ layout.separator()
+ layout.prop(marker, "name", text="", icon='MARKER_HLT')
+ break
layout.separator()