- temp marker rename in menu (using python or the outliner isnt fun)

- marker selected property
- rigify error formatting error
This commit is contained in:
2010-01-21 19:43:27 +00:00
parent 8c0dff6bc3
commit 8f3f1da080
3 changed files with 17 additions and 2 deletions

View File

@@ -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

View File

@@ -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()

View File

@@ -31,6 +31,8 @@
#include "DNA_scene_types.h"
#include "WM_types.h"
#ifdef RNA_RUNTIME
#else
@@ -48,9 +50,16 @@ static void rna_def_timeline_marker(BlenderRNA *brna)
prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
RNA_def_property_ui_text(prop, "Name", "");
RNA_def_struct_name_property(srna, prop);
RNA_def_property_update(prop, NC_ANIMATION, NULL);
prop= RNA_def_property(srna, "frame", PROP_INT, PROP_TIME);
RNA_def_property_ui_text(prop, "Frame", "The frame on which the timeline marker appears.");
RNA_def_property_update(prop, NC_ANIMATION, NULL);
prop= RNA_def_property(srna, "selected", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", 1 /*SELECT*/);
RNA_def_property_ui_text(prop, "Selected", "Marker selection state.");
RNA_def_property_update(prop, NC_ANIMATION, NULL);
#ifdef DURIAN_CAMERA_SWITCH
prop= RNA_def_property(srna, "camera", PROP_POINTER, PROP_NONE);