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 /source/blender/makesrna/intern/rna_space.c
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 'source/blender/makesrna/intern/rna_space.c')
-rw-r--r--source/blender/makesrna/intern/rna_space.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 4a98d71a76a..54b34c6ba45 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -1731,6 +1731,11 @@ static void rna_def_space_dopesheet(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Show Sliders", "Show sliders beside F-Curve channels");
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_DOPESHEET, NULL);
+ prop= RNA_def_property(srna, "show_pose_markers", PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", SACTION_POSEMARKERS_SHOW);
+ RNA_def_property_ui_text(prop, "Show Pose Markers", "Show markers belonging to the active action instead of Scene markers (Action and Shape Key Editors only)");
+ RNA_def_property_update(prop, NC_SPACE|ND_SPACE_DOPESHEET, NULL);
+
/* editing */
prop= RNA_def_property(srna, "use_auto_merge_keyframes", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", SACTION_NOTRANSKEYCULL);