- opengl render anim exec function so python can render opengl animations without and have it block until its done.

- timeline rna camera access.
- new textblocks have tabs as spaces enabled by default since this is blenders default.

1 files changed, 7 insertions, 0 deletions

diff --git a/source/blender/makesrna/intern/rna_timeline.c b/source/blender/makesrna/intern/rna_timeline.c
index 5e20fca15f0..26021687f0d 100644
--- a/source/blender/makesrna/intern/rna_timeline.c
+++ b/source/blender/makesrna/intern/rna_timeline.c
@@ -51,6 +51,13 @@ static void rna_def_timeline_marker(BlenderRNA *brna)
 
 	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.");
+
+#ifdef DURIAN_CAMERA_SWITCH
+	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.");
+#endif
 }
 
 void RNA_def_timeline_marker(BlenderRNA *brna)