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>2018-04-24 19:10:19 +0300
committerJoshua Leung <aligorith@gmail.com>2018-04-24 20:18:31 +0300
commit9511cc13d75a156743bf55a73d5c7fc8f56fe72b (patch)
tree60e1576f7341fbf9c1d6541d66d400b8b9127a29 /source/blender/makesrna/intern/rna_timeline.c
parentef08e77a464e591efaa532e04b4610d129bee874 (diff)
Bind Camera to Markers - Various tweaks to make this nicer to work with
Based on discussions here in the office, this commit introduces a number of changes to make the "Bind Camera to Markers" feature (introduced during Sintel to facilitate camera switching, and now an integral part of the UI for doing this) nicer to use. Main changes: * "Camera Markers" are now drawn using Camera icons, making it easier to distinguish between them and other ("normal") markers * "Camera Markers" will display the name of the bound marker, making it easier to see what camera each marker uses. This will then also stay in sync with the camera being used (though a manual refresh is needed after renaming objects to make the timeline update), fixing the problem where the marker's camera and the name get out of sync. * Behaviour of Ctrl-B has been modified to make it easier to quickly add these markers. Now, it will directly add a new marker on the current frame, bound to the currently selected camera object. If there's an existing marker on that frame, the existing marker's camera will be replaced instead of making a new marker.
Diffstat (limited to 'source/blender/makesrna/intern/rna_timeline.c')
-rw-r--r--source/blender/makesrna/intern/rna_timeline.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_timeline.c b/source/blender/makesrna/intern/rna_timeline.c
index a732b550261..45f90d13477 100644
--- a/source/blender/makesrna/intern/rna_timeline.c
+++ b/source/blender/makesrna/intern/rna_timeline.c
@@ -74,7 +74,7 @@ static void rna_def_timeline_marker(BlenderRNA *brna)
prop = RNA_def_property(srna, "camera", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "Object");
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
- RNA_def_property_ui_text(prop, "Camera", "Camera this timeline sets to active");
+ RNA_def_property_ui_text(prop, "Camera", "Camera that becomes active on this frame");
#endif
}