Sculpt Branch:sculpt25

svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r25245:25315

1 files changed, 21 insertions, 0 deletions

diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index 2424a72b6a3..21e601c3ba3 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -2338,6 +2338,11 @@ static void rna_def_userdef_input(BlenderRNA *brna)
 	RNA_def_property_range(prop, 0, 200);
 	RNA_def_property_ui_text(prop, "NDof Rotation Speed", "The overall rotation speed of an NDOF device, as percent of standard.");
 	
+	prop= RNA_def_property(srna, "double_click_time", PROP_INT, PROP_NONE);
+	RNA_def_property_int_sdna(prop, NULL, "dbl_click_time");
+	RNA_def_property_range(prop, 1, 1000);
+	RNA_def_property_ui_text(prop, "Double Click Timeout", "The time (in ms) for a double click.");
+
 	prop= RNA_def_property(srna, "emulate_3_button_mouse", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_TWOBUTTONMOUSE);
 	RNA_def_property_boolean_funcs(prop, NULL, "rna_userdef_emulate_set");
@@ -2353,6 +2358,13 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
 	PropertyRNA *prop;
 	StructRNA *srna;
 	
+	static EnumPropertyItem anim_player_presets[] = {
+		//{0, "INTERNAL", 0, "Internal", "Built-in animation player"},	// doesn't work yet!
+		{0, "BLENDER24", 0, "Blender 2.4", "Blender command line animation playback - path to Blender 2.4"},
+		{2, "DJV", 0, "Djv", "Open source frame player: http://djv.sourceforge.net"},
+		{3, "CUSTOM", 0, "Custom", "Custom animation player executable path"},
+		{0, NULL, 0, NULL, NULL}};
+	
 	srna= RNA_def_struct(brna, "UserPreferencesFilePaths", NULL);
 	RNA_def_struct_sdna(srna, "UserDef");
 	RNA_def_struct_nested(brna, srna, "UserPreferences");
@@ -2409,7 +2421,16 @@ static void rna_def_userdef_filepaths(BlenderRNA *brna)
 	prop= RNA_def_property(srna, "temporary_directory", PROP_STRING, PROP_DIRPATH);
 	RNA_def_property_string_sdna(prop, NULL, "tempdir");
 	RNA_def_property_ui_text(prop, "Temporary Directory", "The directory for storing temporary save files.");
+	
+	prop= RNA_def_property(srna, "animation_player", PROP_STRING, PROP_DIRPATH);
+	RNA_def_property_string_sdna(prop, NULL, "anim_player");
+	RNA_def_property_ui_text(prop, "Animation Player", "Path to a custom animation/frame sequence player.");
 
+	prop= RNA_def_property(srna, "animation_player_preset", PROP_ENUM, PROP_NONE);
+	RNA_def_property_enum_sdna(prop, NULL, "anim_player_preset");
+	RNA_def_property_enum_items(prop, anim_player_presets);
+	RNA_def_property_ui_text(prop, "Animation Player Preset", "Preset configs for external animation players");
+	
 	/* Autosave  */
 
 	prop= RNA_def_property(srna, "save_version", PROP_INT, PROP_NONE);